Changeset 5940 for code/trunk

Timestamp:

Oct 14, 2009, 11:33:13 AM (15 years ago)

Author:

rgrieder

Message:

Fixed boost v1.36 build.

File:

• code/trunk/src/libraries/core/MemoryArchive.cc (modified) (2 diffs)

code/trunk/src/libraries/core/MemoryArchive.cc

@@ -33 +33 @@
 #include <OgreException.h>
 #include <boost/filesystem.hpp>
+#include <boost/version.hpp>
+
+// Boost 1.36 has some issues with deprecated functions that have been omitted
+#if (BOOST_VERSION == 103600)
+#  define BOOST_HAS_BRANCH_PATH_FUNCTION has_parent_path
+#else
+#  define BOOST_HAS_BRANCH_PATH_FUNCTION has_branch_path
+#endif
 
 namespace orxonox
@@ -71 +79 @@
             if (file.empty())
                 continue;
-            if (file.has_branch_path() && !bRecursive)
+            if (file.BOOST_HAS_BRANCH_PATH_FUNCTION() && !bRecursive)
                 continue;
             if (simpleList)