TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove support for Boost.TypeTraits

Browse source 
Boost enable_if works differently from std::enable_if, so the build is
broken when using Boost.TypeTraits.  The broken code has been present
for a long time and no one reported it.  Remove the fallback to Boost.
This commit is contained in:
Kp 2016-07-15 03:43:01 +00:00
parent 40d4bf4f09
commit 957016621e
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -1366,12 +1366,6 @@ namespace B
using namespace B;
''', main='return A::a;', msg='whether compiler handles classes from "using namespace"', successflags=_successflags)
@_implicit_test
def check_boost_type_traits(self,context,f):
"""
help:assume Boost.TypeTraits works
"""
return self.Compile(context, text=f, msg='for Boost.TypeTraits', ext='.cpp', successflags={'CPPDEFINES' : ['DXX_HAVE_BOOST_TYPE_TRAITS']})
@_implicit_test
def check_cxx11_type_traits(self,context,f,_successflags={'CPPDEFINES' : ['DXX_HAVE_CXX11_TYPE_TRAITS']}):
"""
help:assume <type_traits> works
@ -1385,9 +1379,9 @@ help:assume <type_traits> works
typedef tt::conditional<true,int,long>::type a;
typedef tt::conditional<false,int,long>::type b;
'''
if self.check_cxx11_type_traits(context, f) or self.check_boost_type_traits(context, f):
if self.check_cxx11_type_traits(context, f):
return
raise SCons.Errors.StopError("C++ compiler does not support <type_traits> or Boost.TypeTraits.")
raise SCons.Errors.StopError("C++ compiler does not support <type_traits>.")
@_implicit_test
def check_boost_foreach(self,context,**kwargs):
"""

3
common/include/compiler-type_traits.h
View file

@ -10,9 +10,6 @@
#if defined(DXX_HAVE_CXX11_TYPE_TRAITS)
#include <type_traits>
namespace tt = std;
#elif defined(DXX_HAVE_BOOST_TYPE_TRAITS)
#include <boost/type_traits.hpp>
namespace tt = boost;
#else
#error "No <type_traits> implementation found."
#endif