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

Remove deprecated boost/utility.

Browse Source 
This is enable compatibility with boost 1.69.
This commit is contained in:
Scott Giese
2020-06-29 09:41:24 +01:00
committed by Automatic Release Builder
parent b1334bf9a0
commit e4b58b65f3
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/nasal/cppbind/NasalHash.hxx
+1
View File
@@ -24,6 +24,7 @@
#include <simgear/structure/map.hxx> #include <simgear/structure/map.hxx>
#include <boost/iterator/iterator_facade.hpp> #include <boost/iterator/iterator_facade.hpp>
#include <boost/core/enable_if.hpp>
namespace nasal namespace nasal
{ {
simgear/props/props.hxx
+2 -1
View File
@@ -55,13 +55,14 @@ namespace boost {
struct disable_if : public disable_if_c<Cond::value, T> {}; struct disable_if : public disable_if_c<Cond::value, T> {};
} }
#else #else
# include <boost/utility.hpp>
# include <boost/type_traits/is_enum.hpp> # include <boost/type_traits/is_enum.hpp>
# include <boost/core/enable_if.hpp>
# include <simgear/debug/logstream.hxx> # include <simgear/debug/logstream.hxx>
# include <simgear/math/SGMathFwd.hxx> # include <simgear/math/SGMathFwd.hxx>
# include <simgear/math/sg_types.hxx> # include <simgear/math/sg_types.hxx>
#endif #endif
#include <simgear/structure/SGReferenced.hxx> #include <simgear/structure/SGReferenced.hxx>
#include <simgear/structure/SGSharedPtr.hxx> #include <simgear/structure/SGSharedPtr.hxx>
simgear/structure/SGWeakReferenced.hxx
+1 -1
View File
@@ -22,7 +22,7 @@
#include "SGSharedPtr.hxx" #include "SGSharedPtr.hxx"
#include <boost/type_traits/is_base_of.hpp> #include <boost/type_traits/is_base_of.hpp>
#include <boost/utility/enable_if.hpp> #include <boost/core/enable_if.hpp>
#ifdef _MSC_VER #ifdef _MSC_VER
# pragma warning(push) # pragma warning(push)