Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/concept_check.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/concept_check.hpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/3rdParty/Boost/src/boost/concept_check.hpp b/3rdParty/Boost/src/boost/concept_check.hpp index bf5a2af..292f37d 100644 --- a/3rdParty/Boost/src/boost/concept_check.hpp +++ b/3rdParty/Boost/src/boost/concept_check.hpp @@ -33,4 +33,10 @@ # include <boost/concept/detail/concept_def.hpp> +#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 + namespace boost { @@ -176,9 +182,4 @@ namespace boost }; -#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)) @@ -203,7 +204,4 @@ namespace boost TT b; }; -#if (defined _MSC_VER) -# pragma warning( pop ) -#endif BOOST_concept(Convertible,(X)(Y)) @@ -563,8 +561,8 @@ namespace boost { BOOST_CONCEPT_USAGE(Mutable_ForwardIterator) { - *i++ = *i; // require postincrement and assignment + *i++ = *j; // require postincrement and assignment } private: - TT i; + TT i, j; }; @@ -592,8 +590,8 @@ namespace boost BOOST_CONCEPT_USAGE(Mutable_BidirectionalIterator) { - *i-- = *i; // require postdecrement and assignment + *i-- = *j; // require postdecrement and assignment } private: - TT i; + TT i, j; }; @@ -881,5 +879,5 @@ namespace boost r = cc.back(); ignore_unused_variable_warning(r); - }; + } S c; typename S::value_type t; @@ -1078,4 +1076,8 @@ namespace boost } // namespace boost +#if (defined _MSC_VER) +# pragma warning( pop ) +#endif + # include <boost/concept/detail/concept_undef.hpp> |