[Gridflow-cvs] [svn] commit: r6071 - in /trunk/src: aalib.cxx classes1.cxx classes2.cxx classes_gui.cxx dc1394.cxx formats.cxx grid.cxx gridflow.cxx number.cxx opengl.cxx quicktimeapple.cxx quicktimecamera.cxx quicktimehw.cxx v4l2.cxx videodev.cxx x11.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Fri Aug 13 02:17:48 EDT 2010


Author: matju
Date: Fri Aug 13 02:17:48 2010
New Revision: 6071

Log:
using "using"

Modified:
    trunk/src/aalib.cxx
    trunk/src/classes1.cxx
    trunk/src/classes2.cxx
    trunk/src/classes_gui.cxx
    trunk/src/dc1394.cxx
    trunk/src/formats.cxx
    trunk/src/grid.cxx
    trunk/src/gridflow.cxx
    trunk/src/number.cxx
    trunk/src/opengl.cxx
    trunk/src/quicktimeapple.cxx
    trunk/src/quicktimecamera.cxx
    trunk/src/quicktimehw.cxx
    trunk/src/v4l2.cxx
    trunk/src/videodev.cxx
    trunk/src/x11.cxx

Modified: trunk/src/aalib.cxx
==============================================================================
--- trunk/src/aalib.cxx (original)
+++ trunk/src/aalib.cxx Fri Aug 13 02:17:48 2010
@@ -33,7 +33,7 @@
 #endif
 AAAttr;
 
-static std::map<string,const aa_driver *> drivers;
+static map<string,const aa_driver *> drivers;
 
 \class FormatAALib : Format {
 	aa_context *context;

Modified: trunk/src/classes1.cxx
==============================================================================
--- trunk/src/classes1.cxx (original)
+++ trunk/src/classes1.cxx Fri Aug 13 02:17:48 2010
@@ -112,7 +112,7 @@
 		process(n,(uint8 *)name);
 	}
 	\decl 0 to_ascii(...) {
-		std::ostringstream os;
+		ostringstream os;
 		pd_oprint(os,argc,argv);
 		string s = os.str();
 		long n = s.length();
@@ -231,8 +231,8 @@
 			pd_typedmess(dest,gensym("very_long_name_that_nobody_uses"),n,a);
 		}
 	}
-	void puts (std::string s) {puts(s.data());}
-	void puts (std::ostringstream &s) {puts(s.str());}
+	void puts (string s) {puts(s.data());}
+	void puts (ostringstream &s) {puts(s.str());}
 	template <class T> void make_columns (int n, T *data) {
 		if (NumberTypeE_type_of(data)==float32_e) {columns=10; return;}
 		if (NumberTypeE_type_of(data)==float64_e) {columns=20; return;}
@@ -246,19 +246,19 @@
 		int mind = 1 + (minv<0) + int(log(max(1.,fabs(minv)))/log(base));
 		columns = max(maxd,mind);
 	}
