mirror of
https://github.com/boostorg/function.git
synced 2025-06-29 14:00:59 +02:00
Compare commits
13 Commits
svn-branch
...
boost-1.35
Author | SHA1 | Date | |
---|---|---|---|
b83dfcf4a5 | |||
bfdb5b161d | |||
c4539395fe | |||
6147e7ddcc | |||
1b60e82b2f | |||
7581949360 | |||
0b2aeda226 | |||
2ecd62c612 | |||
47033bd162 | |||
c7d5016022 | |||
d92355cca2 | |||
0123f84bff | |||
0207da8008 |
@ -33,6 +33,7 @@
|
|||||||
#if defined(BOOST_MSVC)
|
#if defined(BOOST_MSVC)
|
||||||
# pragma warning( push )
|
# pragma warning( push )
|
||||||
# pragma warning( disable : 4793 ) // complaint about native code generation
|
# pragma warning( disable : 4793 ) // complaint about native code generation
|
||||||
|
# pragma warning( disable : 4127 ) // "conditional expression is constant"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
|
// Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.
|
||||||
|
@ -11,6 +11,11 @@
|
|||||||
// protection.
|
// protection.
|
||||||
#include <boost/function/detail/prologue.hpp>
|
#include <boost/function/detail/prologue.hpp>
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
# pragma warning( push )
|
||||||
|
# pragma warning( disable : 4127 ) // "conditional expression is constant"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
|
#define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
|
||||||
|
|
||||||
#define BOOST_FUNCTION_TEMPLATE_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, T)
|
#define BOOST_FUNCTION_TEMPLATE_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, T)
|
||||||
@ -958,3 +963,7 @@ public:
|
|||||||
#undef BOOST_FUNCTION_ARG_TYPES
|
#undef BOOST_FUNCTION_ARG_TYPES
|
||||||
#undef BOOST_FUNCTION_VOID_RETURN_TYPE
|
#undef BOOST_FUNCTION_VOID_RETURN_TYPE
|
||||||
#undef BOOST_FUNCTION_RETURN
|
#undef BOOST_FUNCTION_RETURN
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
# pragma warning( pop )
|
||||||
|
#endif
|
||||||
|
Reference in New Issue
Block a user