From: <tz...@us...> - 2007-07-05 02:33:24
|
Revision: 2120 http://svn.sourceforge.net/freeorion/revision/?rev=2120&view=rev Author: tzlaine Date: 2007-07-04 19:33:26 -0700 (Wed, 04 Jul 2007) Log Message: ----------- Small changes to get the code to compile with Boost 1.34 and the latest GG. Modified Paths: -------------- branches/networking-reimplementation/FreeOrion/UI/ClientUI.cpp branches/networking-reimplementation/FreeOrion/UI/OptionsWnd.cpp branches/networking-reimplementation/FreeOrion/build_config.py branches/networking-reimplementation/FreeOrion/network/ServerNetworking.h branches/networking-reimplementation/FreeOrion/server/ServerApp.cpp branches/networking-reimplementation/FreeOrion/util/MultiplayerCommon.cpp branches/networking-reimplementation/FreeOrion/util/Serialize.cpp Modified: branches/networking-reimplementation/FreeOrion/UI/ClientUI.cpp =================================================================== --- branches/networking-reimplementation/FreeOrion/UI/ClientUI.cpp 2007-07-05 01:13:37 UTC (rev 2119) +++ branches/networking-reimplementation/FreeOrion/UI/ClientUI.cpp 2007-07-05 02:33:26 UTC (rev 2120) @@ -28,7 +28,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> @@ -591,7 +591,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: branches/networking-reimplementation/FreeOrion/UI/OptionsWnd.cpp =================================================================== --- branches/networking-reimplementation/FreeOrion/UI/OptionsWnd.cpp 2007-07-05 01:13:37 UTC (rev 2119) +++ branches/networking-reimplementation/FreeOrion/UI/OptionsWnd.cpp 2007-07-05 02:33:26 UTC (rev 2120) @@ -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> @@ -495,7 +495,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: branches/networking-reimplementation/FreeOrion/build_config.py =================================================================== --- branches/networking-reimplementation/FreeOrion/build_config.py 2007-07-05 01:13:37 UTC (rev 2119) +++ branches/networking-reimplementation/FreeOrion/build_config.py 2007-07-05 02:33:26 UTC (rev 2120) @@ -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: branches/networking-reimplementation/FreeOrion/network/ServerNetworking.h =================================================================== --- branches/networking-reimplementation/FreeOrion/network/ServerNetworking.h 2007-07-05 01:13:37 UTC (rev 2119) +++ branches/networking-reimplementation/FreeOrion/network/ServerNetworking.h 2007-07-05 02:33:26 UTC (rev 2120) @@ -9,7 +9,9 @@ #include <boost/function.hpp> #include <boost/iterator/filter_iterator.hpp> +#include <set> + class DiscoveryServer; class Message; class PlayerConnection; Modified: branches/networking-reimplementation/FreeOrion/server/ServerApp.cpp =================================================================== --- branches/networking-reimplementation/FreeOrion/server/ServerApp.cpp 2007-07-05 01:13:37 UTC (rev 2119) +++ branches/networking-reimplementation/FreeOrion/server/ServerApp.cpp 2007-07-05 02:33:26 UTC (rev 2120) @@ -32,7 +32,7 @@ #include <log4cpp/FileAppender.hh> // for dummy video driver setenv-hack -#include "SDL_getenv.h" +#include "SDL/SDL_getenv.h" #include <ctime> Modified: branches/networking-reimplementation/FreeOrion/util/MultiplayerCommon.cpp =================================================================== --- branches/networking-reimplementation/FreeOrion/util/MultiplayerCommon.cpp 2007-07-05 01:13:37 UTC (rev 2119) +++ branches/networking-reimplementation/FreeOrion/util/MultiplayerCommon.cpp 2007-07-05 02:33:26 UTC (rev 2120) @@ -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> @@ -200,7 +200,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: branches/networking-reimplementation/FreeOrion/util/Serialize.cpp =================================================================== --- branches/networking-reimplementation/FreeOrion/util/Serialize.cpp 2007-07-05 01:13:37 UTC (rev 2119) +++ branches/networking-reimplementation/FreeOrion/util/Serialize.cpp 2007-07-05 02:33:26 UTC (rev 2120) @@ -10,7 +10,7 @@ #include "../universe/System.h" #include "../util/OrderSet.h" -#include "SDL_byteorder.h" +#include "SDL/SDL_byteorder.h" #if defined(_MSC_VER) // HACK! this keeps VC 7.x from barfing when it sees "typedef __int64 int64_t;" |