Mercurial > hg > vamp-build-and-test

diff DEPENDENCIES/generic/include/boost/ratio/detail/mpl/gcd.hpp @ 101:c530137014c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/ratio/detail/mpl/gcd.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/ratio/detail/mpl/gcd.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -17,7 +17,6 @@
 #include <boost/mpl/aux_/largest_int.hpp>
 #include <boost/mpl/aux_/na_spec.hpp>
 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/mpl/aux_/config/eti.hpp>
 #include <boost/mpl/aux_/config/integral.hpp>
 #include <boost/mpl/aux_/config/static_constant.hpp>
 #include <boost/mpl/aux_/config/dependent_nttp.hpp>
@@ -25,6 +24,7 @@
 
 #if    !defined(BOOST_MPL_CFG_NO_NESTED_VALUE_ARITHMETIC_2) \
     && !defined(BOOST_MPL_PREPROCESSING_MODE) \
+    && !defined(__CUDACC__) \
     && ( defined(BOOST_MSVC) \
         || BOOST_WORKAROUND(__EDG_VERSION__, <= 238) \
         )