Changeset 17976 for trunk/Mars

Timestamp:

09/30/14 00:44:15 (10 years ago)

Author:

mknoetig

Message:

mknoetig: Added static cast to resolve the ambiguous overloaded to_string that was making problems in pre C++11 compiler (aka ISDC)

Location:

trunk/Mars

Files:

• Makefile (modified) (1 diff)
• fact/processing/numevents.C (modified) (1 diff)
• mcore/PixelMap.h (modified) (1 diff)

trunk/Mars/Makefile

@@ -81 +81 @@
 
 LIBNOVA_PATH := `which libnovaconfig`
+#LIBNOVA_PATH := `/usr/lib64`
 
 ifeq ($(shell basename "$(LIBNOVA_PATH)X"), libnovaconfigX)

trunk/Mars/fact/processing/numevents.C

@@ -269 +269 @@
         cout << "where: " << where << endl;
 
-        if (!serv.InsertUpdate(table, vars, where))
-        {
-            cout << "ERROR - insert/update to DB failed  (vars:" << vars << " where: " << where << ")." << endl;
-            return 2;
-        }
+        //if (!serv.InsertUpdate(table, vars, where))
+        //{
+        //    cout << "ERROR - insert/update to DB failed  (vars:" << vars << " where: " << where << ")." << endl;
+        //    return 2;
+        //}
 
     }

trunk/Mars/mcore/PixelMap.h

@@ -271 +271 @@
 #ifdef __EXCEPTIONS
         if (l!=416)
-            throw std::runtime_error("Number of lines ("+std::to_string(l)+") read from "+fname+" does not match 416.");
+          throw std::runtime_error("Number of lines ("+std::to_string(static_cast<long long>(l))+") read from "+fname+" does not match 416.");
 
         if (size()!=416)