-	std::string format (NumberTypeE nt) {
+	string format (NumberTypeE nt) {
 		if (nt==float32_e) return "%6f";
 		if (nt==float64_e) return "%14f";
-		std::ostringstream r;
+		ostringstream r;
 		r << "%";
 		r << columns;
 		//if (nt==int64_e) r << "l";
 		r << "d"; // integer bases 2,8,16 are no longer handled here
 		return r.str();
 	}
-	template <class T> void dump(std::ostream &s, int n, T *data, char sep=' ', int trunc=-1) {
+	template <class T> void dump(ostream &s, int n, T *data, char sep=' ', int trunc=-1) {
 		if (trunc<0) trunc=this->trunc;
-		std::string f = format(NumberTypeE_type_of(data));
+		string f = format(NumberTypeE_type_of(data));
 		for (int i=0; i<n; i++) {
 			if (base==2 || base==8 || base==16) {
 				static char digits[] = "0123456789ABCDEF";
@@ -277,7 +277,7 @@
 			if (s.tellp()>trunc) return;
 		}
 	}
-	void dump_dims(std::ostream &s, GridInlet &in) {
+	void dump_dims(ostream &s, GridInlet &in) {
 		if (name && name!=&s_) s << name->s_name << ": ";
 		s << "Dim[";
 		for (int i=0; i<in.dim.n; i++) {
@@ -292,7 +292,7 @@
 GRID_INLET(0) {
 	in.set_chunk(0);
 } GRID_FLOW {
-	std::ostringstream head;
+	ostringstream head;
 	dump_dims(head,in);
 	int ndim = in.dim.n;
 	if (ndim > 3) {
@@ -308,7 +308,7 @@
 		long sy = in.dim[0];
 		long sx = n/sy;
 		for (int row=0; row<sy; row++) {
-			std::ostringstream body;
+			ostringstream body;
 			dump(body,sx,&data[sx*row],' ',trunc);
 			if (body.tellp()>trunc) body << "...";
 			puts(body);
@@ -322,7 +322,7 @@
 		int sz = n/sy;
 		int sz2 = sz/in.dim[1];
 		for (int row=0; row<sy; row++) {
-			std::ostringstream str;
+			ostringstream str;
 			for (int col=0; col<sx; col++) {
 				str << "(";
 				dump(str,sz2,&data[sz*row+sz2*col],' ',trunc);
@@ -334,7 +334,7 @@
 	}
 	end_hook();
 } GRID_FINISH {
-	std::ostringstream head;
+	ostringstream head;
 	dump_dims(head,in);
 	if (in.dim.prod()==0) puts(head);
 } GRID_END

Modified: trunk/src/classes2.cxx
==============================================================================
--- trunk/src/classes2.cxx (original)
+++ trunk/src/classes2.cxx Fri Aug 13 02:17:48 2010
@@ -55,7 +55,7 @@
 #define foreach(ITER,COLL) for(typeof(COLL.begin()) ITER = COLL.begin(); ITER != (COLL).end(); ITER++)
 
 string join (int argc, t_atom *argv, string sep=" ", string term="") {
-	std::ostringstream os;
+	ostringstream os;
 	for (int i=0; i<argc; i++) os << argv[i] << (i==argc-1 ? term : sep);
 	return os.str();
 }
@@ -219,7 +219,7 @@
 \end class {install("setargs",1,1);}
 
 \class GFAttr : FObject {
-	typedef std::map<t_symbol *,std::vector<t_atom2> > table_t;
+	typedef map<t_symbol *,vector<t_atom2> > table_t;
 	table_t table;
 	\constructor () {}
 	//void outlet_entry(const typeof(table.begin()) &f) // can't use this in gcc<4.4
@@ -259,7 +259,7 @@
 \end class {install("listreverse",1,1);}
 
 \class ListFlatten : FObject {
-	std::vector<t_atom2> contents;
+	vector<t_atom2> contents;
 	\constructor () {}
 	void traverse (int argc, t_atom2 *argv) {
 		for (int i=0; i<argc; i++) {
@@ -360,7 +360,7 @@
 
 /*
 string ssprintf(const char *fmt, ...) {
-	std::ostringstream os;
+	ostringstream os;
 	va_list va;
 	va_start(va,fmt);
 	voprintf(os,fmt,va);
@@ -375,7 +375,7 @@
 	string prefix;
 	t_pd *gp;
 	\constructor (const t_atom *s=0) {
-		std::ostringstream text;
+		ostringstream text;
 		if (s) text << *s; else text << "print";
 		prefix = text.str();
 		t_atom a[1];
@@ -387,7 +387,7 @@
 	~GFPrint () {pd_free(gp);}
 	\decl 0 grid(...) {pd_typedmess(gp,gensym("grid"),argc,argv);}
 	\decl void anything (...) {
-		std::ostringstream text;
+		ostringstream text;
 		text << prefix << ":";
 		t_symbol *l = gensym("_0_list");
 		t_symbol *f = gensym("_0_float");
@@ -740,7 +740,7 @@
 	\decl 0 list (...) {
 		t_binbuf *b = mom->gl_obj.te_binbuf;
 		t_canvasenvironment *ce = canvas_getenv(canvas_getabstop(mom));
-		std::ostringstream o;
+		ostringstream o;
 		o << "[";
 		if (b && binbuf_getnatom(b)) o<<*binbuf_getvec(b); else o<<"???";
 		if (ce) for (int i=0; i<ce->ce_argc; i++) o << " " << ce->ce_argv[i];
@@ -761,7 +761,7 @@
 	\decl 0 float  (t_atom2 a) {_0_list(1,&a);}
 	\decl 0 symbol (t_atom2 a) {_0_list(1,&a);}
 	\decl 0 list (...) {
-		std::ostringstream o; pd_oprintf(o,format.data(),argc,argv); string s = o.str();
+		ostringstream o; pd_oprintf(o,format.data(),argc,argv); string s = o.str();
 		outlet_symbol(outlets[0],gensym(s.data()));
 	}
 };
@@ -775,7 +775,7 @@
 	\decl 0 float  (t_atom2 a) {_0_list(1,&a);}
 	\decl 0 symbol (t_atom2 a) {_0_list(1,&a);}
 	\decl 0 list (...) {
-		std::ostringstream o; pd_oprintf(o,format.data(),argc,argv); string s = o.str();
+		ostringstream o; pd_oprintf(o,format.data(),argc,argv); string s = o.str();
 		GridOutlet out(this,0,Dim(s.size()),cast); out.send(s.size(),(uint8 *)s.data());
 	}
 };
@@ -1037,7 +1037,7 @@
 	if (dir==&s_x) horiz=false; else
 	if (dir==&s_y) horiz=true;  else RAISE("$1 must be x or y");
 #ifndef DESIRE
-	std::vector<t_object *> v;
+	vector<t_object *> v;
 	BEGIN
 	wire_each(wire,ouch) {
 		//post("wire to object of class %s ISINLET=%d",pd_class(wire->to)->c_name->s_name,ISINLET(wire->to));
@@ -1311,7 +1311,7 @@
 };
 \end class {install("gridflow",1,1);}
 
-std::map<t_canvas *, std::map<t_gobj *, int> > propertybang_map;
+map<t_canvas *, map<t_gobj *, int> > propertybang_map;
 \class PropertyBang : FObject {
 	\constructor () {propertybang_map[canvas_getabstop(mom)][(t_gobj *)bself]=1;}
 	~PropertyBang () {propertybang_map[canvas_getabstop(mom)].erase((t_gobj *)bself);}

Modified: trunk/src/classes_gui.cxx
==============================================================================
--- trunk/src/classes_gui.cxx (original)
+++ trunk/src/classes_gui.cxx Fri Aug 13 02:17:48 2010
@@ -145,11 +145,11 @@
 //#ifdef DESIRE
 \class Display : GUI_FObject {
 	int y,x;
-	std::ostringstream text;
+	ostringstream text;
 	t_pd *gp;
 	\constructor () {
 		selected=false; y=0; x=0; sy=16; sx=80; vis=false;
-		std::ostringstream os;
+		ostringstream os;
 		pd_anything(&pd_objectmaker,gensym("#print"),0,0);
 		gp = pd_newest();
 		t_atom a[1];
@@ -166,8 +166,8 @@
 	\decl 0 grid(...);
 	\decl 0 very_long_name_that_nobody_uses(...);
  	void show() { /* or hide */
-		std::ostringstream quoted;
-		std::string ss = text.str();
+		ostringstream quoted;
+		string ss = text.str();
 		const char *s = ss.data();
 		int n = ss.length();
 		for (int i=0;i<n;i++) {
@@ -402,7 +402,7 @@
 	#undef FOO
 	\grin 0
 	void sendbuf () {
-	    std::ostringstream os;
+	    ostringstream os;
 	    int i=0,j=0,t=0;
 	    int chans = buf->dim[2];
 	    int xs = buf->dim[1];

Modified: trunk/src/dc1394.cxx
==============================================================================
--- trunk/src/dc1394.cxx (original)
+++ trunk/src/dc1394.cxx Fri Aug 13 02:17:48 2010
@@ -28,7 +28,7 @@
 
 #define MODE(x,y,palette) /* nothing for now */
 
-static std::map<int,string> feature_names;
+static map<int,string> feature_names;
 
 static void setup_modes () {
     int i=64; // format 0
@@ -155,7 +155,7 @@
 	int width;
 	dc1394_cameracapture camera;
 	dc1394_feature_set features;
-	std::map<int,int> feature_index;
+	map<int,int> feature_index;
 	\constructor (t_symbol *mode) {
 		bool gotone=false;
 		post("DC1394: hello world");

Modified: trunk/src/formats.cxx
==============================================================================
--- trunk/src/formats.cxx (original)
+++ trunk/src/formats.cxx Fri Aug 13 02:17:48 2010
@@ -56,23 +56,18 @@
 	destructor : close a handler
 */
 
-std::map<std::string,std::string> suffix_table;
+map<string,string> suffix_table;
 void suffixes_are (const char *name, const char *suffixes) {
-	std::string name2 = name;
+	string name2 = name;
 	char *suff2 = strdup(suffixes);
 	char *suff3 = suff2+strlen(suff2);
 	for (char *s=suff2; s<suff3; s++) if (*s==' ' || *s==',') *s=0;
-	for (char *s=suff2; s<suff3; s+=strlen(s)+1) {
-		std::string ss = s;
-		suffix_table[ss]=name2;
-	}
+	for (char *s=suff2; s<suff3; s+=strlen(s)+1) {string ss = s; suffix_table[ss]=name2;}
 }
 
 \class SuffixLookup : FObject {
   \constructor () {}
-  \decl 0 symbol (t_symbol *str);
-};
-\def 0 symbol (t_symbol *str) {
+  \decl 0 symbol (t_symbol *str) {
 	char *s = strdup(str->s_name);
 	char *t = strrchr(s,'.');
 	if (!t) outlet_symbol(outlets[2],gensym(s));
@@ -80,12 +75,13 @@
 		*t = 0;
 		for (char *u=t+1; *u; u++) *u=tolower(*u);
 		outlet_symbol(outlets[1],gensym(t+1));
-		std::map<std::string,std::string>::iterator u = suffix_table.find(std::string(t+1));
+		map<string,string>::iterator u = suffix_table.find(string(t+1));
 		if (u==suffix_table.end()) outlet_bang(outlets[0]);
 		else outlet_symbol(outlets[0],gensym((char *)u->second.data()));
 	}
 	free(s);
-}
+  }
+};
 \end class {install("gf/suffix_lookup",1,3);}
 
 \class Format : FObject

Modified: trunk/src/grid.cxx
==============================================================================
--- trunk/src/grid.cxx (original)
+++ trunk/src/grid.cxx Fri Aug 13 02:17:48 2010
@@ -80,7 +80,7 @@
 		CHECK_ALIGN(data,nt);
 		((int32 *)*this)[0] = (int32)a.a_float;
 	} else {
-		std::ostringstream s; s << x;
+		ostringstream s; s << x;
 		RAISE("can't convert to grid: %s",s.str().data());
 	}
 }
@@ -205,7 +205,7 @@
 	if (v==0) v=MAX_PACKET_SIZE; // factor too big. don't have a choice.
 	buf.init(Dim(v),nt);
 #ifdef TRACEBUFS
-	std::ostringstream text;
+	ostringstream text;
 	oprintf(text,"GridOutlet: %20s buf for sending to  ",buf->dim->to_s());
 	for (uint i=0; i<inlets.size(); i++) text << " " << (void *)inlets[i]->parent;
 	post("%s",text.str().data());

Modified: trunk/src/gridflow.cxx
==============================================================================
--- trunk/src/gridflow.cxx (original)
+++ trunk/src/gridflow.cxx Fri Aug 13 02:17:48 2010
@@ -66,8 +66,8 @@
 #include <cxxabi.h>
 #endif
 
-std::map<string,FClass *> fclasses;
-std::map<t_class *,FClass *> fclasses_pd;
+map<string,FClass *> fclasses;
+map<t_class *,FClass *> fclasses_pd;
 t_symbol *gridflow_folder;
 
 //using namespace std;
@@ -77,7 +77,7 @@
 #undef FOO
 
 Barf::Barf(const char *s, ...) {
-    std::ostringstream os;
+    ostringstream os;
     va_list ap;
     va_start(ap,s);
     voprintf(os,s,ap);
@@ -85,7 +85,7 @@
     text = os.str();
 }
 Barf::Barf(const char *file, int line, const char *func, const char *fmt, ...) {
-    std::ostringstream os;
+    ostringstream os;
     va_list ap;
     va_start(ap,fmt);
     voprintf(os,fmt,ap);
@@ -99,12 +99,12 @@
 	else    pd_error(bself,"%s inlet %d method %s: %s",bself->binbuf_string().data(),winlet,selector?selector:"(???)",text.data());
 }
 void Barf::error(t_symbol *s, int argc, t_atom *argv) {
-	std::ostringstream os; os << s->s_name;
+	ostringstream os; os << s->s_name;
 	for (int i=0; i<argc; i++) os << (i ? " " : " ") << argv[i];
         ::error("[%s]: %s",os.str().data(),text.data());
 }
 
-void pd_oprint (std::ostream &o, int argc, t_atom *argv) {
+void pd_oprint (ostream &o, int argc, t_atom *argv) {
 	for (int i=0; i<argc; i++) {
 		t_atomtype t = argv[i].a_type;
 		if (t==A_FLOAT) o << argv[i].a_float;
@@ -123,7 +123,7 @@
 }
 
 void pd_post (const char *s, int argc, t_atom *argv) {
-	std::ostringstream os;
+	ostringstream os;
 	if (s) os << s << ": ";
 	pd_oprint(os,argc,argv);
 	post("%s",os.str().data());
@@ -138,7 +138,7 @@
 	if (argv[i].a_type != A_SYMBOL) RAISE("expected symbol in $%d",i+1);	return argv[i++].a_symbol;}
 #define EATFLOAT   eatfloat(argc,argv,i)
 #define EATSYMBOL eatsymbol(argc,argv,i)
-void pd_oprintf (std::ostream &o, const char *s, int argc, t_atom *argv) {
+void pd_oprintf (ostream &o, const char *s, int argc, t_atom *argv) {
 	int i=0;
 	const char *t;
 	for (; *s; s++) {
@@ -176,7 +176,7 @@
 	}
 }
 
-std::ostream &operator << (std::ostream &self, const t_atom &a) {
+ostream &operator << (ostream &self, const t_atom &a) {
 	switch (a.a_type) {
 		case A_FLOAT:   self << a.a_float; break;
 		case A_SYMBOL:  self << a.a_symbol->s_name; break; // i would rather show backslashes here...
@@ -548,7 +548,7 @@
 #define lstat stat
 #endif
 
-std::vector<string> gf_data_path;
+vector<string> gf_data_path;
 string gf_find_file (string x) {
 	if (strchr(x.data(),'/')) return x;
 	int n = gf_data_path.size();
@@ -751,7 +751,7 @@
 string BFObject::binbuf_string () {
 	t_binbuf *b = te_binbuf;
 	if (!b) return "[???]";
-	std::ostringstream s;
+	ostringstream s;
 	int n = binbuf_getnatom(b);
 	t_atom2 *at = (t_atom2 *)binbuf_getvec(b);
 	for (int i=0; i<n; i++) s << (i ? at[i].a_type==A_COMMA ? "" : " " : "[") << at[i];

Modified: trunk/src/number.cxx
==============================================================================
--- trunk/src/number.cxx (original)
+++ trunk/src/number.cxx Fri Aug 13 02:17:48 2010
@@ -415,9 +415,9 @@
 #define INIT_TABLE(D,A) for(int i=0; i<A##_n; i++) D[string(A[i].name)]=&A[i];
 
 #ifdef PASS1
-std::map<string,NumberType *> number_type_dict;
-std::map<string,Numop *> op_dict;
-std::map<string,Numop *> vop_dict;
+map<string,NumberType *> number_type_dict;
+map<string,Numop *> op_dict;
+map<string,Numop *> vop_dict;
 void startup_number () {
 	INIT_TABLE( op_dict,op_table1)
 	INIT_TABLE( op_dict,op_table2)

Modified: trunk/src/opengl.cxx
==============================================================================
--- trunk/src/opengl.cxx (original)
+++ trunk/src/opengl.cxx Fri Aug 13 02:17:48 2010
@@ -34,8 +34,8 @@
 		// if n>0  : this is the name of a 'get' attribute that has n arguments
 		// if n<0  : this is the name of a 'get' attribute that is currently not supported.
 	};
-	typedef std::map<t_symbol *,GLenum>  forward_t;  forward_t  forward;
-	typedef std::map<GLenum,EnumInfo>   backward_t; backward_t backward;
+	typedef map<t_symbol *,GLenum>  forward_t;  forward_t  forward;
+	typedef map<GLenum,EnumInfo>   backward_t; backward_t backward;
 	EnumType (const char *name) {this->name = name;}
 	GLenum operator () (const t_atom &a) {return (*this)(*(const t_atom2 *)&a);}
 	GLenum operator () (const t_atom2 &a) {

Modified: trunk/src/quicktimeapple.cxx
==============================================================================
--- trunk/src/quicktimeapple.cxx (original)
+++ trunk/src/quicktimeapple.cxx Fri Aug 13 02:17:48 2010
@@ -29,11 +29,11 @@
 #include <string.h>
 #include <errno.h>
 #include <map>
-std::map<long,const char *> oserr_table;
+map<long,const char *> oserr_table;
 
 const char *oserr_find(long err)
 {
-	std::map<long,const char *>::iterator it = oserr_table.find(err);
+	map<long,const char *>::iterator it = oserr_table.find(err);
 	return (it == oserr_table.end()) ? "undefined error..." : it->second;
 }
 

Modified: trunk/src/quicktimecamera.cxx
==============================================================================
--- trunk/src/quicktimecamera.cxx (original)
+++ trunk/src/quicktimecamera.cxx Fri Aug 13 02:17:48 2010
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <CoreServices/CoreServices.h>
 #include <map>
-extern std::map<long,const char *> oserr_table;
+extern map<long,const char *> oserr_table;
 
 #define DEBUG false
 

Modified: trunk/src/quicktimehw.cxx
==============================================================================
--- trunk/src/quicktimehw.cxx (original)
+++ trunk/src/quicktimehw.cxx Fri Aug 13 02:17:48 2010
@@ -27,8 +27,8 @@
 #include <map>
 #include <vector>
 
-static std::map<string,std::vector<string> *> codecs;
-static std::map<string,string> fourccs;
+static map<string,vector<string> *> codecs;
+static map<string,string> fourccs;
 
 \class FormatQuickTimeHW : Format {
 	quicktime_t *anim;
@@ -225,7 +225,7 @@
 		const lqt_codec_info_t *s = lqt_get_video_codec_info(i);
 		if (!s->name) {fprintf(stderr,"[#in quicktime]: skipping codec with null name!\n"); continue;}
 		string name = string(s->name);
-		std::vector<string> *f = new std::vector<string>(s->num_fourccs);
+		vector<string> *f = new vector<string>(s->num_fourccs);
 		if (!s->fourccs) {post("WARNING: no fourccs (quicktime library is broken?)"); goto hell;}
 		//fprintf(stderr,"num_fourccs=%d fourccs=%p\n",s->num_fourccs,s->fourccs);
 		for (int j=0; j<s->num_fourccs; j++) {

Modified: trunk/src/v4l2.cxx
==============================================================================
--- trunk/src/v4l2.cxx (original)
+++ trunk/src/v4l2.cxx Fri Aug 13 02:17:48 2010
@@ -58,13 +58,13 @@
 #define WHFLAGS(_field_,_table_)       oprintf(buf, "%s:%s " ,#_field_,flags_to_s( self->_field_,COUNT(_table_),_table_).data());
 #define WHCHOICE(_field_,_table_)      oprintf(buf, "%s=%s; ",#_field_,choice_to_s(self->_field_,COUNT(_table_),_table_).data());
 static string flags_to_s(int value, int n, const char **table) {
-	std::ostringstream buf; buf << "("; bool empty=true;
+	ostringstream buf; buf << "("; bool empty=true;
 	for(int i=0; i<n; i++) if ((value & (1<<i)) != 0) {buf << (empty ? "(" : " ") << table[i];}
 	buf << ")"; return buf.str();}
 static string choice_to_s(int value, int n, const char **table) {
-	if (value < 0 || value >= n) {std::ostringstream buf; buf << "(Unknown #" << value << ")"; return buf.str();}
+	if (value < 0 || value >= n) {ostringstream buf; buf << "(Unknown #" << value << ")"; return buf.str();}
 	else	return string(table[value]);}
-static void gfpost(v4l2_input *self) {std::ostringstream buf; buf << "[v4l2_input] ";
+static void gfpost(v4l2_input *self) {ostringstream buf; buf << "[v4l2_input] ";
 	WH(index,"%u");
 	WH(name,"\"%.32s\"");
 	WH(type,"0x%08x");
@@ -73,7 +73,7 @@
 	WH(std,"0x%08x");
 	WH(status,"0x%08x");
 	post("%s",buf.str().data());}
-static void gfpost(v4l2_tuner *self) {std::ostringstream buf; buf << "[v4l2_tuner] ";
+static void gfpost(v4l2_tuner *self) {ostringstream buf; buf << "[v4l2_tuner] ";
 	WH(index,"%u");
 	WH(name,"\"%.32s\"");
 	WH(type,"0x%08x");
@@ -84,7 +84,7 @@
 	WH(audmode,"0x%08x");
 	WH(signal,"%d");
 	WH(afc,"%d");}
-static void gfpost(v4l2_window *self) {std::ostringstream buf; buf << "[v4l2_window] ";
+static void gfpost(v4l2_window *self) {ostringstream buf; buf << "[v4l2_window] ";
 	WHYX(pos,w.top,w.left);
 	WHYX(size,w.height,w.width);
 //	enum v4l2_field  	field;
@@ -92,7 +92,7 @@
 	WH(clipcount,"%u");
 	//WH(global_alpha,"%d"); but is a uint8.
 	post("%s",buf.str().data());}
-static void gfpost(v4l2_format *self) {std::ostringstream buf; buf << "[v4l2_format]";
+static void gfpost(v4l2_format *self) {ostringstream buf; buf << "[v4l2_format]";
 	WH(type,"%u");
 	if (self->type!=V4L2_BUF_TYPE_VIDEO_CAPTURE) return;
 	WHYX(size,fmt.pix.height,fmt.pix.width);
@@ -102,7 +102,7 @@
 	WH(fmt.pix.sizeimage,"0x%08x");
 	WH(fmt.pix.colorspace,"0x%08x");
 	WH(fmt.pix.priv,"0x%08x");}
-static void gfpost(v4l2_requestbuffers *self) {std::ostringstream buf; buf << "[v4l2_requestbuffers]";
+static void gfpost(v4l2_requestbuffers *self) {ostringstream buf; buf << "[v4l2_requestbuffers]";
 	WH(count,"%u");
 	WH(type,"%u"); // enum v4l2_buf_type
 	WH(memory,"%u"); // enum v4l2_memory

Modified: trunk/src/videodev.cxx
==============================================================================
--- trunk/src/videodev.cxx (original)
+++ trunk/src/videodev.cxx Fri Aug 13 02:17:48 2010
@@ -146,8 +146,8 @@
 		return string(table[value]);
 	}
 }
-void post(std::ostringstream &o) {string os = o.str(); post("%s",os.data());}
-static void gfpost(VideoChannel *self) {std::ostringstream buf; buf << "[VideoChannel] ";
+void post(ostringstream &o) {string os = o.str(); post("%s",os.data());}
+static void gfpost(VideoChannel *self) {ostringstream buf; buf << "[VideoChannel] ";
 	WH(channel,"%d");
 	WH(name,"\"%.32s\"");
 	WH(tuners,"%d");
@@ -155,7 +155,7 @@
 	WH(type,"0x%04x");
 	WH(norm,"%d");
 	post(buf);}
-static void gfpost(VideoTuner *self) {std::ostringstream buf; buf << "[VideoTuner] ";
+static void gfpost(VideoTuner *self) {ostringstream buf; buf << "[VideoTuner] ";
 	WH(tuner,"%d");
 	WH(name,"\"%.32s\"");
 	WH(rangelow,"%lu");
@@ -164,20 +164,20 @@
 	WHCHOICE(mode,video_mode_choice);
 	WH(signal,"%d");
 	post(buf);}
-static void gfpost(VideoWindow *self) {std::ostringstream buf; buf << "[VideoWindow] ";
+static void gfpost(VideoWindow *self) {ostringstream buf; buf << "[VideoWindow] ";
 	WHYX(pos,y,x);
 	WHYX(size,height,width);
 	WH(chromakey,"0x%08x");
 	WH(flags,"0x%08x");
 	WH(clipcount,"%d");
 	post(buf);}
-static void gfpost(VideoMbuf *self) {std::ostringstream buf; buf << "[VideoMBuf] ";
+static void gfpost(VideoMbuf *self) {ostringstream buf; buf << "[VideoMBuf] ";
 	WH(size,"%d");
 	WH(frames,"%d");
 	oprintf(buf,"offsets=[");
 	for (int i=0; i<self->frames; i++) oprintf(buf,"%d%s",self->offsets[i],i+1==self->frames?"]":", ");
 	post(buf);}
-static void gfpost(VideoMmap *self) {std::ostringstream buf; buf << "[VideoMMap] ";
+static void gfpost(VideoMmap *self) {ostringstream buf; buf << "[VideoMMap] ";
 	WH(frame,"%u");
 	WHYX(size,height,width);
 	WHCHOICE(format,video_palette_choice);
@@ -281,7 +281,7 @@
 	
 	void detect_palettes () {
 		palettes=0;
-		std::ostringstream supp;
+		ostringstream supp;
 		supp << "camera supports palettes :";
 #if 1 /* keep this at "1" most of the time, because at "0" it crashes certain camera drivers ! */
 		int checklist[] = {VIDEO_PALETTE_RGB565,VIDEO_PALETTE_RGB24,VIDEO_PALETTE_RGB32,VIDEO_PALETTE_YUYV,VIDEO_PALETTE_YUV420P};

Modified: trunk/src/x11.cxx
==============================================================================
--- trunk/src/x11.cxx (original)
+++ trunk/src/x11.cxx Fri Aug 13 02:17:48 2010
@@ -81,7 +81,7 @@
 	P<BitPacking> bit_packing;
 	Dim dim;
 	t_clock *clock;
-	std::string title;
+	string title;
 #ifdef HAVE_X11_SHARED_MEMORY
 	XShmSegmentInfo *shm_info; /* to share memory with X11/Unix */
 #endif



More information about the Gridflow-cvs mailing list