Changeset 12787 for trunk

Timestamp:

01/30/12 17:01:17 (13 years ago)

Author:

tbretz

Message:

Icreased compatibility with different boost versions.

File:

• trunk/FACT++/src/Configuration.cc (modified) (3 diffs)

trunk/FACT++/src/Configuration.cc

@@ -1155 +1155 @@
     const po::parsed_options parsed_database =
         fDatabase.empty() ? po::parsed_options(&opt_database) :
+#if BOOST_VERSION < 104700
         parse_database(path.filename(), fDatabase, opt_database, !checkdb);
-
+#else
+        parse_database(path.filename().string(), fDatabase, opt_database, !checkdb);
+#endif
     // ------------------------ (11) -------------------------
 
@@ -1329 +1332 @@
 
     string pname = path.parent_path().string();
+#if BOOST_VERSION < 104700
     string fname = path.filename();
+#else
+    string fname = path.filename().string();
+#endif
 
     // If the filename starts with "lt-" remove it from the name
@@ -1419 +1426 @@
     }
 
+#if BOOST_VERSION < 104700
     const std::string n = boost::filesystem::path(fName).filename();
+#else
+    const std::string n = boost::filesystem::path(fName).filename().string();
+#endif
 
     const string name = PACKAGE_STRING;