COMMON: Fix compilation with boost filesystem v2

xoreos · Jan 20, 2013 · a3287a5 · a3287a5
1 parent b300f49
commit a3287a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/common/filelist.cpp b/src/common/filelist.cpp
@@ -29,6 +29,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
+#include <boost/version.hpp>
 
 #include "common/filelist.h"
 #include "common/file.h"
@@ -45,7 +46,9 @@ using boost::to_lower_copy;
 using boost::equals;
 using boost::iequals;
 
-#if BOOST_FILESYSTEM_VERSION == 3
+#if ((((BOOST_VERSION / 100000) == 1) && (((BOOST_VERSION / 100) % 1000) < 44)) || BOOST_FILESYSTEM_VERSION == 2)
+#define generic_string() string()
+#elif BOOST_FILESYSTEM_VERSION == 3
 #define stem() stem().string()
 #endif
 

diff --git a/src/common/filepath.cpp b/src/common/filepath.cpp
@@ -32,6 +32,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/system/config.hpp>
 #include <boost/regex.hpp>
+#include <boost/version.hpp>
 
 #include "common/filepath.h"
 #include "common/util.h"
@@ -48,7 +49,9 @@ using boost::filesystem::directory_iterator;
 using boost::equals;
 using boost::iequals;
 
-#if BOOST_FILESYSTEM_VERSION == 3
+#if ((((BOOST_VERSION / 100000) == 1) && (((BOOST_VERSION / 100) % 1000) < 44)) || BOOST_FILESYSTEM_VERSION == 2)
+#define generic_string() string()
+#elif BOOST_FILESYSTEM_VERSION == 3
 #define stem() stem().string()
 #define extension() extension().string()
 #define filename() filename().string()