feedc0de/boost_type_traits
1
0
Fork 0
forked from boostorg/type_traits
Code Pull Requests Activity

Manually revert accidental commit of tentative CUDA changes.

Browse Source
This commit is contained in:
jzmaddock
2016-01-11 13:47:46 +00:00
parent c526c89267
commit 0bbffe0176
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/type_traits/common_type.hpp
View File

@ -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
{