Made Boost version-specific changes more flexible, as they reportedly…

… are needed for 1.62 as well.
freeorion · Oct 20, 2016 · 6b971f6 · 6b971f6
1 parent c5bcccf
commit 6b971f6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/universe/Building.h b/universe/Building.h
@@ -69,11 +69,11 @@ class FO_COMMON_API Building : public UniverseObject {
     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
     template <class T> friend void boost::checked_delete(T* x);
 
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 public:
 #endif
     ~Building() {}
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 protected:
 #endif
 

diff --git a/universe/Field.h b/universe/Field.h
@@ -48,11 +48,11 @@ class FO_COMMON_API Field : public UniverseObject {
     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
     template <class T> friend void boost::checked_delete(T* x);
 
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 public:
 #endif
     ~Field() {}
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 protected:
 #endif
 

diff --git a/universe/Fleet.h b/universe/Fleet.h
@@ -150,11 +150,11 @@ class FO_COMMON_API Fleet : public UniverseObject {
     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
     template <class T> friend void boost::checked_delete(T* x);
 
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 public:
 #endif
     ~Fleet() {}
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 protected:
 #endif
 

diff --git a/universe/Planet.h b/universe/Planet.h
@@ -128,11 +128,11 @@ class FO_COMMON_API Planet :
     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
     template <class T> friend void boost::checked_delete(T* x);
 
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 public:
 #endif
     ~Planet() {}
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 protected:
 #endif
 

diff --git a/universe/Ship.h b/universe/Ship.h
@@ -104,11 +104,11 @@ class FO_COMMON_API Ship : public UniverseObject {
     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
     template <class T> friend void boost::checked_delete(T* x);
 
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 public:
 #endif
     ~Ship() {}
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 protected:
 #endif
 

diff --git a/universe/System.h b/universe/System.h
@@ -134,11 +134,11 @@ class FO_COMMON_API System : public UniverseObject {
     template <class T> friend void boost::python::detail::value_destroyer<false>::execute(T const volatile* p);
     template <class T> friend void boost::checked_delete(T* x);
 
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 public:
 #endif
     ~System() {}
-#if BOOST_VERSION == 106100
+#if BOOST_VERSION >= 106100
 protected:
 #endif