From 0bbffe0176b60ff877726840f8b46b7a8c2daf4a Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Mon, 11 Jan 2016 13:47:46 +0000
Subject: [PATCH] Manually revert accidental commit of tentative CUDA changes.

---
 include/boost/type_traits/common_type.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/type_traits/common_type.hpp b/include/boost/type_traits/common_type.hpp
index 4a26d92..c887a89 100644
--- a/include/boost/type_traits/common_type.hpp
+++ b/include/boost/type_traits/common_type.hpp
@@ -18,7 +18,7 @@
 #include <boost/type_traits/detail/common_type_impl.hpp>
 #endif
 
-#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !BOOST_WORKAROUND(__CUDACC_VER__,  < 70500)
+#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 #include <boost/type_traits/detail/mp_defer.hpp>
 #endif
 
@@ -27,7 +27,7 @@ namespace boost
 
 // variadic common_type
 
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !BOOST_WORKAROUND(__CUDACC_VER__,  < 70500)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
 template<class... T> struct common_type
 {