Ticket #1527: boost150support.patch

build/premake/extern_libs4.lua

@@ -216 +216 @@
             end
             -- These are only needed for boost <= 1.43
             add_default_links({
-                android_names = { "boost_system-gcc-mt" },
-                unix_names = { "boost_system-mt" },
-                bsd_names = { "boost_system" },
+                android_names = { "boost_filesystem-gcc-mt", "boost_system-gcc-mt" },
+                unix_names = { "boost_filesystem-mt", "boost_system-mt" },
+                bsd_names = { "boost_filesystem", "boost_system" },
             })
         end,
         link_settings = function()

source/graphics/TextureManager.cpp

@@ -425 +425 @@
             CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath);
             if (f)
                 files.push_back(f);
-            p = p / *it;
+            p = p / GetWstringFromWpath(*it);
         }
-        return m_TextureConverter.ComputeSettings(srcPath.leaf(), files);
+        return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files);
     }
 
     /**

source/lib/pch/pch_boost.h

@@ -25 +25 @@
 
 // the following boost libraries have been included in TR1 and are
 // thus deemed usable:
-#define BOOST_FILESYSTEM_VERSION 2
+#if BOOST_VERSION >= 104400
+// Filesystem v3 is included since Boost 1.44
+// v2 is deprecated since 1.46 and removed entirely in 1.50
+# define BOOST_FILESYSTEM_VERSION 3
+#else
+# define BOOST_FILESYSTEM_VERSION 2
+#endif
 #include <boost/filesystem.hpp>
 namespace fs = boost::filesystem;
+
 #include <boost/shared_ptr.hpp>
 
 // (these ones are used more rarely, so we don't enable them in minimal configurations)

source/ps/Filesystem.cpp

@@ -95 +95 @@
     return INFO::OK;
 }
 
+std::wstring GetWstringFromWpath(const fs::wpath& path)
+{
+#if BOOST_FILESYSTEM_VERSION == 3
+    return path.wstring();
+#else
+    return path.string();
+#endif
+}
 
+
 CVFSFile::CVFSFile()
     : m_BufferSize(0)
 {

source/ps/Filesystem.h

@@ -54 +54 @@
  **/
 extern Status ReloadChangedFiles();
 
+/**
+ * Helper function to handle differences between Boost Filesystem v2 and v3
+ * There is no implicit conversion from wpath to std::wstring in v3
+ */
+std::wstring GetWstringFromWpath(const fs::wpath& path);
+
 ERROR_GROUP(CVFSFile);
 ERROR_TYPE(CVFSFile, LoadFailed);
 ERROR_TYPE(CVFSFile, AlreadyLoaded);

source/simulation2/components/ICmpAIManager.cpp

@@ -53 +53 @@
         fs::wpath components = pathname.string();
         fs::wpath::iterator it = components.begin();
         std::advance(it, 2);
-        std::wstring dirname = *it;
+        std::wstring dirname = GetWstringFromWpath(*it);
 
         CScriptValRooted ai;
         self->m_ScriptInterface.Eval("({})", ai);