From: <tz...@us...> - 2007-07-04 23:37:40
|
Revision: 2117 http://svn.sourceforge.net/freeorion/revision/?rev=2117&view=rev Author: tzlaine Date: 2007-07-04 16:37:42 -0700 (Wed, 04 Jul 2007) Log Message: ----------- Bumped the Boost version requirements to 1.34. This fixes the still-lingering Boost.Signals auto-disconnection problems. Modified Paths: -------------- trunk/FreeOrion/UI/ClientUI.cpp trunk/FreeOrion/UI/OptionsWnd.cpp trunk/FreeOrion/build_config.py trunk/FreeOrion/util/MultiplayerCommon.cpp Modified: trunk/FreeOrion/UI/ClientUI.cpp =================================================================== --- trunk/FreeOrion/UI/ClientUI.cpp 2007-07-04 22:33:48 UTC (rev 2116) +++ trunk/FreeOrion/UI/ClientUI.cpp 2007-07-04 23:37:42 UTC (rev 2117) @@ -29,7 +29,7 @@ #include <log4cpp/FileAppender.hh> #include <boost/algorithm/string/predicate.hpp> -#include <boost/filesystem/exception.hpp> +#include <boost/filesystem/cerrno.hpp> #include <boost/filesystem/fstream.hpp> #include <boost/filesystem/operations.hpp> #include <boost/spirit.hpp> @@ -679,7 +679,7 @@ textures.push_back(ClientUI::GetTexture(*it)); } catch (const fs::filesystem_error& e) { // ignore files for which permission is denied, and rethrow other exceptions - if (e.error() != fs::security_error) + if (e.system_error() != EACCES) throw; } } Modified: trunk/FreeOrion/UI/OptionsWnd.cpp =================================================================== --- trunk/FreeOrion/UI/OptionsWnd.cpp 2007-07-04 22:33:48 UTC (rev 2116) +++ trunk/FreeOrion/UI/OptionsWnd.cpp 2007-07-04 23:37:42 UTC (rev 2117) @@ -14,10 +14,10 @@ #include <boost/algorithm/string/erase.hpp> #include <boost/algorithm/string/predicate.hpp> +#include <boost/filesystem/cerrno.hpp> +#include <boost/filesystem/convenience.hpp> #include <boost/filesystem/fstream.hpp> #include <boost/filesystem/operations.hpp> -#include <boost/filesystem/convenience.hpp> -#include <boost/filesystem/exception.hpp> #include <boost/format.hpp> #include <boost/spirit.hpp> @@ -502,7 +502,7 @@ } } catch (const fs::filesystem_error& e) { // ignore files for which permission is denied, and rethrow other exceptions - if (e.error() != fs::security_error) + if (e.system_error() != EACCES) throw; } } Modified: trunk/FreeOrion/build_config.py =================================================================== --- trunk/FreeOrion/build_config.py 2007-07-04 22:33:48 UTC (rev 2116) +++ trunk/FreeOrion/build_config.py 2007-07-04 23:37:42 UTC (rev 2117) @@ -13,10 +13,10 @@ sdl_version = '1.2.7' -boost_version_string = '1.33.1' +boost_version_string = '1.34' def BoostStringToNumber(version_string): pieces = version_string.split('.') - return str(int(pieces[0]) * 100000 + int(pieces[1]) * 100 + int(pieces[2])) + return str(int(pieces[0]) * 100000 + int(pieces[1]) * 100 + (3 <= len(pieces) and int(pieces[2]) or 0)) boost_version = BoostStringToNumber(boost_version_string) log4cpp_version = '0.3.4b' Modified: trunk/FreeOrion/util/MultiplayerCommon.cpp =================================================================== --- trunk/FreeOrion/util/MultiplayerCommon.cpp 2007-07-04 22:33:48 UTC (rev 2116) +++ trunk/FreeOrion/util/MultiplayerCommon.cpp 2007-07-04 23:37:42 UTC (rev 2117) @@ -18,8 +18,8 @@ # define BOOST_MSVC -1 #endif -#include <boost/filesystem/exception.hpp> #include <boost/filesystem/operations.hpp> +#include <boost/filesystem/cerrno.hpp> #include <fstream> #include <iostream> @@ -199,7 +199,7 @@ } } catch (const fs::filesystem_error& e) { // ignore files for which permission is denied, and rethrow other exceptions - if (e.error() != fs::security_error) + if (e.system_error() != EACCES) throw; } } |