ext/boost/concept_check.hpp in passenger-2.2.15 vs ext/boost/concept_check.hpp in passenger-3.0.0.pre1

- old
+ new

@@ -142,10 +142,12 @@ } private: 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: TT a; }; @@ -167,10 +169,15 @@ ignore_unused_variable_warning(ptr); } 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)) { BOOST_CONCEPT_USAGE(SGIAssignable) { TT b(a); @@ -188,9 +195,12 @@ #endif ignore_unused_variable_warning(c); } TT a; }; +#if (defined _MSC_VER) +# pragma warning( pop ) +#endif BOOST_concept(Convertible,(X)(Y)) { BOOST_CONCEPT_USAGE(Convertible) { Y y = x;