diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-12 00:04:35 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-12 00:04:35 +0000 |
| commit | 00d32b0938eebfa45f0543cae655abf5233eb99c (patch) | |
| tree | 7528e734c1f6f955da0baca5909906e797562c09 /community-staging/0ad/boost-1.50.patch | |
| parent | b44e3e7f16abe5e4cb428571db65d300b7cc44be (diff) | |
Thu Jul 12 00:04:34 UTC 2012
Diffstat (limited to 'community-staging/0ad/boost-1.50.patch')
| -rw-r--r-- | community-staging/0ad/boost-1.50.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/community-staging/0ad/boost-1.50.patch b/community-staging/0ad/boost-1.50.patch new file mode 100644 index 000000000..26ebd3e96 --- /dev/null +++ b/community-staging/0ad/boost-1.50.patch @@ -0,0 +1,39 @@ +diff -ru 0ad-r11863-alpha/source/graphics/TextureManager.cpp 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp +--- 0ad-r11863-alpha/source/graphics/TextureManager.cpp 2012-02-19 04:30:59.000000000 +0100 ++++ 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp 2012-07-10 21:00:52.753251312 +0200 +@@ -425,9 +425,9 @@ + CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath); + if (f) + files.push_back(f); +- p = p / *it; ++ p = p / it->wstring(); + } +- return m_TextureConverter.ComputeSettings(srcPath.leaf(), files); ++ return m_TextureConverter.ComputeSettings(srcPath.leaf().wstring(), files); + } + + /** +diff -ru 0ad-r11863-alpha/source/lib/pch/pch_boost.h 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h +--- 0ad-r11863-alpha/source/lib/pch/pch_boost.h 2012-02-16 19:01:10.000000000 +0100 ++++ 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h 2012-07-10 19:51:38.413009623 +0200 +@@ -25,7 +25,7 @@ + + // the following boost libraries have been included in TR1 and are + // thus deemed usable: +-#define BOOST_FILESYSTEM_VERSION 2 ++#define BOOST_FILESYSTEM_VERSION 3 + #include <boost/filesystem.hpp> + namespace fs = boost::filesystem; + #include <boost/shared_ptr.hpp> +diff -ru 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp +--- 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 2011-05-25 12:39:13.000000000 +0200 ++++ 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp 2012-07-10 20:55:52.523233843 +0200 +@@ -53,7 +53,7 @@ + fs::wpath components = pathname.string(); + fs::wpath::iterator it = components.begin(); + std::advance(it, 2); +- std::wstring dirname = *it; ++ std::wstring dirname = it->wstring(); + + CScriptValRooted ai; + self->m_ScriptInterface.Eval("({})", ai); |