[Orxonox-commit 1222] r5940 - code/trunk/src/libraries/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-10-14 11:33:13 +0200 (Wed, 14 Oct 2009)
New Revision: 5940

Modified:
   code/trunk/src/libraries/core/MemoryArchive.cc
Log:
Fixed boost v1.36 build.

Modified: code/trunk/src/libraries/core/MemoryArchive.cc
===================================================================
--- code/trunk/src/libraries/core/MemoryArchive.cc	2009-10-13 22:40:13 UTC (rev 5939)
+++ code/trunk/src/libraries/core/MemoryArchive.cc	2009-10-14 09:33:13 UTC (rev 5940)
@@ -32,7 +32,15 @@
 
 #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
 {
     using namespace Ogre;
@@ -70,7 +78,7 @@
                 file = file.branch_path();
             if (file.empty())
                 continue;
-            if (file.has_branch_path() && !bRecursive)
+            if (file.BOOST_HAS_BRANCH_PATH_FUNCTION() && !bRecursive)
                 continue;
             if (simpleList)
                 simpleList->push_back(file.string());