diff --git a/SConstruct b/SConstruct index d32f2bf13..153a79424 100644 --- a/SConstruct +++ b/SConstruct @@ -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 works @@ -1385,9 +1379,9 @@ help:assume works typedef tt::conditional::type a; typedef tt::conditional::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 or Boost.TypeTraits.") + raise SCons.Errors.StopError("C++ compiler does not support .") @_implicit_test def check_boost_foreach(self,context,**kwargs): """ diff --git a/common/include/compiler-type_traits.h b/common/include/compiler-type_traits.h index d4e57c9fc..386d9d277 100644 --- a/common/include/compiler-type_traits.h +++ b/common/include/compiler-type_traits.h @@ -10,9 +10,6 @@ #if defined(DXX_HAVE_CXX11_TYPE_TRAITS) #include namespace tt = std; -#elif defined(DXX_HAVE_BOOST_TYPE_TRAITS) -#include -namespace tt = boost; #else #error "No implementation found." #endif