Manually revert accidental commit of tentative CUDA changes.

boostorg · Jan 11, 2016 · 0bbffe0 · 0bbffe0
1 parent c526c89
commit 0bbffe0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
 {