Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r84837 - branches/release/boost/type_traits
From: john_at_[hidden]
Date: 2013-06-19 13:39:35


Author: johnmaddock
Date: 2013-06-19 13:39:35 EDT (Wed, 19 Jun 2013)
New Revision: 84837
URL: http://svn.boost.org/trac/boost/changeset/84837

Log:
Change pp-code to fix #5809.
Fixes #5809.

Text files modified:
   branches/release/boost/type_traits/common_type.hpp | 6 ++++--
   1 files changed, 4 insertions(+), 2 deletions(-)

Modified: branches/release/boost/type_traits/common_type.hpp
==============================================================================
--- branches/release/boost/type_traits/common_type.hpp Wed Jun 19 13:37:17 2013 (r84836)
+++ branches/release/boost/type_traits/common_type.hpp 2013-06-19 13:39:35 EDT (Wed, 19 Jun 2013) (r84837)
@@ -24,8 +24,10 @@
 #endif
 
 //----------------------------------------------------------------------------//
-#if defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF) && !defined(BOOST_TYPEOF_SILENT)
-#define BOOST_TYPEOF_SILENT
+#if defined(BOOST_NO_CXX11_DECLTYPE) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
+# ifndef BOOST_TYPEOF_SILENT
+# define BOOST_TYPEOF_SILENT
+# endif
 #include <boost/typeof/typeof.hpp> // boost wonders never cease!
 #endif
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk