diff options
Diffstat (limited to 'boost/proto/matches.hpp')
| -rw-r--r-- | boost/proto/matches.hpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/boost/proto/matches.hpp b/boost/proto/matches.hpp index 5136a5cc7b..09bb4b9d20 100644 --- a/boost/proto/matches.hpp +++ b/boost/proto/matches.hpp @@ -43,7 +43,7 @@ #include <boost/proto/transform/when.hpp> #include <boost/proto/transform/impl.hpp> -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma warning(push) # pragma warning(disable:4305) // 'specialization' : truncation from 'const int' to 'bool' #endif @@ -571,11 +571,7 @@ namespace boost { namespace proto /// \param expr An expression /// \return \c e - #ifdef BOOST_PROTO_STRICT_RESULT_OF - result_type - #else - typename impl::expr_param - #endif + BOOST_PROTO_RETURN_TYPE_STRICT_LOOSE(result_type, typename impl::expr_param) operator()( typename impl::expr_param e , typename impl::state_param @@ -620,11 +616,7 @@ namespace boost { namespace proto /// \param e An expression /// \pre <tt>matches\<Expr,not_\>::value</tt> is \c true. /// \return \c e - #ifdef BOOST_PROTO_STRICT_RESULT_OF - result_type - #else - typename impl::expr_param - #endif + BOOST_PROTO_RETURN_TYPE_STRICT_LOOSE(result_type, typename impl::expr_param) operator()( typename impl::expr_param e , typename impl::state_param @@ -948,7 +940,7 @@ namespace boost { namespace proto #undef BOOST_PROTO_LOGICAL_typename_G #undef BOOST_PROTO_LOGICAL_G -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma warning(pop) #endif |