diff --git a/example/add_cxx11_lambda.cpp b/example/add_cxx11_lambda.cpp index d7085bb..4a34cb5 100644 --- a/example/add_cxx11_lambda.cpp +++ b/example/add_cxx11_lambda.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_LAMBDAS +#ifdef BOOST_NO_CXX11_LAMBDAS # error "lambda functions required" #else diff --git a/example/const_block.hpp b/example/const_block.hpp index c8d828b..9042734 100644 --- a/example/const_block.hpp +++ b/example/const_block.hpp @@ -43,7 +43,7 @@ // PUBLIC // // Arguments `void | var1, var2, ... | (var1) (var2) ...`. -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # define CONST_BLOCK(void_or_seq) \ CONST_BLOCK_(BOOST_LOCAL_FUNCTION_DETAIL_PP_VOID_LIST(void_or_seq)) #else diff --git a/example/const_block_error_cxx11_lambda.cpp b/example/const_block_error_cxx11_lambda.cpp index 862667d..d555cc8 100644 --- a/example/const_block_error_cxx11_lambda.cpp +++ b/example/const_block_error_cxx11_lambda.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_LAMBDAS +#ifdef BOOST_NO_CXX11_LAMBDAS # error "requires lambda functions" #else diff --git a/example/expensive_copy_cxx11_lambda.cpp b/example/expensive_copy_cxx11_lambda.cpp index cebeba9..e1b4013 100644 --- a/example/expensive_copy_cxx11_lambda.cpp +++ b/example/expensive_copy_cxx11_lambda.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_LAMBDAS +#ifdef BOOST_NO_CXX11_LAMBDAS # error "lambda functions required" #else diff --git a/example/gcc_cxx11_lambda.cpp b/example/gcc_cxx11_lambda.cpp index 90c4a7e..c6299b6 100644 --- a/example/gcc_cxx11_lambda.cpp +++ b/example/gcc_cxx11_lambda.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_LAMBDAS +#ifdef BOOST_NO_CXX11_LAMBDAS # error "lambda functions required" #else diff --git a/example/gcc_lambda.hpp b/example/gcc_lambda.hpp index 4bee7a1..665febc 100644 --- a/example/gcc_lambda.hpp +++ b/example/gcc_lambda.hpp @@ -64,7 +64,7 @@ BOOST_LOCAL_FUNCTION_DETAIL_PP_KEYWORD_RETURN_REMOVE_FRONT( \ BOOST_PP_LIST_FIRST(results)) -#ifdef BOOST_NO_LAMBDAS +#ifdef BOOST_NO_CXX11_LAMBDAS //[gcc_lambda_macro # define GCC_LAMBDA_(binds, params, results) \ ({ /* open statement expression (GCC extension only) */ \ @@ -108,7 +108,7 @@ // Same arguments as for local functions but respect to C++11 lambdas: // const bind v is =v, bind& v is &v, void if no return specified, no = or &. -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # define GCC_LAMBDA(void_or_seq) \ GCC_LAMBDA_TUPLE_(GCC_LAMBDA_SPLIT_( \ BOOST_LOCAL_FUNCTION_DETAIL_PP_VOID_LIST(void_or_seq))) @@ -118,7 +118,7 @@ BOOST_LOCAL_FUNCTION_DETAIL_PP_VOID_LIST(__VA_ARGS__))) #endif -#ifdef BOOST_NO_LAMBDAS +#ifdef BOOST_NO_CXX11_LAMBDAS # define GCC_LAMBDA_END \ GCC_LAMBDA_END_(BOOST_LOCAL_FUNCTION_DETAIL_PP_LINE_COUNTER) #else diff --git a/example/noncopyable_cxx11_lambda_error.cpp b/example/noncopyable_cxx11_lambda_error.cpp index 6e9a66b..706079e 100644 --- a/example/noncopyable_cxx11_lambda_error.cpp +++ b/example/noncopyable_cxx11_lambda_error.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_LAMBDAS +#ifdef BOOST_NO_CXX11_LAMBDAS # error "lambda functions required" #else diff --git a/example/profile_cxx11_lambda.cpp b/example/profile_cxx11_lambda.cpp index c07ee08..f2c1c26 100644 --- a/example/profile_cxx11_lambda.cpp +++ b/example/profile_cxx11_lambda.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_LAMBDAS +#ifdef BOOST_NO_CXX11_LAMBDAS # error "lambda functions required" #else diff --git a/example/scope_exit.hpp b/example/scope_exit.hpp index 795a2c1..5876b14 100644 --- a/example/scope_exit.hpp +++ b/example/scope_exit.hpp @@ -34,7 +34,7 @@ private: // PUBLIC // -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # define SCOPE_EXIT(void_or_seq) \ void BOOST_LOCAL_FUNCTION(void_or_seq) #else diff --git a/include/boost/local_function.hpp b/include/boost/local_function.hpp index 9f259e6..548bbbb 100644 --- a/include/boost/local_function.hpp +++ b/include/boost/local_function.hpp @@ -20,7 +20,7 @@ // PUBLIC // -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # define BOOST_LOCAL_FUNCTION_ID(id, declarations) \ BOOST_LOCAL_FUNCTION_AUX_DECL(id, 0 /* not within template */, \ BOOST_LOCAL_FUNCTION_AUX_PP_DECL_TRAITS( \ @@ -344,7 +344,7 @@ On C++11 compilers, there is no need to declare a local function lined because this library will automatically use C++11 specific features to inline the local function while always allowing to pass it as a template parameter. This optimization is automatically enabled when the Boost.Config macro -BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS is not defined but it also be +BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS is not defined but it also be forced using @RefMacro{BOOST_LOCAL_FUNCTION_CONFIG_LOCALS_AS_TPARAMS}. The local function name can also be qualified by prefixing it with the diff --git a/include/boost/local_function/config.hpp b/include/boost/local_function/config.hpp index bab2953..fb4f4ea 100644 --- a/include/boost/local_function/config.hpp +++ b/include/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 0 if -the Boost.Config macro BOOST_NO_LOCAL_CLASS_TEMPLATE_PARAMETERS is +the Boost.Config macro BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS is defined for the specific compiler, and to 1 otherwise. @See @RefSect{getting_started, Getting Started} section, diff --git a/include/boost/local_function/detail/preprocessor/void_list.hpp b/include/boost/local_function/detail/preprocessor/void_list.hpp index 2a302c6..06f4685 100644 --- a/include/boost/local_function/detail/preprocessor/void_list.hpp +++ b/include/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) \ diff --git a/test/add.cpp b/test/add.cpp index d6f983d..4b8ca3f 100644 --- a/test/add.cpp +++ b/test/add.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/add_classifiers.cpp b/test/add_classifiers.cpp index 758e2c5..7dcf2dc 100644 --- a/test/add_classifiers.cpp +++ b/test/add_classifiers.cpp @@ -6,9 +6,9 @@ // Home at http://www.boost.org/libs/local_function #include -#if !defined(BOOST_NO_AUTO_DECLARATIONS) +#if !defined(BOOST_NO_CXX11_AUTO_DECLARATIONS) # error "auto-declarations not allowed (using `auto` as storage classifier)" -#elif defined(BOOST_NO_VARIADIC_MACROS) +#elif defined(BOOST_NO_CXX11_VARIADIC_MACROS) # error "variadic macros required" #else diff --git a/test/add_classifiers_seq.cpp b/test/add_classifiers_seq.cpp index 4249d28..0499f87 100644 --- a/test/add_classifiers_seq.cpp +++ b/test/add_classifiers_seq.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifndef BOOST_NO_AUTO_DECLARATIONS +#ifndef BOOST_NO_CXX11_AUTO_DECLARATIONS # error "auto-declarations not allowed (using `auto` as storage classifier)" #else diff --git a/test/add_default.cpp b/test/add_default.cpp index 902855f..86c4e11 100644 --- a/test/add_default.cpp +++ b/test/add_default.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/add_except.cpp b/test/add_except.cpp index 8cd82fe..c3a1488 100644 --- a/test/add_except.cpp +++ b/test/add_except.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/add_inline.cpp b/test/add_inline.cpp index 54e48ee..4d3afe5 100644 --- a/test/add_inline.cpp +++ b/test/add_inline.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/add_params_only.cpp b/test/add_params_only.cpp index 08e48c8..3b9b93d 100644 --- a/test/add_params_only.cpp +++ b/test/add_params_only.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/add_template.cpp b/test/add_template.cpp index 5ce77cf..aa38267 100644 --- a/test/add_template.cpp +++ b/test/add_template.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/add_this.cpp b/test/add_this.cpp index 11071d2..f424043 100644 --- a/test/add_this.cpp +++ b/test/add_this.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/add_typed.cpp b/test/add_typed.cpp index 80c26dd..6912a33 100644 --- a/test/add_typed.cpp +++ b/test/add_typed.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/add_with_default.cpp b/test/add_with_default.cpp index fc3e446..f31cb1c 100644 --- a/test/add_with_default.cpp +++ b/test/add_with_default.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/all_decl.cpp b/test/all_decl.cpp index 0366aaa..a9a63db 100644 --- a/test/all_decl.cpp +++ b/test/all_decl.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/factorial.cpp b/test/factorial.cpp index 07d98f3..7260de2 100644 --- a/test/factorial.cpp +++ b/test/factorial.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/goto.cpp b/test/goto.cpp index a030f58..a6dda75 100644 --- a/test/goto.cpp +++ b/test/goto.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/goto_error.cpp b/test/goto_error.cpp index 55ad95a..3ed3971 100644 --- a/test/goto_error.cpp +++ b/test/goto_error.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/macro_commas.cpp b/test/macro_commas.cpp index a1e1d77..3905782 100644 --- a/test/macro_commas.cpp +++ b/test/macro_commas.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/nesting.cpp b/test/nesting.cpp index bb97d64..e13ac26 100644 --- a/test/nesting.cpp +++ b/test/nesting.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/nova.hpp b/test/nova.hpp index 58984ac..ceef87e 100644 --- a/test/nova.hpp +++ b/test/nova.hpp @@ -13,8 +13,8 @@ // WARNING: This file must be included first in each compilation unit. // Force no variadic macros but avoiding macro redefinition warning/error. -#ifndef BOOST_NO_VARIADIC_MACROS -# define BOOST_NO_VARIADIC_MACROS +#ifndef BOOST_NO_CXX11_VARIADIC_MACROS +# define BOOST_NO_CXX11_VARIADIC_MACROS #endif #endif // #include guard diff --git a/test/operator.cpp b/test/operator.cpp index e5cdd96..c8911c3 100644 --- a/test/operator.cpp +++ b/test/operator.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/operator_error.cpp b/test/operator_error.cpp index 295fc1d..9fd81f6 100644 --- a/test/operator_error.cpp +++ b/test/operator_error.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/overload.cpp b/test/overload.cpp index b2321bf..6a2c1ee 100644 --- a/test/overload.cpp +++ b/test/overload.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/return_assign.cpp b/test/return_assign.cpp index 4bde550..6637ffa 100644 --- a/test/return_assign.cpp +++ b/test/return_assign.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/return_derivative.cpp b/test/return_derivative.cpp index 60dea24..7461991 100644 --- a/test/return_derivative.cpp +++ b/test/return_derivative.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/return_inc.cpp b/test/return_inc.cpp index 4be2d01..7d3e424 100644 --- a/test/return_inc.cpp +++ b/test/return_inc.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/return_setget.cpp b/test/return_setget.cpp index 37cc84a..1eb904c 100644 --- a/test/return_setget.cpp +++ b/test/return_setget.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/return_this.cpp b/test/return_this.cpp index 9bbc8bc..ea3debc 100644 --- a/test/return_this.cpp +++ b/test/return_this.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/same_line.cpp b/test/same_line.cpp index 18b0cc7..0809e02 100644 --- a/test/same_line.cpp +++ b/test/same_line.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/transform.cpp b/test/transform.cpp index f72cf73..0cdbe76 100644 --- a/test/transform.cpp +++ b/test/transform.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/typeof.cpp b/test/typeof.cpp index 0b50120..aa34735 100644 --- a/test/typeof.cpp +++ b/test/typeof.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else diff --git a/test/typeof_template.cpp b/test/typeof_template.cpp index e514c98..f74e49f 100644 --- a/test/typeof_template.cpp +++ b/test/typeof_template.cpp @@ -6,7 +6,7 @@ // Home at http://www.boost.org/libs/local_function #include -#ifdef BOOST_NO_VARIADIC_MACROS +#ifdef BOOST_NO_CXX11_VARIADIC_MACROS # error "variadic macros required" #else