boostorg/concept_check
1
0
Fork 1
mirror of https://github.com/boostorg/concept_check.git synced 2025-07-31 04:57:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Supress msvc warnings. Fixes #5102.

Browse Source 
[SVN r71053]
This commit is contained in:
Steven Watanabe
2011-04-06 22:26:42 +00:00
parent d78b6bae1c
commit 52adefee9a
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/boost/concept/detail/msvc.hpp
View File

@ -6,12 +6,17 @@
# include <boost/preprocessor/cat.hpp> # include <boost/preprocessor/cat.hpp>
# include <boost/concept/detail/backward_compatibility.hpp> # include <boost/concept/detail/backward_compatibility.hpp>
# include <boost/config.hpp>
# ifdef BOOST_OLD_CONCEPT_SUPPORT # ifdef BOOST_OLD_CONCEPT_SUPPORT
# include <boost/concept/detail/has_constraints.hpp> # include <boost/concept/detail/has_constraints.hpp>
# include <boost/mpl/if.hpp> # include <boost/mpl/if.hpp>
# endif # endif
# ifdef BOOST_MSVC
# pragma warning(push)
# pragma warning(disable:4100)
# endif
namespace boost { namespace concepts { namespace boost { namespace concepts {
@ -111,4 +116,8 @@ enum \
# endif # endif
}} }}
# ifdef BOOST_MSVC
# pragma warning(pop)
# endif
#endif // BOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP #endif // BOOST_CONCEPT_CHECK_MSVC_DWA2006429_HPP

18
include/boost/concept_check.hpp
View File

@ -32,6 +32,12 @@
# include <boost/concept/usage.hpp> # include <boost/concept/usage.hpp>
# include <boost/concept/detail/concept_def.hpp> # 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 namespace boost
{ {
@ -175,11 +181,6 @@ namespace boost
TT b; 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= // The SGI STL version of Assignable requires copy constructor and operator=
BOOST_concept(SGIAssignable,(TT)) BOOST_concept(SGIAssignable,(TT))
{ {
@ -202,9 +203,6 @@ namespace boost
TT a; TT a;
TT b; TT b;
}; };
#if (defined _MSC_VER)
# pragma warning( pop )
#endif
BOOST_concept(Convertible,(X)(Y)) BOOST_concept(Convertible,(X)(Y))
{ {
@ -1077,6 +1075,10 @@ namespace boost
}; };
} // namespace boost } // namespace boost
#if (defined _MSC_VER)
# pragma warning( pop )
#endif
# include <boost/concept/detail/concept_undef.hpp> # include <boost/concept/detail/concept_undef.hpp>
#endif // BOOST_CONCEPT_CHECKS_HPP #endif // BOOST_CONCEPT_CHECKS_HPP