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

Timestamp:

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

Author:

rgrieder

Message:

Resolved problems with different Boost filesystem versions.

File:

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

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

@@ -33 +33 @@
 #include <OgreFileSystem.h>
 #include <OgreResourceGroupManager.h>
+
+// Differentiate Boost Filesystem v2 and v3
+#if (BOOST_FILESYSTEM_VERSION < 3)
+#  define BF_GENERIC_STRING string
+#else
+#  define BF_GENERIC_STRING generic_string
+#endif
 
 namespace orxonox
@@ -98 +105 @@
                     boost::filesystem::path base(it->archive->getName());
                     base /= it->filename;
-                    ptr->fileSystemPath = base.string();
+                    ptr->fileSystemPath = base.BF_GENERIC_STRING();
                 }
                 return ptr;