[patch] boost 1.85 patch

D5267.diff (text/plain), 1.07 KB, created by Marcin Deranek on 2024-05-20 07:25:01 UTC

Index: source/graphics/TextureManager.cpp
===================================================================
--- a/source/graphics/TextureManager.cpp
+++ b/source/graphics/TextureManager.cpp
@@ -806,7 +806,7 @@
 				files.push_back(f);
 			p = p / GetWstringFromWpath(*it);
 		}
-		return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files);
+		return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.filename()), files);
 	}
 
 	/**
Index: source/lib/file/file_system.cpp
===================================================================
--- a/source/lib/file/file_system.cpp
+++ b/source/lib/file/file_system.cpp
@@ -229,7 +229,11 @@
 	try
 	{
 		if(override_if_exists)
+#if BOOST_VERSION >=107400
+			fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_options::overwrite_existing);
+#else
 			fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_option::overwrite_if_exists);
+#endif
 		else
 			fs::copy_file(fs::path(path.string()), fs::path(newPath.string()));
 	}