Changeset 15188

Timestamp:

03/30/13 12:20:19 (12 years ago)

Author:

tbretz

Message:

Fixed some compilation issues with older boost version as installed on gate.

Location:

trunk/FACT++/src

Files:

• StateMachineDimControl.cc (modified) (1 diff)
• dimctrl.cc (modified) (4 diffs)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -550 +550 @@
     //     fVerbosity = 90;
 
-    const boost::filesystem::path path(conf.GetName());
-    const string fname = path.filename().string();
+#if BOOST_VERSION < 104600
+    const string fname = boost::filesystem::path(conf.GetName()).filename();
+#else
+    const string fname = boost::filesystem::path(conf.GetName()).filename().string();
+#endif
 
     if (fname=="dimserver")

trunk/FACT++/src/dimctrl.cc

@@ -1 +1 @@
 #include "StateMachineDimControl.h"
+
 #include "RemoteControl.h"
 
@@ -8 +9 @@
 #include "Main.h"
 
+namespace fs = boost::filesystem;
+
 template<class T>
 int RunShell(Configuration &conf)
 {
-    const boost::filesystem::path path(conf.GetName());
-    const string fname = path.filename().string();
+#if BOOST_VERSION < 104600
+    const string fname = fs::path(conf.GetName()).filename();
+#else
+    const string fname = fs::path(conf.GetName()).filename().string();
+#endif
 
     StateMachineDimControl::fIsServer = fname=="dimserver";
@@ -20 +26 @@
 void SetupConfiguration(Configuration &conf)
 {
-    const boost::filesystem::path path(conf.GetName());
-    const string fname = path.filename().string();
+#if BOOST_VERSION < 104600
+    const string fname = fs::path(conf.GetName()).filename();
+#else
+    const string fname = fs::path(conf.GetName()).filename().string();
+#endif
 
     po::options_description control("Options ("+fname+")");
@@ -108 +117 @@
         throw runtime_error("--force-console must be used with --console/-c");
 
-    const boost::filesystem::path path(conf.GetName());
-    const string fname = path.filename().string();
+#if BOOST_VERSION < 104600
+    const string fname = fs::path(conf.GetName()).filename();
+#else
+    const string fname = fs::path(conf.GetName()).filename().string();
+#endif
 
     if (fname=="dimserver" && !conf.Get<bool>("force-console"))