File 0001-boost-enable_if-Support-Boost-versions-1.5... of Package SimGear

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-boost-enable_if-Support-Boost-versions-1.56.patch of Package SimGear (Revision c4d482308449bed279187920157f5586)

Currently displaying revision c4d482308449bed279187920157f5586 , Show latest

From 7246edcb4b5180bf14c25a012562120ff0805fac Mon Sep 17 00:00:00 2001
From: Scott Giese <scttgs0@gmail.com>
Date: Tue, 5 Feb 2019 12:20:06 -0600
Subject: [PATCH] [boost::enable_if] Support Boost versions < 1.56

---
 simgear/nasal/cppbind/NasalHash.hxx    | 4 ++++
 simgear/props/props.hxx                | 6 +++++-
 simgear/structure/SGWeakReferenced.hxx | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
index 5019d08b..59281643 100644
--- a/simgear/nasal/cppbind/NasalHash.hxx
+++ b/simgear/nasal/cppbind/NasalHash.hxx
@@ -24,7 +24,11 @@
 
 #include <simgear/structure/map.hxx>
 #include <boost/iterator/iterator_facade.hpp>
+#if BOOST_VERSION >= 105600
 #include <boost/core/enable_if.hpp>
+#else
+#include <boost/utility/enable_if.hpp>
+#endif
 
 namespace nasal
 {
diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx
index 68d3c03c..3afc8796 100644
--- a/simgear/props/props.hxx
+++ b/simgear/props/props.hxx
@@ -56,7 +56,11 @@ namespace boost {
 }
 #else
 # include <boost/type_traits/is_enum.hpp>
-# include <boost/core/enable_if.hpp>
+#if BOOST_VERSION >= 105600
+#include <boost/core/enable_if.hpp>
+#else
+#include <boost/utility/enable_if.hpp>
+#endif
 
 # include <simgear/debug/logstream.hxx>
 # include <simgear/math/SGMathFwd.hxx>
diff --git a/simgear/structure/SGWeakReferenced.hxx b/simgear/structure/SGWeakReferenced.hxx
index 27f647b4..24db41b8 100644
--- a/simgear/structure/SGWeakReferenced.hxx
+++ b/simgear/structure/SGWeakReferenced.hxx
@@ -22,7 +22,11 @@
 #include "SGSharedPtr.hxx"
 
 #include <boost/type_traits/is_base_of.hpp>
+#if BOOST_VERSION >= 105600
 #include <boost/core/enable_if.hpp>
+#else
+#include <boost/utility/enable_if.hpp>
+#endif
 
 #ifdef _MSC_VER
 # pragma warning(push)
-- 
2.21.0

Places

File 0001-boost-enable_if-Support-Boost-versions-1.56.patch of Package SimGear (Revision c4d482308449bed279187920157f5586)

Places