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

Subject: [Boost-commit] svn:boost r84836 - trunk/boost/type_traits
From: john_at_[hidden]
Date: 2013-06-19 13:37:17

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

Log:
Fix for #5809.

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

Modified: trunk/boost/type_traits/common_type.hpp
==============================================================================
--- trunk/boost/type_traits/common_type.hpp	Wed Jun 19 11:36:32 2013	(r84835)
+++ trunk/boost/type_traits/common_type.hpp	2013-06-19 13:37:17 EDT (Wed, 19 Jun 2013)	(r84836)
@@ -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