Subject: [Boost-commit] svn:boost r85154 - in trunk/boost/config: . compiler
From: john_at_[hidden]
Date: 2013-07-24 13:19:05
Author: johnmaddock
Date: 2013-07-24 13:19:05 EDT (Wed, 24 Jul 2013)
New Revision: 85154
URL: http://svn.boost.org/trac/boost/changeset/85154
Log:
Apply patch from #8647.
Fixes #8647.
Text files modified:
trunk/boost/config/compiler/nvcc.hpp | 12 ------------
trunk/boost/config/select_compiler_config.hpp | 10 ++++++----
2 files changed, 6 insertions(+), 16 deletions(-)
Modified: trunk/boost/config/compiler/nvcc.hpp
==============================================================================
--- trunk/boost/config/compiler/nvcc.hpp Wed Jul 24 12:29:09 2013 (r85153)
+++ trunk/boost/config/compiler/nvcc.hpp 2013-07-24 13:19:05 EDT (Wed, 24 Jul 2013) (r85154)
@@ -14,15 +14,3 @@
// NVIDIA Specific support
// BOOST_GPU_ENABLED : Flag a function or a method as being enabled on the host and device
#define BOOST_GPU_ENABLED __host__ __device__
-
-// Boost support macro for NVCC
-// NVCC Basically behaves like some flavor of MSVC6 + some specific quirks
-#ifdef __GNUC__
-
-#include <boost/config/compiler/gcc.hpp>
-
-#elif defined(_MSC_VER)
-
-#include <boost/config/compiler/visualc.hpp>
-
-#endif
Modified: trunk/boost/config/select_compiler_config.hpp
==============================================================================
--- trunk/boost/config/select_compiler_config.hpp Wed Jul 24 12:29:09 2013 (r85153)
+++ trunk/boost/config/select_compiler_config.hpp 2013-07-24 13:19:05 EDT (Wed, 24 Jul 2013) (r85154)
@@ -13,6 +13,12 @@
// locate which compiler we are using and define
// BOOST_COMPILER_CONFIG as needed:
+#if defined __CUDACC__
+// NVIDIA CUDA C++ compiler for GPU
+# include "boost/config/compiler/nvcc.hpp"
+
+#endif
+
#if defined(__GCCXML__)
// GCC-XML emulates other compilers, it has to appear first here!
# define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc_xml.hpp"
@@ -21,10 +27,6 @@
// EDG based Cray compiler:
# define BOOST_COMPILER_CONFIG "boost/config/compiler/cray.hpp"
-#elif defined __CUDACC__
-// NVIDIA CUDA C++ compiler for GPU
-# define BOOST_COMPILER_CONFIG "boost/config/compiler/nvcc.hpp"
-
#elif defined __COMO__
// Comeau C++
# define BOOST_COMPILER_CONFIG "boost/config/compiler/comeau.hpp"