[Gridflow-cvs] [svn] commit: r5671 - in /trunk/src: classes2.cxx gridflow.hxx x11.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Wed May 12 19:34:32 EDT 2010


Author: matju
Date: Wed May 12 19:34:32 2010
New Revision: 5671

Log:
remove INT

Modified:
    trunk/src/classes2.cxx
    trunk/src/gridflow.hxx
    trunk/src/x11.cxx

Modified: trunk/src/classes2.cxx
==============================================================================
--- trunk/src/classes2.cxx (original)
+++ trunk/src/classes2.cxx Wed May 12 19:34:32 2010
@@ -493,7 +493,7 @@
 }
 \def 0 very_long_name_that_nobody_uses(...) {
 	if (text.str().length()) text << "\n";
-	for (int i=0; i<argc; i++) text << (char)INT(argv[i]);
+	for (int i=0; i<argc; i++) text << char(TO(int32,argv[i]));
 }
 \end class {
 #ifdef DESIRE

Modified: trunk/src/gridflow.hxx
==============================================================================
--- trunk/src/gridflow.hxx (original)
+++ trunk/src/gridflow.hxx Wed May 12 19:34:32 2010
@@ -245,7 +245,6 @@
 
 struct Numop;
 struct Pointer;
-#define INT(x)  convert(x,(int32*)0)
 #define TO(T,x) convert(x,(T*)0)
 
 // trick to be able to define methods in t_atom

Modified: trunk/src/x11.cxx
==============================================================================
--- trunk/src/x11.cxx (original)
+++ trunk/src/x11.cxx Wed May 12 19:34:32 2010
@@ -170,14 +170,9 @@
 			} else {
 				if (winspec.a_type==A_SYMBOL) {
 					const char *winspec2 = string(winspec).data();
-					if (strncmp(winspec2,"0x",2)==0) {
-						window = strtol(winspec2+2,0,16);
-					} else {
-						window = atoi(winspec2); // huh?
-					}
-				} else {
-					window = INT(winspec);
-				}
+					if (strncmp(winspec2,"0x",2)==0) window = strtol(winspec2+2,0,16);
+					else 				 window = atoi(winspec2); // huh?
+				} else window = TO(int32,winspec);
 				is_owner = false;
 				sy = sx = pos[0] = pos[1] = 0;
 			}



More information about the Gridflow-cvs mailing list