From 957016621ec9188f67b59cf37cc3ab56e24dba75 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Fri, 15 Jul 2016 03:43:01 +0000
Subject: [PATCH] Remove support for Boost.TypeTraits

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.
---
 SConstruct                            | 10 ++--------
 common/include/compiler-type_traits.h |  3 ---
 2 files changed, 2 insertions(+), 11 deletions(-)

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 <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):
 		"""
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 <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