[Boost-commit] svn:boost r68095 - trunk/boost/type_traits

Subject: [Boost-commit] svn:boost r68095 - trunk/boost/type_traits
From: john_at_[hidden]
Date: 2011-01-13 07:14:58

Author: johnmaddock
Date: 2011-01-13 07:14:56 EST (Thu, 13 Jan 2011)
New Revision: 68095
URL: http://svn.boost.org/trac/boost/changeset/68095

Log:
Don't try and redefine macros that are already set.
Text files modified: 
   trunk/boost/type_traits/common_type.hpp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/type_traits/common_type.hpp
==============================================================================
--- trunk/boost/type_traits/common_type.hpp	(original)
+++ trunk/boost/type_traits/common_type.hpp	2011-01-13 07:14:56 EST (Thu, 13 Jan 2011)
@@ -11,20 +11,20 @@
 
 #include <boost/config.hpp>
 
-#ifdef __SUNPRO_CC
+#if defined(__SUNPRO_CC) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
 #  define BOOST_COMMON_TYPE_DONT_USE_TYPEOF
 #endif
-#ifdef __IBMCPP__
+#if defined(__IBMCPP__) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
 #  define BOOST_COMMON_TYPE_DONT_USE_TYPEOF
 #endif
 
 //----------------------------------------------------------------------------//
-#if defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_COMMON_TYPE_ARITY)
 #define BOOST_COMMON_TYPE_ARITY 3
 #endif
 
 //----------------------------------------------------------------------------//
-#if defined(BOOST_NO_DECLTYPE) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
+#if defined(BOOST_NO_DECLTYPE) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF) && !defined(BOOST_TYPEOF_SILENT)
 #define BOOST_TYPEOF_SILENT
 #include <boost/typeof/typeof.hpp>   // boost wonders never cease!
 #endif