[Boost-commit] svn:boost r60622 - in branches/release/boost/config: . compiler platform

Subject: [Boost-commit] svn:boost r60622 - in branches/release/boost/config: . compiler platform
From: john_at_[hidden]
Date: 2010-03-15 13:55:47

Author: johnmaddock
Date: 2010-03-15 13:55:47 EDT (Mon, 15 Mar 2010)
New Revision: 60622
URL: http://svn.boost.org/trac/boost/changeset/60622

Log:
Merge patches from Trunk.
Added:
   branches/release/boost/config/compiler/nvcc.hpp
      - copied unchanged from r60615, /trunk/boost/config/compiler/nvcc.hpp
   branches/release/boost/config/platform/symbian.hpp
      - copied unchanged from r60615, /trunk/boost/config/platform/symbian.hpp
Properties modified: 
   branches/release/boost/config/   (props changed)
Text files modified: 
   branches/release/boost/config/compiler/gcc.hpp           |     6 +++---                                  
   branches/release/boost/config/compiler/pgi.hpp           |    21 ++++++++++++++++++---                   
   branches/release/boost/config/compiler/visualc.hpp       |     2 +-                                      
   branches/release/boost/config/select_compiler_config.hpp |     5 +++++                                   
   branches/release/boost/config/select_platform_config.hpp |     4 ++++                                    
   branches/release/boost/config/suffix.hpp                 |     9 +++++++--                               
   6 files changed, 38 insertions(+), 9 deletions(-)

Modified: branches/release/boost/config/compiler/gcc.hpp
==============================================================================
--- branches/release/boost/config/compiler/gcc.hpp	(original)
+++ branches/release/boost/config/compiler/gcc.hpp	2010-03-15 13:55:47 EDT (Mon, 15 Mar 2010)
@@ -108,11 +108,8 @@
 //
 #define BOOST_NO_CONSTEXPR
 #define BOOST_NO_EXTERN_TEMPLATE
-#define BOOST_NO_LAMBDAS
 #define BOOST_NO_NULLPTR
-#define BOOST_NO_RAW_LITERALS
 #define BOOST_NO_TEMPLATE_ALIASES
-#define BOOST_NO_UNICODE_LITERALS
 
 // C++0x features in 4.3.n and later
 //
@@ -168,6 +165,9 @@
 //
 #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5) || !defined(__GXX_EXPERIMENTAL_CXX0X__)
 #  define BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#  define BOOST_NO_LAMBDAS
+#  define BOOST_NO_RAW_LITERALS
+#  define BOOST_NO_UNICODE_LITERALS
 #endif
 
 // ConceptGCC compiler:

Modified: branches/release/boost/config/compiler/pgi.hpp
==============================================================================
--- branches/release/boost/config/compiler/pgi.hpp	(original)
+++ branches/release/boost/config/compiler/pgi.hpp	2010-03-15 13:55:47 EDT (Mon, 15 Mar 2010)
@@ -16,11 +16,28 @@
 // if no threading API is detected.
 //
 
-#if (__PGIC__ >= 7)
+// PGI 10.x doesn't seem to define __PGIC__
+
+// versions earlier than 10.x do define __PGIC__
+#if __PGIC__ >= 10
+
+// options requested by configure --enable-test
+#define BOOST_HAS_PTHREADS
+#define BOOST_HAS_NRVO
+#define BOOST_HAS_LONG_LONG
+
+// options --enable-test wants undefined
+#undef BOOST_NO_STDC_NAMESPACE
+#undef BOOST_NO_EXCEPTION_STD_NAMESPACE
+#undef BOOST_DEDUCED_TYPENAME
+
+#elif __PGIC__ >= 7
 
 #define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL 
 #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
 #define BOOST_NO_SWPRINTF
+#define BOOST_NO_AUTO_MULTIDECLARATIONS
+#define BOOST_NO_AUTO_DECLARATIONS
 
 #else
 
@@ -32,8 +49,6 @@
 //
 //   See boost\config\suffix.hpp for BOOST_NO_LONG_LONG
 //
-#define BOOST_NO_AUTO_DECLARATIONS
-#define BOOST_NO_AUTO_MULTIDECLARATIONS
 #define BOOST_NO_CHAR16_T
 #define BOOST_NO_CHAR32_T
 #define BOOST_NO_CONCEPTS

Modified: branches/release/boost/config/compiler/visualc.hpp
==============================================================================
--- branches/release/boost/config/compiler/visualc.hpp	(original)
+++ branches/release/boost/config/compiler/visualc.hpp	2010-03-15 13:55:47 EDT (Mon, 15 Mar 2010)
@@ -125,7 +125,7 @@
 #if (_MSC_VER >= 1200)
 #   define BOOST_HAS_MS_INT64
 #endif
-#if (_MSC_VER >= 1310) && (defined(_MSC_EXTENSIONS) || (_MSC_VER >= 1500))
+#if (_MSC_VER >= 1310) && (defined(_MSC_EXTENSIONS) || (_MSC_VER >= 1400))
 #   define BOOST_HAS_LONG_LONG
 #else
 #   define BOOST_NO_LONG_LONG

Modified: branches/release/boost/config/select_compiler_config.hpp
==============================================================================
--- branches/release/boost/config/select_compiler_config.hpp	(original)
+++ branches/release/boost/config/select_compiler_config.hpp	2010-03-15 13:55:47 EDT (Mon, 15 Mar 2010)
@@ -31,6 +31,7 @@
 #   define BOOST_CXX_IBMCPP   0
 #   define BOOST_CXX_MSVC     0
 #   define BOOST_CXX_PGI      0
+#   define BOOST_CXX_NVCC     0
 
 
 // locate which compiler we are using and define
@@ -40,6 +41,10 @@
 // GCC-XML emulates other compilers, it has to appear first here!
 #   define BOOST_COMPILER_CONFIG "boost/config/compiler/gcc_xml.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"

Modified: branches/release/boost/config/select_platform_config.hpp
==============================================================================
--- branches/release/boost/config/select_platform_config.hpp	(original)
+++ branches/release/boost/config/select_platform_config.hpp	2010-03-15 13:55:47 EDT (Mon, 15 Mar 2010)
@@ -65,6 +65,10 @@
 // vxWorks:
 #  define BOOST_PLATFORM_CONFIG "boost/config/platform/vxworks.hpp"
 
+#elif defined(__SYMBIAN32__) 
+// Symbian: 
+#  define BOOST_PLATFORM_CONFIG "boost/config/platform/symbian.hpp" 
+
 #else
 
 #  if defined(unix) \

Modified: branches/release/boost/config/suffix.hpp
==============================================================================
--- branches/release/boost/config/suffix.hpp	(original)
+++ branches/release/boost/config/suffix.hpp	2010-03-15 13:55:47 EDT (Mon, 15 Mar 2010)
@@ -8,7 +8,7 @@
 //  Copyright (c) 2002-2003 David Abrahams
 //  Copyright (c) 2003 Gennaro Prota
 //  Copyright (c) 2003 Eric Friedman
-//
+//  Copyright (c) 2010 Eric Jourdanneau, Joel Falcou
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -596,6 +596,11 @@
 #     endif
 #  endif
 
+//
+// Set some default values GPU support
+//
+#  ifndef BOOST_GPU_ENABLED
+#  define BOOST_GPU_ENABLED 
+#  endif
 #endif
 
-