diff options
| author | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-12-11 18:55:56 +0900 |
| commit | 08c1e93fa36a49f49325a07fe91ff92c964c2b6c (patch) | |
| tree | 7a7053ceb8874b28ec4b868d4c49b500008a102e /boost/local_function | |
| parent | bb4dd8289b351fae6b55e303f189127a394a1edd (diff) | |
| download | boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.gz boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.tar.bz2 boost-08c1e93fa36a49f49325a07fe91ff92c964c2b6c.zip | |
Imported Upstream version 1.57.0upstream/1.57.0
Diffstat (limited to 'boost/local_function')
| -rw-r--r-- | boost/local_function/config.hpp | 4 | ||||
| -rw-r--r-- | boost/local_function/detail/preprocessor/void_list.hpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/boost/local_function/config.hpp b/boost/local_function/config.hpp index bab295378d..fb4f4ea21d 100644 --- a/boost/local_function/config.hpp +++ b/boost/local_function/config.hpp @@ -21,7 +21,7 @@ #endif #ifndef BOOST_LOCAL_FUNCTION_CONFIG_LOCALS_AS_TPARAMS -# ifdef BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS +# ifdef BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS # define BOOST_LOCAL_FUNCTION_CONFIG_LOCALS_AS_TPARAMS 0 # else # define BOOST_LOCAL_FUNCTION_CONFIG_LOCALS_AS_TPARAMS 1 @@ -99,7 +99,7 @@ still allow to pass the local functions as template parameters. It is recommended to leave this macro undefined. In this case, the library will automatically define this macro to <c>0</c> if -the Boost.Config macro <c>BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS</c> is +the Boost.Config macro <c>BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS</c> is defined for the specific compiler, and to <c>1</c> otherwise. @See @RefSect{getting_started, Getting Started} section, diff --git a/boost/local_function/detail/preprocessor/void_list.hpp b/boost/local_function/detail/preprocessor/void_list.hpp index 2a302c6ea3..06f4685f55 100644 --- a/boost/local_function/detail/preprocessor/void_list.hpp +++ b/boost/local_function/detail/preprocessor/void_list.hpp @@ -41,7 +41,7 @@ BOOST_LOCAL_FUNCTION_DETAIL_PP_VOID_LIST_HANDLE_VOID_ \ )(is_void_macro, token) -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS #define BOOST_LOCAL_FUNCTION_DETAIL_PP_VOID_LIST_(is_void_macro, seq) \ BOOST_LOCAL_FUNCTION_DETAIL_PP_VOID_LIST_HANDLE_SEQ_(is_void_macro, seq) @@ -49,7 +49,7 @@ #else // VARIADICS // FUTURE: Replace this with BOOST_PP_VARIADIC_SIZE when and if -// BOOST_PP_VARIAIDCS detection will match !BOOST_NO_VARIADIC_MACROS (for now +// BOOST_PP_VARIAIDCS detection will match !BOOST_NO_CXX11_VARIADIC_MACROS (for now // Boost.Preprocessor and Boost.Config disagree on detecting compiler variadic // support while this VARIADIC_SIZE works on compilers not detected by PP). #if BOOST_MSVC @@ -90,7 +90,7 @@ // even if they support variadic macros. Therefore, always using void to // represent is more portable. -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS // Expand `void | (a)(b)...` to pp-list `NIL | (a, (b, NIL))`. #define BOOST_LOCAL_FUNCTION_DETAIL_PP_VOID_LIST(sign) \ |