Changeset 1420:f6c21ef02573

Timestamp:

01/04/10 23:39:31 (2 years ago)

Author:

niam

Branch:

default

Message:

fix compilation errors and warnings

Location:

sources

Files:

• examples/db/test.cc (modified) (1 diff)
• examples/db_mysql/test.cc (modified) (1 diff)
• src/dataBaseSqlConstructor.cc (modified) (3 diffs)
• src/ioNetworkServer.cc (modified) (1 diff)

sources/examples/db/test.cc

@@ -67 +67 @@
             return 1;
 #endif
+        } else {
+            return 1;
         }
 

sources/examples/db_mysql/test.cc

@@ -37 +37 @@
     long now = tools::time::now();
 
-    mysql::__connection_options__ ci("test", argc>1?argv[1]:"localhost", "root", "password", "", 3306);
-
 #ifdef MYSQL_EXT
     try {
+        mysql::__connection_options__ ci("test", argc>1?argv[1]:"localhost", "root", "password", "", 3306);
+
         mysql db(ci);
 

sources/src/dataBaseSqlConstructor.cc

@@ -203 +203 @@
             dodoStringArray array;
 #ifndef USE_DEQUE
-            array.reserve(o->size());
+            array.reserve(i->size());
 #endif
 
             for (;i!=j;++i) {
-                array.clear();
-
                 o = i->begin();
                 p = i->end();
@@ -215 +213 @@
                     array.push_back(o->second);
                 values.push_back(array);
+
+                array.clear();
             }
         }
@@ -233 +233 @@
         dodoStringArray array;
 #ifndef USE_DEQUE
-        array.reserve(o->size());
+        array.reserve(map.size());
 #endif
 

sources/src/ioNetworkServer.cc

@@ -61 +61 @@
     : xexec(s),
       collectedData(this, xexec::OBJECT_IONETWORKSERVER)
+#else
+server::server(server &)
 #endif
 {