Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r49814 - branches/release/boost
From: stephan.diederich_at_[hidden]
Date: 2008-11-17 04:57:05


Author: sdiederich
Date: 2008-11-17 04:57:04 EST (Mon, 17 Nov 2008)
New Revision: 49814
URL: http://svn.boost.org/trac/boost/changeset/49814

Log:
merged warning fixes from trunk (-r41358:49813)
Text files modified:
   branches/release/boost/concept_check.hpp | 10 ++++++++++
   1 files changed, 10 insertions(+), 0 deletions(-)

Modified: branches/release/boost/concept_check.hpp
==============================================================================
--- branches/release/boost/concept_check.hpp (original)
+++ branches/release/boost/concept_check.hpp 2008-11-17 04:57:04 EST (Mon, 17 Nov 2008)
@@ -144,6 +144,8 @@
     void const_constraints(const TT& b) {
 #if !defined(_ITERATOR_) // back_insert_iterator broken for VC++ STL
       a = b; // const required for argument to assignment
+#else
+ ignore_unused_variable_warning(b);
 #endif
     }
    private:
@@ -169,6 +171,11 @@
     TT b;
   };
 
+#if (defined _MSC_VER)
+# pragma warning( push )
+# pragma warning( disable : 4510 ) // default constructor could not be generated
+# pragma warning( disable : 4610 ) // object 'class' can never be instantiated - user-defined constructor required
+#endif
   // The SGI STL version of Assignable requires copy constructor and operator=
   BOOST_concept(SGIAssignable,(TT))
   {
@@ -190,6 +197,9 @@
     }
     TT a;
   };
+#if (defined _MSC_VER)
+# pragma warning( pop )
+#endif
 
   BOOST_concept(Convertible,(X)(Y))
   {


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