[Boost-commit] svn:boost r67525 - branches/release/boost/type_traits

Subject: [Boost-commit] svn:boost r67525 - branches/release/boost/type_traits
From: john_at_[hidden]
Date: 2010-12-31 13:11:49

Author: johnmaddock
Date: 2010-12-31 13:11:48 EST (Fri, 31 Dec 2010)
New Revision: 67525
URL: http://svn.boost.org/trac/boost/changeset/67525

Log:
Merge minor warning fixes from Trunk.
Text files modified: 
   branches/release/boost/type_traits/common_type.hpp        |     5 +++++                                   
   branches/release/boost/type_traits/is_virtual_base_of.hpp |     2 +-                                      
   2 files changed, 6 insertions(+), 1 deletions(-)

Modified: branches/release/boost/type_traits/common_type.hpp
==============================================================================
--- branches/release/boost/type_traits/common_type.hpp	(original)
+++ branches/release/boost/type_traits/common_type.hpp	2010-12-31 13:11:48 EST (Fri, 31 Dec 2010)
@@ -120,6 +120,11 @@
     public:
         typedef BOOST_TYPEOF_TPL(declval_b() ? declval_T() : declval_U()) type;
 #endif
+
+#if defined(__GNUC__) && __GNUC__ == 3 && (__GNUC_MINOR__ == 2 || __GNUC_MINOR__ == 3)
+    public:
+        void public_dummy_function_just_to_silence_warning();
+#endif
     };
 
     template <class T>

Modified: branches/release/boost/type_traits/is_virtual_base_of.hpp
==============================================================================
--- branches/release/boost/type_traits/is_virtual_base_of.hpp	(original)
+++ branches/release/boost/type_traits/is_virtual_base_of.hpp	2010-12-31 13:11:48 EST (Fri, 31 Dec 2010)
@@ -22,7 +22,7 @@
 
 #ifdef BOOST_MSVC
 #pragma warning( push )
-#pragma warning( disable : 4584 )
+#pragma warning( disable : 4584 4250)
 #elif defined __GNUC__
 #pragma GCC system_header
 #endif