Changeset 16469 for trunk/FACT++

Timestamp:

05/30/13 10:14:11 (11 years ago)

Author:

tbretz

Message:

Made compile also with the root version on gate.

Location:

trunk/FACT++/src

Files:

• EventBuilderWrapper.h (modified) (1 diff)
• Readline.cc (modified) (2 diffs)
• temperature.cc (modified) (1 diff)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -832 +832 @@
         const lock_guard<mutex> lock(mtx_newrun);
 
-        map<uint32_t,FAD::RunDescription>::const_iterator it = fExpectedRuns.begin();
+        map<uint32_t,FAD::RunDescription>::iterator it = fExpectedRuns.begin();
         while (it!=fExpectedRuns.end())
         {

trunk/FACT++/src/Readline.cc

@@ -1278 +1278 @@
     stifle_history(0);
     unstifle_history();
-#if BOOST_VERSION < 104600
-    read_history(his.c_str());
-#else
     read_history(his.string().c_str());
-#endif
 }
 
@@ -1298 +1294 @@
     his /= fname;
 
-#if BOOST_VERSION < 104600
-    write_history(his.c_str());
-    history_truncate_file(his.c_str(), 1000);
-#else
     write_history(his.string().c_str());
     history_truncate_file(his.string().c_str(), 1000);
-#endif
 
     stifle_history(0);

trunk/FACT++/src/temperature.cc

@@ +1 @@
+#if BOOST_VERSION < 104600
+#include <assert.h>
+#endif
+
 #include <boost/bind.hpp>
 #include <boost/array.hpp>