Changeset 8066 for code/branches/kicklib/src/libraries/core/PathConfig.cc

Timestamp:

Mar 12, 2011, 11:54:35 PM (13 years ago)

Author:

landauf

Message:

added support for boost 1.46 and adjusted code to work with the 3rd version of boost::filesystem

File:

• code/branches/kicklib/src/libraries/core/PathConfig.cc (modified) (2 diffs)

code/branches/kicklib/src/libraries/core/PathConfig.cc

@@ -59 +59 @@
 #if (BOOST_VERSION == 103600)
 #  define BOOST_LEAF_FUNCTION filename
+#elif (BOOST_FILESYSTEM_VERSION < 3)
+#  define BOOST_LEAF_FUNCTION leaf
 #else
-#  define BOOST_LEAF_FUNCTION leaf
+#  define BOOST_LEAF_FUNCTION path().filename().string
 #endif
 
@@ -282 +284 @@
                     // We've found a helper file
                     const std::string& library = filename.substr(0, filename.size() - moduleextensionlength);
+#if BOOST_FILESYSTEM_VERSION < 3
                     modulePaths.push_back((modulePath_ / library).file_string());
+#else
+                    modulePaths.push_back((modulePath_ / library).string());
+#endif
                 }
             }