Changeset 8225 for code/branches/kicklib/src/libraries/core/GraphicsManager.cc

Timestamp:

Apr 10, 2011, 9:03:59 PM (14 years ago)

Author:

rgrieder

Message:

Resolved problems with different Boost filesystem versions.

File:

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

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

@@ -61 +61 @@
 #include "command/ConsoleCommand.h"
 
+// Differentiate Boost Filesystem v2 and v3
+#if (BOOST_FILESYSTEM_VERSION < 3)
+#  define BF_NATIVE_STRING file_string
+#else
+#  define BF_NATIVE_STRING string
+#endif
+
 namespace orxonox
 {
@@ -243 +250 @@
         // Use backslash paths on Windows! file_string() already does that though.
         for (unsigned int i = 0; i < plugins.size(); ++i)
-#if BOOST_FILESYSTEM_VERSION < 3
-            ogreRoot_->loadPlugin((folder / plugins[i]).file_string());
-#else
-            ogreRoot_->loadPlugin((folder / plugins[i]).string());
-#endif
+            ogreRoot_->loadPlugin((folder / plugins[i]).BF_NATIVE_STRING());
     }