[Boost-commit] svn:boost r60960 - trunk/boost

Subject: [Boost-commit] svn:boost r60960 - trunk/boost
From: john_at_[hidden]
Date: 2010-03-31 07:09:22

Author: johnmaddock
Date: 2010-03-31 07:09:21 EDT (Wed, 31 Mar 2010)
New Revision: 60960
URL: http://svn.boost.org/trac/boost/changeset/60960

Log:
Fixes #4052.
Text files modified: 
   trunk/boost/type_traits.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: trunk/boost/type_traits.hpp
==============================================================================
--- trunk/boost/type_traits.hpp	(original)
+++ trunk/boost/type_traits.hpp	2010-03-31 07:09:21 EDT (Wed, 31 Mar 2010)
@@ -16,7 +16,7 @@
 #include "boost/type_traits/add_reference.hpp"
 #include "boost/type_traits/add_volatile.hpp"
 #include "boost/type_traits/alignment_of.hpp"
-#ifndef __BORLANDC__
+#if !defined(__BORLANDC__) && !defined(__CUDACC__)
 #include "boost/type_traits/has_new_operator.hpp"
 #endif
 #include "boost/type_traits/has_nothrow_assign.hpp"