FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[boost::enable_if] Support Boost versions < 1.56

Browse Source
This commit is contained in:
Scott Giese
2020-06-30 11:37:51 +01:00
committed by Automatic Release Builder
parent e4b58b65f3
commit 75b5a927c8
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/nasal/cppbind/NasalHash.hxx
+4
View File
@@ -24,7 +24,11 @@
#include <simgear/structure/map.hxx> #include <simgear/structure/map.hxx>
#include <boost/iterator/iterator_facade.hpp> #include <boost/iterator/iterator_facade.hpp>
#if BOOST_VERSION >= 105600
#include <boost/core/enable_if.hpp> #include <boost/core/enable_if.hpp>
#else
#include <boost/utility/enable_if.hpp>
#endif
namespace nasal namespace nasal
{ {
simgear/props/props.hxx
+5 -1
View File
@@ -56,7 +56,11 @@ namespace boost {
} }
#else #else
# include <boost/type_traits/is_enum.hpp> # 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/debug/logstream.hxx>
# include <simgear/math/SGMathFwd.hxx> # include <simgear/math/SGMathFwd.hxx>
simgear/structure/SGWeakReferenced.hxx
+4
View File
@@ -22,7 +22,11 @@
#include "SGSharedPtr.hxx" #include "SGSharedPtr.hxx"
#include <boost/type_traits/is_base_of.hpp> #include <boost/type_traits/is_base_of.hpp>
#if BOOST_VERSION >= 105600
#include <boost/core/enable_if.hpp> #include <boost/core/enable_if.hpp>
#else
#include <boost/utility/enable_if.hpp>
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push) # pragma warning(push)