tomka 15/08/03 11:36:48
Added: freeorion-0.4.5_pre-boost-1.57.patch
freeorion-0.4.5_pre-boost-1.58.patch
Log:
Fix compatibility with boost-1.5{7,8}
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
565C32BC)
Revision Changes Path
1.1
games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.57.patch?rev=1.1&content-type=text/plain
Index: freeorion-0.4.5_pre-boost-1.57.patch
===================================================================
>From d963b4883c9be2911d791e7daa3ed0f495bc5181 Mon Sep 17 00:00:00 2001
From: Dilvish-fo <[email protected]>
Date: Sat, 11 Apr 2015 10:25:55 -0700
Subject: [PATCH] work-around for a boost 1.57 bug (missing a shard_ptr
serialization include)
---
util/Process.h | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/util/Process.h b/util/Process.h
index ff72445..f9927cc 100644
--- a/util/Process.h
+++ b/util/Process.h
@@ -3,12 +3,16 @@
#define _Process_h_
// HACK: The following two includes work around a bug in boost 1.56,
-// which uses them without including. They can be removed once the bug is gone.
+// which uses them without including.
#include <boost/version.hpp>
#if BOOST_VERSION == 105600
#include <boost/serialization/singleton.hpp> // This
#include <boost/serialization/extended_type_info.hpp> //This
#endif
+// HACK: For a similar boost 1.57 bug
+#if BOOST_VERSION == 105700
+#include <boost/serialization/type_info_implementation.hpp> // This
+#endif
#include <boost/serialization/shared_ptr.hpp>
1.1
games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-strategy/freeorion/files/freeorion-0.4.5_pre-boost-1.58.patch?rev=1.1&content-type=text/plain
Index: freeorion-0.4.5_pre-boost-1.58.patch
===================================================================
>From 8cb623ceecaf00e29f273225eb37602e26e1a6d0 Mon Sep 17 00:00:00 2001
From: Dilvish-fo <[email protected]>
Date: Sat, 6 Jun 2015 08:04:56 -0700
Subject: [PATCH] workarounds for missing includes with boost 1.58
---
util/Process.h | 6 ++++++
util/Serialize.ipp | 9 ++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/util/Process.h b/util/Process.h
index f9927cc..25cec56 100644
--- a/util/Process.h
+++ b/util/Process.h
@@ -14,6 +14,12 @@
#include <boost/serialization/type_info_implementation.hpp> // This
#endif
+#if BOOST_VERSION == 105800
+// HACK: The following two includes work around a bug in boost 1.58
+#include <boost/serialization/type_info_implementation.hpp>
+#include <boost/archive/basic_archive.hpp>
+#endif
+
#include <boost/serialization/shared_ptr.hpp>
#include <vector>
diff --git a/util/Serialize.ipp b/util/Serialize.ipp
index b4027b2..c3c87db 100644
--- a/util/Serialize.ipp
+++ b/util/Serialize.ipp
@@ -1,17 +1,24 @@
+// -*- C++ -*-
#if defined(_MSC_VER) && defined(int64_t)
#undef int64_t
#endif
#include <boost/static_assert.hpp>
#include <boost/detail/endian.hpp>
+#include <boost/version.hpp>
#if BOOST_VERSION == 105600
// HACK: The following two includes work around a bug in boost 1.56,
-// which uses them without including. They can be removed once the bug is gone.
#include <boost/serialization/singleton.hpp> // This
#include <boost/serialization/extended_type_info.hpp> //This
#endif
+#if BOOST_VERSION == 105800
+// HACK: The following two includes work around a bug in boost 1.58
+#include <boost/serialization/type_info_implementation.hpp>
+#include <boost/archive/basic_archive.hpp>
+#endif
+
#include <boost/serialization/export.hpp>
#include <boost/serialization/deque.hpp>
#include <boost/serialization/list.hpp>
