diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/bool.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/bool.hpp index 955152e..ee55b2a 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/bool.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/bool.hpp @@ -4,7 +4,7 @@ #include #include -#include +#include /* PUBLIC */ @@ -12,10 +12,10 @@ // Precondition: decl = `...` (includes `(,,,)`, `bool(,,,)`, etc.). #define BOOST_CONTRACT_EXT_PP_BOOL_ASSERTION_TRAITS_PARSE(decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_BOOL_ASSERTION_TRAITS_EXPR_PARSE( \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE(bool, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/bool/expr.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/bool/expr.hpp index 43bad2e..f8b39cf 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/bool/expr.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/bool/expr.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_BOOL_ASSERTION_TRAITS_EXPR_HPP_ #define BOOST_CONTRACT_EXT_PP_BOOL_ASSERTION_TRAITS_EXPR_HPP_ -#include -#include +#include +#include #include #include @@ -11,8 +11,8 @@ // Expand to `...` (tokens). #define BOOST_CONTRACT_EXT_PP_BOOL_ASSERTION_TRAITS_EXPR(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_BOOL_ASSERTION_TRAITS_AUX_EXPR_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BOOL_ASSERTION_EXPR, traits) #define BOOST_CONTRACT_EXT_PP_BOOL_ASSERTION_TRAITS_EXPR_PARSE(decl_traits) \ BOOST_PP_EXPAND( \ @@ -27,7 +27,7 @@ decl, traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK(decl)) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/const.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/const.hpp index 200913c..f457957 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/const.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/const.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include /* PUBLIC */ @@ -13,11 +13,11 @@ // Precondition: decl = `const( [[(wrapped-type)] name, ...] ) expr`. #define BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_PARSE_D_L(d, l, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_EXPR_PARSE( \ BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_CAPTURES_PARSE_D_L(d, l, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE(const, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ ))))) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/const/captures.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/const/captures.hpp index 851efbb..f0128ac 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/const/captures.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/const/captures.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_CAPTURES_HPP_ #define BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_CAPTURES_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -16,8 +16,8 @@ // Expand to `pp-seq | EMPTY()`, pp-seq of capture traits to be inspected via // PP_CAPTURE_TRAITS macros. #define BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_CAPTURES(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_AUX_CAPTURES_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CONST_ASSERTION_CAPTURES, \ traits \ )() @@ -43,7 +43,7 @@ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_PARAMS_EXPAND_TRAITS_(\ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_FIXED_LIST_PARSE_D_ ## l(d , \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/const/expr.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/const/expr.hpp index 4c703c3..c4ca8a3 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/const/expr.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/const/expr.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_EXPR_HPP_ #define BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_EXPR_HPP_ -#include -#include +#include +#include #include #include @@ -11,8 +11,8 @@ // Expand to `expr` (expr might or not be in parenthesis, like all bool expr). #define BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_EXPR(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_AUX_EXPR_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CONST_ASSERTION_EXPR, traits) #define BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_EXPR_PARSE(decl_traits) \ BOOST_PP_EXPAND( \ @@ -27,7 +27,7 @@ decl, traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK(decl)) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/if-generate.py b/include/boost/contract/ext_/preprocessor/traits/assertion/if-generate.py index dafc2e8..a8962d9 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/if-generate.py +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/if-generate.py @@ -71,7 +71,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_{0}( \\ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_{0}_( \\ d, l, is_post, is_static, decl) \\ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \\ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \\ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_{0}( \\ d, l, is_post, \\ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_{0}( \\ @@ -80,7 +80,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_{0}( \\ d, l, is_static, \\ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \\ BOOST_PP_EXPR_IIF(is_static, static) if, \\ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \\ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \\ decl BOOST_PP_NIL \\ )))))) @@ -104,7 +104,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_{0}_( \\ d, l, is_post, decl_traits) \\ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_{0}_(d, l, is_post, \\ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \\ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \\ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \\ ) @@ -120,7 +120,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_{0}_( \\ d, l, is_static, decl, traits) \\ ( \\ BOOST_PP_TUPLE_EAT(0) decl, \\ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \\ traits, \\ BOOST_PP_TUPLE_ELEM(2, 1, \\ BOOST_PP_IIF(is_static, \\ @@ -182,7 +182,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_{0}_( \\ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_{0}_( \\ d, l, is_post, decl, traits) \\ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_{0}_( \\ @@ -200,7 +200,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_{0}_( \\ d, l, decl_assertion, traits) \\ ( \\ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \\ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \\ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \\ ) @@ -217,7 +217,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_{0}_( \\ d, l, decl, traits) \\ ( \\ BOOST_PP_TUPLE_EAT(0) decl, \\ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \\ traits, \\ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_{0}_( \\ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \\ @@ -234,7 +234,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_{0}_( \\ d, l, decl, traits) \\ ( \\ BOOST_PP_TUPLE_EAT(0) decl, \\ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \\ traits, \\ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_{0}_( \\ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \\ @@ -269,7 +269,7 @@ file.write(''' #include #include #include -#include +#include #include #include #include diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/if.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/if.hpp index c442a03..2c7901b 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/if.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/if.hpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -116,7 +116,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_1( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_1_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_1( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_1( \ @@ -125,7 +125,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_1( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -148,7 +148,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_1_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_1_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -164,7 +164,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_1_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -226,7 +226,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_1_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_1_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_1_( \ @@ -244,7 +244,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_1_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -261,7 +261,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_1_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_1_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -278,7 +278,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_1_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_1_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -359,7 +359,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_2( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_2_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_2( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_2( \ @@ -368,7 +368,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_2( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -391,7 +391,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_2_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_2_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -407,7 +407,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_2_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -469,7 +469,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_2_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_2_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_2_( \ @@ -487,7 +487,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_2_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -504,7 +504,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_2_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_2_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -521,7 +521,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_2_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_2_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -602,7 +602,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_3( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_3_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_3( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_3( \ @@ -611,7 +611,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_3( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -634,7 +634,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_3_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_3_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -650,7 +650,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_3_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -712,7 +712,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_3_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_3_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_3_( \ @@ -730,7 +730,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_3_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -747,7 +747,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_3_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_3_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -764,7 +764,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_3_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_3_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -845,7 +845,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_4( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_4_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_4( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_4( \ @@ -854,7 +854,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_4( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -877,7 +877,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_4_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_4_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -893,7 +893,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_4_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -955,7 +955,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_4_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_4_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_4_( \ @@ -973,7 +973,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_4_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -990,7 +990,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_4_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_4_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -1007,7 +1007,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_4_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_4_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -1088,7 +1088,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_5( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_5_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_5( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_5( \ @@ -1097,7 +1097,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_5( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -1120,7 +1120,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_5_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_5_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -1136,7 +1136,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_5_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -1198,7 +1198,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_5_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_5_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_5_( \ @@ -1216,7 +1216,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_5_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -1233,7 +1233,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_5_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_5_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -1250,7 +1250,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_5_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_5_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -1331,7 +1331,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_6( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_6_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_6( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_6( \ @@ -1340,7 +1340,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_6( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -1363,7 +1363,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_6_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_6_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -1379,7 +1379,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_6_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -1441,7 +1441,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_6_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_6_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_6_( \ @@ -1459,7 +1459,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_6_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -1476,7 +1476,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_6_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_6_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -1493,7 +1493,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_6_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_6_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -1574,7 +1574,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_7( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_7_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_7( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_7( \ @@ -1583,7 +1583,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_7( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -1606,7 +1606,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_7_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_7_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -1622,7 +1622,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_7_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -1684,7 +1684,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_7_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_7_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_7_( \ @@ -1702,7 +1702,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_7_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -1719,7 +1719,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_7_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_7_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -1736,7 +1736,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_7_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_7_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -1817,7 +1817,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_8( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_8_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_8( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_8( \ @@ -1826,7 +1826,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_8( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -1849,7 +1849,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_8_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_8_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -1865,7 +1865,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_8_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -1927,7 +1927,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_8_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_8_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_8_( \ @@ -1945,7 +1945,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_8_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -1962,7 +1962,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_8_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_8_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -1979,7 +1979,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_8_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_8_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -2060,7 +2060,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_9( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_9_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_9( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_9( \ @@ -2069,7 +2069,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_9( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -2092,7 +2092,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_9_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_9_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -2108,7 +2108,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_9_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -2170,7 +2170,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_9_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_9_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_9_( \ @@ -2188,7 +2188,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_9_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -2205,7 +2205,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_9_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_9_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -2222,7 +2222,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_9_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_9_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -2303,7 +2303,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_10( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_10_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_10( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_10( \ @@ -2312,7 +2312,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_10( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -2335,7 +2335,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_10_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_10_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -2351,7 +2351,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_10_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -2413,7 +2413,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_10_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_10_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_10_( \ @@ -2431,7 +2431,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_10_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -2448,7 +2448,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_10_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_10_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -2465,7 +2465,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_10_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_10_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -2546,7 +2546,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_11( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_11_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_11( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_11( \ @@ -2555,7 +2555,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_11( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -2578,7 +2578,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_11_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_11_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -2594,7 +2594,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_11_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -2656,7 +2656,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_11_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_11_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_11_( \ @@ -2674,7 +2674,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_11_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -2691,7 +2691,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_11_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_11_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -2708,7 +2708,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_11_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_11_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -2789,7 +2789,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_12( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_12_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_12( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_12( \ @@ -2798,7 +2798,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_12( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -2821,7 +2821,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_12_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_12_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -2837,7 +2837,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_12_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -2899,7 +2899,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_12_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_12_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_12_( \ @@ -2917,7 +2917,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_12_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -2934,7 +2934,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_12_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_12_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -2951,7 +2951,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_12_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_12_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -3032,7 +3032,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_13( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_13_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_13( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_13( \ @@ -3041,7 +3041,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_13( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -3064,7 +3064,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_13_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_13_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -3080,7 +3080,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_13_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -3142,7 +3142,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_13_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_13_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_13_( \ @@ -3160,7 +3160,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_13_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -3177,7 +3177,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_13_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_13_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -3194,7 +3194,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_13_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_13_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -3275,7 +3275,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_14( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_14_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_14( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_14( \ @@ -3284,7 +3284,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_14( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -3307,7 +3307,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_14_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_14_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -3323,7 +3323,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_14_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -3385,7 +3385,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_14_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_14_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_14_( \ @@ -3403,7 +3403,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_14_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -3420,7 +3420,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_14_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_14_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -3437,7 +3437,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_14_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_14_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -3518,7 +3518,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_15( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_15_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_15( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_15( \ @@ -3527,7 +3527,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_15( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -3550,7 +3550,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_15_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_15_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -3566,7 +3566,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_15_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -3628,7 +3628,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_15_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_15_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_15_( \ @@ -3646,7 +3646,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_15_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -3663,7 +3663,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_15_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_15_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -3680,7 +3680,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_15_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_15_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -3761,7 +3761,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_16( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_16_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_16( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_16( \ @@ -3770,7 +3770,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_16( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -3793,7 +3793,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_16_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_16_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -3809,7 +3809,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_16_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -3871,7 +3871,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_16_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_16_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_16_( \ @@ -3889,7 +3889,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_16_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -3906,7 +3906,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_16_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_16_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -3923,7 +3923,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_16_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_16_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -4004,7 +4004,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_17( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_17_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_17( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_17( \ @@ -4013,7 +4013,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_17( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -4036,7 +4036,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_17_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_17_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -4052,7 +4052,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_17_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -4114,7 +4114,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_17_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_17_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_17_( \ @@ -4132,7 +4132,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_17_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -4149,7 +4149,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_17_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_17_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -4166,7 +4166,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_17_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_17_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -4247,7 +4247,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_18( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_18_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_18( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_18( \ @@ -4256,7 +4256,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_18( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -4279,7 +4279,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_18_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_18_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -4295,7 +4295,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_18_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -4357,7 +4357,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_18_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_18_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_18_( \ @@ -4375,7 +4375,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_18_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -4392,7 +4392,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_18_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_18_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -4409,7 +4409,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_18_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_18_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -4490,7 +4490,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_19( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_19_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_19( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_19( \ @@ -4499,7 +4499,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_19( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -4522,7 +4522,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_19_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_19_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -4538,7 +4538,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_19_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -4600,7 +4600,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_19_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_19_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_19_( \ @@ -4618,7 +4618,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_19_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -4635,7 +4635,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_19_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_19_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -4652,7 +4652,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_19_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_19_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -4733,7 +4733,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_20( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_20_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_20( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_20( \ @@ -4742,7 +4742,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_20( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -4765,7 +4765,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_20_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_20_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -4781,7 +4781,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_20_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -4843,7 +4843,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_20_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_20_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_20_( \ @@ -4861,7 +4861,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_20_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -4878,7 +4878,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_20_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_20_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -4895,7 +4895,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_20_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_20_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -4976,7 +4976,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_21( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_21_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_21( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_21( \ @@ -4985,7 +4985,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_21( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -5008,7 +5008,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_21_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_21_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -5024,7 +5024,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_21_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -5086,7 +5086,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_21_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_21_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_21_( \ @@ -5104,7 +5104,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_21_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -5121,7 +5121,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_21_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_21_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -5138,7 +5138,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_21_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_21_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -5219,7 +5219,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_22( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_22_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_22( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_22( \ @@ -5228,7 +5228,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_22( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -5251,7 +5251,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_22_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_22_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -5267,7 +5267,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_22_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -5329,7 +5329,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_22_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_22_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_22_( \ @@ -5347,7 +5347,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_22_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -5364,7 +5364,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_22_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_22_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -5381,7 +5381,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_22_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_22_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -5462,7 +5462,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_23( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_23_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_23( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_23( \ @@ -5471,7 +5471,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_23( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -5494,7 +5494,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_23_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_23_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -5510,7 +5510,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_23_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -5572,7 +5572,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_23_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_23_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_23_( \ @@ -5590,7 +5590,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_23_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -5607,7 +5607,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_23_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_23_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -5624,7 +5624,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_23_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_23_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -5705,7 +5705,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_24( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_24_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_24( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_24( \ @@ -5714,7 +5714,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_24( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -5737,7 +5737,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_24_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_24_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -5753,7 +5753,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_24_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -5815,7 +5815,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_24_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_24_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_24_( \ @@ -5833,7 +5833,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_24_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -5850,7 +5850,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_24_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_24_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -5867,7 +5867,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_24_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_24_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -5948,7 +5948,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_25( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_25_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_25( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_25( \ @@ -5957,7 +5957,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_25( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -5980,7 +5980,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_25_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_25_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -5996,7 +5996,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_25_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -6058,7 +6058,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_25_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_25_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_25_( \ @@ -6076,7 +6076,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_25_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -6093,7 +6093,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_25_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_25_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -6110,7 +6110,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_25_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_25_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -6191,7 +6191,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_26( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_26_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_26( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_26( \ @@ -6200,7 +6200,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_26( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -6223,7 +6223,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_26_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_26_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -6239,7 +6239,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_26_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -6301,7 +6301,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_26_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_26_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_26_( \ @@ -6319,7 +6319,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_26_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -6336,7 +6336,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_26_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_26_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -6353,7 +6353,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_26_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_26_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -6434,7 +6434,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_27( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_27_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_27( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_27( \ @@ -6443,7 +6443,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_27( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -6466,7 +6466,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_27_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_27_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -6482,7 +6482,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_27_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -6544,7 +6544,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_27_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_27_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_27_( \ @@ -6562,7 +6562,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_27_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -6579,7 +6579,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_27_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_27_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -6596,7 +6596,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_27_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_27_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -6677,7 +6677,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_28( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_28_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_28( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_28( \ @@ -6686,7 +6686,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_28( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -6709,7 +6709,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_28_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_28_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -6725,7 +6725,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_28_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -6787,7 +6787,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_28_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_28_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_28_( \ @@ -6805,7 +6805,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_28_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -6822,7 +6822,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_28_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_28_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -6839,7 +6839,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_28_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_28_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -6920,7 +6920,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_29( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_29_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_29( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_29( \ @@ -6929,7 +6929,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_29( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -6952,7 +6952,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_29_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_29_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -6968,7 +6968,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_29_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -7030,7 +7030,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_29_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_29_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_29_( \ @@ -7048,7 +7048,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_29_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -7065,7 +7065,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_29_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_29_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -7082,7 +7082,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_29_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_29_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -7163,7 +7163,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_30( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_30_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_30( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_30( \ @@ -7172,7 +7172,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_30( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -7195,7 +7195,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_30_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_30_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -7211,7 +7211,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_30_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -7273,7 +7273,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_30_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_30_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_30_( \ @@ -7291,7 +7291,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_30_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -7308,7 +7308,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_30_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_30_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -7325,7 +7325,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_30_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_30_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -7406,7 +7406,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_31( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_31_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_31( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_31( \ @@ -7415,7 +7415,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_31( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -7438,7 +7438,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_31_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_31_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -7454,7 +7454,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_31_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -7516,7 +7516,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_31_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_31_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_31_( \ @@ -7534,7 +7534,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_31_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -7551,7 +7551,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_31_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_31_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -7568,7 +7568,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_31_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_31_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -7649,7 +7649,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_32( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_32_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_32( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_32( \ @@ -7658,7 +7658,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_32( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -7681,7 +7681,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_32_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_32_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -7697,7 +7697,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_32_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -7759,7 +7759,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_32_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_32_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_32_( \ @@ -7777,7 +7777,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_32_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -7794,7 +7794,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_32_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_32_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -7811,7 +7811,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_32_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_32_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -7892,7 +7892,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_33( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_33_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_33( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_33( \ @@ -7901,7 +7901,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_33( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -7924,7 +7924,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_33_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_33_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -7940,7 +7940,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_33_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -8002,7 +8002,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_33_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_33_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_33_( \ @@ -8020,7 +8020,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_33_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -8037,7 +8037,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_33_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_33_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -8054,7 +8054,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_33_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_33_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -8135,7 +8135,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_34( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_34_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_34( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_34( \ @@ -8144,7 +8144,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_34( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -8167,7 +8167,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_34_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_34_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -8183,7 +8183,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_34_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -8245,7 +8245,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_34_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_34_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_34_( \ @@ -8263,7 +8263,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_34_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -8280,7 +8280,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_34_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_34_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -8297,7 +8297,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_34_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_34_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -8378,7 +8378,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_35( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_35_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_35( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_35( \ @@ -8387,7 +8387,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_35( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -8410,7 +8410,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_35_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_35_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -8426,7 +8426,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_35_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -8488,7 +8488,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_35_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_35_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_35_( \ @@ -8506,7 +8506,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_35_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -8523,7 +8523,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_35_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_35_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -8540,7 +8540,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_35_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_35_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -8621,7 +8621,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_36( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_36_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_36( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_36( \ @@ -8630,7 +8630,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_36( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -8653,7 +8653,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_36_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_36_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -8669,7 +8669,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_36_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -8731,7 +8731,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_36_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_36_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_36_( \ @@ -8749,7 +8749,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_36_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -8766,7 +8766,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_36_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_36_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -8783,7 +8783,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_36_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_36_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -8864,7 +8864,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_37( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_37_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_37( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_37( \ @@ -8873,7 +8873,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_37( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -8896,7 +8896,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_37_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_37_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -8912,7 +8912,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_37_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -8974,7 +8974,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_37_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_37_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_37_( \ @@ -8992,7 +8992,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_37_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -9009,7 +9009,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_37_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_37_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -9026,7 +9026,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_37_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_37_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -9107,7 +9107,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_38( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_38_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_38( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_38( \ @@ -9116,7 +9116,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_38( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -9139,7 +9139,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_38_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_38_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -9155,7 +9155,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_38_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -9217,7 +9217,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_38_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_38_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_38_( \ @@ -9235,7 +9235,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_38_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -9252,7 +9252,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_38_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_38_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -9269,7 +9269,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_38_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_38_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -9350,7 +9350,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_39( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_39_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_39( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_39( \ @@ -9359,7 +9359,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_39( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -9382,7 +9382,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_39_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_39_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -9398,7 +9398,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_39_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -9460,7 +9460,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_39_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_39_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_39_( \ @@ -9478,7 +9478,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_39_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -9495,7 +9495,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_39_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_39_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -9512,7 +9512,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_39_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_39_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -9593,7 +9593,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_40( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_40_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_40( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_40( \ @@ -9602,7 +9602,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_40( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -9625,7 +9625,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_40_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_40_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -9641,7 +9641,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_40_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -9703,7 +9703,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_40_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_40_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_40_( \ @@ -9721,7 +9721,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_40_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -9738,7 +9738,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_40_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_40_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -9755,7 +9755,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_40_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_40_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -9836,7 +9836,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_41( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_41_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_41( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_41( \ @@ -9845,7 +9845,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_41( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -9868,7 +9868,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_41_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_41_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -9884,7 +9884,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_41_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -9946,7 +9946,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_41_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_41_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_41_( \ @@ -9964,7 +9964,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_41_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -9981,7 +9981,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_41_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_41_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -9998,7 +9998,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_41_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_41_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -10079,7 +10079,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_42( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_42_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_42( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_42( \ @@ -10088,7 +10088,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_42( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -10111,7 +10111,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_42_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_42_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -10127,7 +10127,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_42_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -10189,7 +10189,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_42_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_42_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_42_( \ @@ -10207,7 +10207,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_42_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -10224,7 +10224,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_42_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_42_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -10241,7 +10241,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_42_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_42_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -10322,7 +10322,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_43( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_43_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_43( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_43( \ @@ -10331,7 +10331,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_43( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -10354,7 +10354,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_43_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_43_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -10370,7 +10370,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_43_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -10432,7 +10432,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_43_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_43_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_43_( \ @@ -10450,7 +10450,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_43_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -10467,7 +10467,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_43_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_43_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -10484,7 +10484,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_43_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_43_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -10565,7 +10565,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_44( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_44_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_44( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_44( \ @@ -10574,7 +10574,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_44( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -10597,7 +10597,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_44_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_44_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -10613,7 +10613,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_44_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -10675,7 +10675,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_44_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_44_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_44_( \ @@ -10693,7 +10693,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_44_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -10710,7 +10710,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_44_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_44_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -10727,7 +10727,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_44_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_44_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -10808,7 +10808,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_45( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_45_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_45( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_45( \ @@ -10817,7 +10817,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_45( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -10840,7 +10840,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_45_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_45_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -10856,7 +10856,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_45_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -10918,7 +10918,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_45_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_45_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_45_( \ @@ -10936,7 +10936,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_45_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -10953,7 +10953,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_45_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_45_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -10970,7 +10970,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_45_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_45_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -11051,7 +11051,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_46( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_46_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_46( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_46( \ @@ -11060,7 +11060,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_46( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -11083,7 +11083,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_46_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_46_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -11099,7 +11099,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_46_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -11161,7 +11161,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_46_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_46_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_46_( \ @@ -11179,7 +11179,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_46_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -11196,7 +11196,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_46_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_46_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -11213,7 +11213,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_46_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_46_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -11294,7 +11294,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_47( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_47_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_47( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_47( \ @@ -11303,7 +11303,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_47( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -11326,7 +11326,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_47_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_47_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -11342,7 +11342,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_47_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -11404,7 +11404,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_47_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_47_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_47_( \ @@ -11422,7 +11422,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_47_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -11439,7 +11439,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_47_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_47_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -11456,7 +11456,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_47_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_47_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -11537,7 +11537,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_48( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_48_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_48( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_48( \ @@ -11546,7 +11546,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_48( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -11569,7 +11569,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_48_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_48_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -11585,7 +11585,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_48_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -11647,7 +11647,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_48_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_48_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_48_( \ @@ -11665,7 +11665,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_48_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -11682,7 +11682,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_48_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_48_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -11699,7 +11699,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_48_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_48_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -11780,7 +11780,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_49( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_49_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_49( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_49( \ @@ -11789,7 +11789,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_49( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -11812,7 +11812,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_49_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_49_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -11828,7 +11828,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_49_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -11890,7 +11890,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_49_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_49_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_49_( \ @@ -11908,7 +11908,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_49_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -11925,7 +11925,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_49_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_49_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -11942,7 +11942,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_49_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_49_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -12023,7 +12023,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_50( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_50_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_50( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_50( \ @@ -12032,7 +12032,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_50( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -12055,7 +12055,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_50_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_50_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -12071,7 +12071,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_50_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -12133,7 +12133,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_50_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_50_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_50_( \ @@ -12151,7 +12151,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_50_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -12168,7 +12168,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_50_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_50_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -12185,7 +12185,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_50_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_50_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -12266,7 +12266,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_51( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_51_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_51( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_51( \ @@ -12275,7 +12275,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_51( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -12298,7 +12298,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_51_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_51_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -12314,7 +12314,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_51_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -12376,7 +12376,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_51_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_51_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_51_( \ @@ -12394,7 +12394,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_51_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -12411,7 +12411,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_51_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_51_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -12428,7 +12428,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_51_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_51_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -12509,7 +12509,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_52( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_52_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_52( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_52( \ @@ -12518,7 +12518,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_52( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -12541,7 +12541,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_52_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_52_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -12557,7 +12557,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_52_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -12619,7 +12619,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_52_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_52_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_52_( \ @@ -12637,7 +12637,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_52_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -12654,7 +12654,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_52_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_52_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -12671,7 +12671,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_52_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_52_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -12752,7 +12752,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_53( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_53_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_53( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_53( \ @@ -12761,7 +12761,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_53( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -12784,7 +12784,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_53_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_53_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -12800,7 +12800,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_53_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -12862,7 +12862,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_53_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_53_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_53_( \ @@ -12880,7 +12880,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_53_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -12897,7 +12897,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_53_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_53_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -12914,7 +12914,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_53_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_53_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -12995,7 +12995,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_54( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_54_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_54( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_54( \ @@ -13004,7 +13004,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_54( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -13027,7 +13027,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_54_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_54_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -13043,7 +13043,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_54_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -13105,7 +13105,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_54_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_54_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_54_( \ @@ -13123,7 +13123,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_54_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -13140,7 +13140,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_54_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_54_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -13157,7 +13157,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_54_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_54_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -13238,7 +13238,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_55( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_55_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_55( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_55( \ @@ -13247,7 +13247,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_55( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -13270,7 +13270,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_55_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_55_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -13286,7 +13286,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_55_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -13348,7 +13348,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_55_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_55_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_55_( \ @@ -13366,7 +13366,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_55_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -13383,7 +13383,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_55_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_55_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -13400,7 +13400,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_55_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_55_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -13481,7 +13481,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_56( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_56_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_56( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_56( \ @@ -13490,7 +13490,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_56( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -13513,7 +13513,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_56_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_56_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -13529,7 +13529,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_56_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -13591,7 +13591,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_56_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_56_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_56_( \ @@ -13609,7 +13609,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_56_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -13626,7 +13626,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_56_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_56_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -13643,7 +13643,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_56_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_56_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -13724,7 +13724,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_57( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_57_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_57( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_57( \ @@ -13733,7 +13733,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_57( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -13756,7 +13756,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_57_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_57_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -13772,7 +13772,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_57_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -13834,7 +13834,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_57_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_57_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_57_( \ @@ -13852,7 +13852,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_57_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -13869,7 +13869,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_57_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_57_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -13886,7 +13886,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_57_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_57_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -13967,7 +13967,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_58( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_58_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_58( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_58( \ @@ -13976,7 +13976,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_58( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -13999,7 +13999,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_58_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_58_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -14015,7 +14015,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_58_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -14077,7 +14077,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_58_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_58_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_58_( \ @@ -14095,7 +14095,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_58_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -14112,7 +14112,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_58_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_58_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -14129,7 +14129,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_58_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_58_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -14210,7 +14210,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_59( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_59_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_59( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_59( \ @@ -14219,7 +14219,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_59( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -14242,7 +14242,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_59_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_59_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -14258,7 +14258,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_59_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -14320,7 +14320,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_59_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_59_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_59_( \ @@ -14338,7 +14338,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_59_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -14355,7 +14355,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_59_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_59_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -14372,7 +14372,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_59_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_59_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -14453,7 +14453,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_60( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_60_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_60( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_60( \ @@ -14462,7 +14462,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_60( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -14485,7 +14485,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_60_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_60_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -14501,7 +14501,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_60_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -14563,7 +14563,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_60_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_60_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_60_( \ @@ -14581,7 +14581,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_60_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -14598,7 +14598,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_60_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_60_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -14615,7 +14615,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_60_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_60_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -14696,7 +14696,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_61( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_61_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_61( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_61( \ @@ -14705,7 +14705,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_61( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -14728,7 +14728,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_61_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_61_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -14744,7 +14744,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_61_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -14806,7 +14806,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_61_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_61_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_61_( \ @@ -14824,7 +14824,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_61_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -14841,7 +14841,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_61_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_61_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -14858,7 +14858,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_61_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_61_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -14939,7 +14939,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_62( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_62_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_62( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_62( \ @@ -14948,7 +14948,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_62( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -14971,7 +14971,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_62_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_62_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -14987,7 +14987,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_62_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -15049,7 +15049,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_62_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_62_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_62_( \ @@ -15067,7 +15067,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_62_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -15084,7 +15084,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_62_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_62_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -15101,7 +15101,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_62_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_62_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -15182,7 +15182,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_63( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_63_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_63( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_63( \ @@ -15191,7 +15191,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_63( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -15214,7 +15214,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_63_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_63_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -15230,7 +15230,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_63_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -15292,7 +15292,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_63_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_63_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_63_( \ @@ -15310,7 +15310,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_63_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -15327,7 +15327,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_63_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_63_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -15344,7 +15344,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_63_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_63_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -15425,7 +15425,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_64( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_PARSE_D_L_64_( \ d, l, is_post, is_static, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_PARSE_D_L_64( \ d, l, is_post, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_PARSE_D_L_64( \ @@ -15434,7 +15434,7 @@ BOOST_CONTRACT_EXT_PP_POST_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_D_L_64( \ d, l, is_static, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_PP_EXPR_IIF(is_static, static) if, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))))) @@ -15457,7 +15457,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_64_( \ d, l, is_post, decl_traits) \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_ARGS_64_(d, l, is_post, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)) \ ) @@ -15473,7 +15473,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_64_( \ d, l, is_static, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_ELEM(2, 1, \ BOOST_PP_IIF(is_static, \ @@ -15535,7 +15535,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_64_( \ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTIONS_NO_64_( \ d, l, is_post, decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `assertion BOOST_PP_NIL` (single assertion). #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ASSERTION_YES_64_( \ @@ -15553,7 +15553,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_64_( \ d, l, decl_assertion, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_assertion), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ ( BOOST_PP_TUPLE_ELEM(2, 1, decl_assertion) ) BOOST_PP_EMPTY) \ ) @@ -15570,7 +15570,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_64_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_64_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ @@ -15587,7 +15587,7 @@ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_REPLACE_ELSES_PARSE_YES_64_( \ d, l, decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_EXPAND_TRAITS_64_( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ENUM_LIST_PARSE_D_ ## l(d, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/if/cond.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/if/cond.hpp index 2aa424c..835433f 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/if/cond.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/if/cond.hpp @@ -2,7 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_COND_HPP_ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_COND_HPP_ -#include +#include +#include /* PUBLIC */ @@ -11,8 +12,8 @@ // BOOL_ASSERTION_TRAITS respectively. // For static-if, always expand to bool-assertion-traits. #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_COND(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_AUX_COND_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_IF_ASSERTION_COND, traits) // PARSE macro #defined in "if.hpp" (because easier for reentrant repetitions). diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/if/elses.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/if/elses.hpp index 2ebfe2d..6248983 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/if/elses.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/if/elses.hpp @@ -2,13 +2,16 @@ #ifndef BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_HPP_ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES_HPP_ +#include +#include + /* PUBLIC */ // Expand to `pp-seq | EMPTY()`, pp-seq of assertion traits to be inspected via // appropriate ..._ASSERTION_TRAITS_... macros. #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_ELSES(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_AUX_ELSES_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_IF_ASSERTION_ELSES, traits)() // PARSE macro #defined in "if.hpp" (because easier for reentrant repetitions). diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/if/thens.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/if/thens.hpp index 9d40985..627c629 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/if/thens.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/if/thens.hpp @@ -2,13 +2,16 @@ #ifndef BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_HPP_ #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS_HPP_ +#include +#include + /* PUBLIC */ // Expand to `pp-seq | EMPTY()`, pp-seq of assertion traits to be inspected via // appropriate ..._ASSERTION_TRAITS_... macros. #define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_THENS(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_AUX_THENS_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_IF_ASSERTION_THENS, traits)() // PARSE macro #defined in "if.hpp" (because easier for reentrant repetitions). diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/key.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/key.hpp index b277b17..9dda7d0 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/key.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/key.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_ASSERTION_KEY_HPP_ #define BOOST_CONTRACT_EXT_PP_ASSERTION_KEY_HPP_ -#include -#include +#include +#include #include /* PUBLIC */ @@ -12,13 +12,13 @@ // const | if | static if` related assertion traits to be inspected with // NAMESPACE_ASSERTION_TRAITS, USING_ASSERTION_TRAITS, etc. macros. #define BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_KEY(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_AUX_KEY_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_ASSERTION_KEY, traits) #define BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE(key, decl_traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits), key) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/namespace.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/namespace.hpp index 8657493..da0579b 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/namespace.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/namespace.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include /* PUBLIC */ @@ -13,11 +13,11 @@ // Precondition: decl = `namespace (new-name) as name`. #define BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_PARSE(decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_NAME_PARSE( \ BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_NEW_NAME_PARSE( \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE(namespace, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ ))))) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/namespace/name.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/namespace/name.hpp index f4c171b..9229d1a 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/namespace/name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/namespace/name.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_NAME_HPP_ -#include -#include +#include +#include #include #include @@ -11,8 +11,8 @@ // Expand to `name`. #define BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_AUX_NAME_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_NAMESPACE_ASSERTION_NAME, \ traits \ ) @@ -30,7 +30,7 @@ decl, traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK(decl)) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/namespace/new_name.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/namespace/new_name.hpp index bc1fc38..2fcb75b 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/namespace/new_name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/namespace/new_name.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_NEW_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_NEW_NAME_HPP_ -#include -#include +#include +#include #include #include #include @@ -14,8 +14,8 @@ // Expand to `new-name`. #define BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_NEW_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_AUX_NEW_NAME_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_NAMESPACE_ASSERTION_NEW_NAME, \ traits \ ) @@ -34,9 +34,9 @@ #define BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_NEW_NAME_( \ decl, traits) \ ( \ - BOOST_CONTRACT_EXT_PP_KEYWORD_AS_REMOVE_FRONT(BOOST_PP_TUPLE_EAT(1) \ - decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_KEYWORD_AS_REMOVE_FRONT( \ + BOOST_PP_TUPLE_EAT(1) decl), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_REM_CTOR(1, \ BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl)) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/oldof.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/oldof.hpp index bace20e..42d6572 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/oldof.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/oldof.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include @@ -51,13 +51,13 @@ // to the parsalbe decl = `(OLDOF expr) auto-wrapped-type assign =`). #define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_REPLACE_PARSE_D( \ d, oldofdecl_booltraits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_ASSIGN_PARSE( \ BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_TYPE_PARSE_D(d, \ BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_EXPR_PARSE( \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE( \ BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_OPERATOR_, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ (BOOST_PP_TUPLE_ELEM(2, 0, oldofdecl_booltraits)) \ BOOST_CONTRACT_EXT_PP_BOOL_ASSERTION_TRAITS_EXPR( \ BOOST_PP_TUPLE_ELEM(2, 1, oldofdecl_booltraits)) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/assign.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/assign.hpp index bd184e2..432befa 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/assign.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/assign.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_ASSIGN_HPP_ #define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_ASSIGN_HPP_ -#include -#include +#include +#include #include #include @@ -11,8 +11,8 @@ // Expand to `name = ` (note trailing `=` that cannot be removed via pp). #define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_ASSIGN(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_AUX_ASSIGN_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_OLDOF_ASSERTION_ASSIGN, \ traits \ ) @@ -30,7 +30,7 @@ decl, traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_OPERATOR_REMOVE_BACK( \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ decl \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/expr.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/expr.hpp index 17e4432..59637b5 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/expr.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/expr.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_EXPR_HPP_ #define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_EXPR_HPP_ -#include -#include +#include +#include #include #include #include @@ -12,8 +12,8 @@ // Expand to `...` (tokens). #define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_EXPR(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_AUX_EXPR_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_OLDOF_ASSERTION_EXPR, traits) #define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_EXPR_PARSE(decl_traits) \ BOOST_PP_EXPAND( \ @@ -28,12 +28,11 @@ decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(1) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_OPERATOR_REMOVE_FRONT(\ - BOOST_PP_TUPLE_REM_CTOR( \ - 1, BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl) \ - ) \ + BOOST_PP_TUPLE_REM_CTOR(1, \ + BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl)) \ ) \ ) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/type.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/type.hpp index c207d66..6395dfb 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/type.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/oldof/type.hpp @@ -2,24 +2,22 @@ #ifndef BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_TYPE_HPP_ #define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_TYPE_HPP_ -#include +#include #include -#include +#include #include /* PUBLIC */ // Expand to `auto | (type,,,)`. #define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_TYPE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_AUX_TYPE_INDEX, \ - traits \ - ) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_OLDOF_ASSERTION_TYPE, traits) // Precondition: decl = `{auto | wrapped-type} ...`. #define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_TYPE_PARSE_D(d, \ decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_AUTO_TYPE_PARSE_D(d, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits)), \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/return.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/return.hpp index d7c57c5..a4666e6 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/return.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/return.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include /* PUBLIC */ @@ -13,11 +13,11 @@ // Precondition: decl = `typedef wrapped-type new-name`. #define BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_PARSE_D(d, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_ASSIGN_PARSE( \ BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_TYPE_PARSE_D(d, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE(return, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ ))))) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/return/assign.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/return/assign.hpp index 2dfd1a4..e47c582 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/return/assign.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/return/assign.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_ASSIGN_HPP_ #define BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_ASSIGN_HPP_ -#include -#include +#include +#include #include #include #include @@ -12,8 +12,8 @@ // Expand to `name =` (note trailing `=` that cannot be removed via pp). #define BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_ASSIGN(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_AUX_ASSIGN_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_RETURN_ASSERTION_ASSIGN, \ traits \ ) @@ -31,7 +31,7 @@ decl, traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_KEYWORD_RETURN_REMOVE_BACK( \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ decl \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/return/type.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/return/type.hpp index ed4c099..0837ece 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/return/type.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/return/type.hpp @@ -2,24 +2,24 @@ #ifndef BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_TYPE_HPP_ #define BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_TYPE_HPP_ -#include +#include #include -#include +#include #include /* PUBLIC */ // Expand to `auto | (type,,,)`. #define BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_TYPE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_AUX_TYPE_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_RETURN_ASSERTION_TYPE, \ traits \ ) // Precondition: decl = `{auto | wrapped-type} ...`. #define BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_TYPE_PARSE_D(d, \ decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_AUTO_TYPE_PARSE_D(d, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits)), \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/typedef.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/typedef.hpp index b5e5b57..2a4ea30 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/typedef.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/typedef.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include /* PUBLIC */ @@ -13,11 +13,11 @@ // Precondition: decl = `typedef wrapped-type new-name`. #define BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_PARSE_D(d, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_NEW_NAME_PARSE( \ BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_NAME_PARSE_D(d, \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE(typedef, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ ))))) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/typedef/name.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/typedef/name.hpp index b6bb157..37a2ee1 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/typedef/name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/typedef/name.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_NAME_HPP_ -#include +#include #include -#include +#include #include #include @@ -12,15 +12,15 @@ // Expand to `(type,,,)`. #define BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_AUX_NAME_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_TYPEDEF_ASSERTION_NAME, \ traits \ ) // Precondition: decl = `typedef wrapped-type ...`. #define BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_NAME_PARSE_D(d, \ decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_TYPE_PARSE_D(d, \ BOOST_CONTRACT_EXT_PP_KEYWORD_TYPEDEF_REMOVE_FRONT( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits)) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/typedef/new_name.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/typedef/new_name.hpp index 529678f..9dabbe2 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/typedef/new_name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/typedef/new_name.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_NEW_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_NEW_NAME_HPP_ -#include -#include +#include +#include #include #include @@ -11,8 +11,8 @@ // Expand to `new-name`. #define BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_NEW_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_AUX_NEW_NAME_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_TYPEDEF_ASSERTION_NEW_NAME, \ traits \ ) @@ -30,7 +30,7 @@ decl, traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK(decl)) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/using.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/using.hpp index 9c45455..b733a93 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/using.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/using.hpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include /* PUBLIC */ @@ -16,13 +16,13 @@ // Precondition: decl = `[template( c++-template-parameter, ... )] // using [namespace | (new-name) as] wrapped-name`. #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_PARSE(decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NAME_PARSE( \ BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NEW_NAME_PARSE( \ BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NAMESPACE_PARSE( \ BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_TEMPLATE_PARAMS_PARSE( \ BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_SET_KEY_PARSE(using, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ ))))))) diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/using/name.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/using/name.hpp index 4c32234..68de876 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/using/name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/using/name.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NAME_HPP_ -#include -#include +#include +#include #include #include @@ -12,8 +12,8 @@ // Expand to `(name,,,)` (this name is wrapped within parenthesis because in // general it can contain commas, for example for template aliases). #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_AUX_NAME_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_USING_ASSERTION_NAME, \ traits \ ) @@ -31,7 +31,7 @@ decl, traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_PARENTHESIZE( \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK(decl)) \ ) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/using/namespace.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/using/namespace.hpp index 8a96428..97e9de5 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/using/namespace.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/using/namespace.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NAMESPACE_HPP_ #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NAMESPACE_HPP_ -#include -#include +#include +#include #include #include #include @@ -12,8 +12,8 @@ // Expand to `namespace | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NAMESPACE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_AUX_NAMESPACE_INDEX,\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_USING_ASSERTION_NAMESPACE,\ traits \ )() @@ -39,13 +39,13 @@ decl, traits) \ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_NAMESPACE_REMOVE_FRONT(decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ namespace BOOST_PP_EMPTY) \ ) #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NAMESPACE_NO_( \ decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) #endif // #include guard diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/using/new_name.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/using/new_name.hpp index ea88896..e8d5293 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/using/new_name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/using/new_name.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NEW_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NEW_NAME_HPP_ -#include -#include +#include +#include #include #include #include @@ -16,8 +16,8 @@ // Expand to `new-name | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NEW_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_AUX_NEW_NAME_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_USING_ASSERTION_NEW_NAME, \ traits \ )() @@ -55,7 +55,7 @@ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_AS_REMOVE_FRONT(BOOST_PP_TUPLE_EAT(1) \ decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_REM_CTOR(1, \ BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl)) BOOST_PP_EMPTY \ @@ -64,7 +64,7 @@ #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_NEW_NAME_NO_( \ decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) #endif // #include guard diff --git a/include/boost/contract/ext_/preprocessor/traits/assertion/using/template_params.hpp b/include/boost/contract/ext_/preprocessor/traits/assertion/using/template_params.hpp index 1c1b7b5..fe81e2f 100644 --- a/include/boost/contract/ext_/preprocessor/traits/assertion/using/template_params.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/assertion/using/template_params.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_TEMPLATE_PARAMS_HPP_ #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_TEMPLATE_PARAMS_HPP_ -#include -#include +#include +#include #include #include #include @@ -14,8 +14,8 @@ // Expand to `(c++-template-parameters,,,) | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_TEMPLATE_PARAMS(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_AUX_TEMPLATE_PARAMS_INDEX,\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_USING_ASSERTION_TEMPLATE_PARAMS,\ traits \ )() @@ -48,7 +48,7 @@ decl, traits) \ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_USING_REMOVE_FRONT(decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY) \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY) \ ) // Precondition: decl = `( c++-template-parameter, ... ) using ...`. @@ -57,7 +57,7 @@ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_USING_REMOVE_FRONT( \ BOOST_PP_TUPLE_EAT(0) decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl) BOOST_PP_EMPTY) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/adt.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/adt.hpp index 2ca72c1..5057ce5 100644 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/adt.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/adt.hpp @@ -25,30 +25,31 @@ // * PARSE(decl) starts parsing declaration tokens (init. decl_traits). // * PARSE(decl_seq) start parsing pp-seq of declarations (init. decl_traits). // * PARSE(decl_traits) interim parsing of declarations (no init. decl_traits). -// Some PARSE macros (the ones in aux_/) do no parse multiple traits but only +// Users will often only need to explicitly call the FUNC_TRAITS_PARSE and +// CLASS_TRAITS_PARSE macros directly (other PARSE macro are called internally). +// Some PARSE macros (e.g., from in aux_/) do no parse multiple traits but only // a single trait so they do not use the PP_TRAITS macros below but just report // trait as tokens (this is documented by these macros). /* PUBLIC */ -#define BOOST_CONTRACT_EXT_PP_TRAITS_INIT (BOOST_PP_NIL) +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT (BOOST_PP_NIL) // Usage: DONE(traits) (could expand to EMPTY()). -#define BOOST_CONTRACT_EXT_PP_TRAITS_DONE BOOST_PP_SEQ_POP_FRONT +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE BOOST_PP_SEQ_POP_FRONT // Usage: ELEM(index, traits) -#define BOOST_CONTRACT_EXT_PP_TRAITS_ELEM BOOST_PP_SEQ_ELEM +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM BOOST_PP_SEQ_ELEM -#define BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, trait) traits (trait) +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, trait) \ + traits (trait) // Usage: POP_BACK(taits) -#define BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK BOOST_PP_SEQ_POP_BACK +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK BOOST_PP_SEQ_POP_BACK -#define BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits) \ +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits) \ BOOST_PP_SEQ_ELEM(BOOST_PP_DEC(BOOST_PP_SEQ_SIZE(traits)), traits) -// DECLaration TRAITS. - // NOTE: These DECL_TRAITS macros are provided for convenience only (but use // them whenever possible instead of the TRAITS_INIT, TRAITS_DONE, etc. macros // above so to make your code more readable and compact). @@ -56,20 +57,20 @@ // parameter throw (because the format of `decl` is up to the user, sometime // it is a pp-seq, sometimes just tokens, etc.). -#define BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT(decl) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_INIT) +#define BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT(decl) \ + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT) -#define BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE(decl_traits) \ +#define BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE(decl_traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(2, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(2, 1, \ decl_traits)) \ ) -#define BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK(decl_trait, traits) \ +#define BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK(decl_trait, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_trait), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, decl_trait)) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/assertion_index.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/assertion_index.hpp deleted file mode 100644 index aee5f4d..0000000 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/assertion_index.hpp +++ /dev/null @@ -1,39 +0,0 @@ - -#ifndef BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_AUX_INDEX_HPP_ -#define BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_AUX_INDEX_HPP_ - -// WARNING: These index values must match parsing order (see assertion.hpp). - -#define BOOST_CONTRACT_EXT_PP_ASSERTION_TRAITS_AUX_KEY_INDEX 0 - -// All indexes below start from 1 (0 taken by "key", common to all assertions). - -#define BOOST_CONTRACT_EXT_PP_BOOL_ASSERTION_TRAITS_AUX_EXPR_INDEX 1 - -#define BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_AUX_CAPTURES_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_CONST_ASSERTION_TRAITS_AUX_EXPR_INDEX 2 - -#define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_AUX_COND_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_AUX_THENS_INDEX 2 -#define BOOST_CONTRACT_EXT_PP_IF_ASSERTION_TRAITS_AUX_ELSES_INDEX 3 - -#define BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_AUX_TYPE_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_RETURN_ASSERTION_TRAITS_AUX_ASSIGN_INDEX 2 - -#define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_AUX_EXPR_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_AUX_TYPE_INDEX 2 -#define BOOST_CONTRACT_EXT_PP_OLDOF_ASSERTION_TRAITS_AUX_ASSIGN_INDEX 3 - -#define BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_AUX_NEW_NAME_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_NAMESPACE_ASSERTION_TRAITS_AUX_NAME_INDEX 2 - -#define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_AUX_TEMPLATE_PARAMS_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_AUX_NAMESPACE_INDEX 2 -#define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_AUX_NEW_NAME_INDEX 3 -#define BOOST_CONTRACT_EXT_PP_USING_ASSERTION_TRAITS_AUX_NAME_INDEX 4 - -#define BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_AUX_NAME_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_TYPEDEF_ASSERTION_TRAITS_AUX_NEW_NAME_INDEX 2 - -#endif // #include guard - diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/base_index.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/base_index.hpp deleted file mode 100644 index b89ec84..0000000 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/base_index.hpp +++ /dev/null @@ -1,12 +0,0 @@ - -#ifndef BOOST_CONTRACT_EXT_PP_BASE_TRAITS_AUX_INDEX_HPP_ -#define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_AUX_INDEX_HPP_ - -// WARNING: These index values must match parsing oder (see base.hpp). - -#define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_AUX_ACCESS_INDEX 0 -#define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_AUX_VIRTUAL_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_AUX_TYPE_INDEX 2 - -#endif // #include guard - diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/capture_index.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/capture_index.hpp deleted file mode 100644 index 395e851..0000000 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/capture_index.hpp +++ /dev/null @@ -1,11 +0,0 @@ - -#ifndef BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_AUX_INDEX_HPP_ -#define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_AUX_INDEX_HPP_ - -// WARNING: These index values must match parsing oder (see capture.hpp). - -#define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_AUX_TYPE_INDEX 0 -#define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_AUX_NAME_INDEX 1 - -#endif // #include guard - diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/class_index.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/class_index.hpp deleted file mode 100644 index b9226d4..0000000 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/class_index.hpp +++ /dev/null @@ -1,31 +0,0 @@ - -#ifndef BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_HPP_ -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_HPP_ - -// WARNING: These index values must match parsing order (see class.hpp). - -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_EXPORT_INDEX 0 -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_TEMPLATE_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_TEMPLATE_PARAMS_INDEX 2 - -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_FRIEND_INDEX 3 - -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_KEY_INDEX 4 - -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_VERBATIM_INDEX 5 - -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_NAME_INDEX 6 - -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_SPECIALIZATION_INDEX 7 - -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_FINAL_INDEX 8 -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_VIRT_INDEX \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_FINAL_INDEX - -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_BASES_INDEX 9 - -// Must be greater than all indexes (i.e., very last one). -#define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_MAX_INDEX 10 - -#endif // #include guard - diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/func_index.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/func_index.hpp deleted file mode 100644 index 7981843..0000000 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/func_index.hpp +++ /dev/null @@ -1,55 +0,0 @@ - -#ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_HPP_ -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_HPP_ - -// WARNING: These index values must match parsing order (see func.hpp). - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_ACCESS_INDEX 0 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VERBATIM_INDEX 1 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXPORT_INDEX 2 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TEMPLATE_INDEX 3 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TEMPLATE_PARAMS_INDEX 4 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INLINE_INDEX 5 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_STATIC_INDEX 6 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXTERN_INDEX 7 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXPLICIT_INDEX 8 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VIRTUAL_INDEX 9 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_FRIEND_INDEX 10 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_CLASSIFIERS_INDEX \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_FRIEND_INDEX - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_RETURN_INDEX 11 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_OPERATOR_NAME_INDEX 12 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_NAME_INDEX 13 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_PARAMS_INDEX 14 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_CONST_INDEX 15 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VOLATILE_INDEX 16 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_CV_INDEX \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VOLATILE_INDEX - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_REF_INDEX 17 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXCEPT_INDEX 18 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TRAILING_RETURN_INDEX 19 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_FINAL_INDEX 20 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_OVERRIDE_INDEX 21 -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VIRT_INDEX \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_OVERRIDE_INDEX - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_PRECONDITIONS_INDEX 22 - -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_POSTCONDITIONS_INDEX 23 - -// Must be greater than all indexes (i.e., very last one). -#define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_MAX_INDEX 24 - -#endif // #include guard - diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/index/assertion.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/index/assertion.hpp new file mode 100644 index 0000000..a3d2164 --- /dev/null +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/index/assertion.hpp @@ -0,0 +1,39 @@ + +#ifndef BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_ASSERTION_HPP_ +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_ASSERTION_HPP_ + +// WARNING: These index values must match parsing order (see assertion.hpp). + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_ASSERTION_KEY 0 + +// All indexes below start from 1 (0 taken by "key", common to all assertions). + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BOOL_ASSERTION_EXPR 1 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CONST_ASSERTION_CAPTURES 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CONST_ASSERTION_EXPR 2 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_IF_ASSERTION_COND 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_IF_ASSERTION_THENS 2 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_IF_ASSERTION_ELSES 3 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_RETURN_ASSERTION_TYPE 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_RETURN_ASSERTION_ASSIGN 2 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_OLDOF_ASSERTION_EXPR 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_OLDOF_ASSERTION_TYPE 2 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_OLDOF_ASSERTION_ASSIGN 3 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_NAMESPACE_ASSERTION_NEW_NAME 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_NAMESPACE_ASSERTION_NAME 2 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_USING_ASSERTION_TEMPLATE_PARAMS 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_USING_ASSERTION_NAMESPACE 2 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_USING_ASSERTION_NEW_NAME 3 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_USING_ASSERTION_NAME 4 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_TYPEDEF_ASSERTION_NAME 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_TYPEDEF_ASSERTION_NEW_NAME 2 + +#endif // #include guard + diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/index/base.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/index/base.hpp new file mode 100644 index 0000000..6ba7ca9 --- /dev/null +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/index/base.hpp @@ -0,0 +1,12 @@ + +#ifndef BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BASE_HPP_ +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BASE_HPP_ + +// WARNING: These index values must match parsing oder (see base.hpp). + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BASE_ACCESS 0 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BASE_VIRTUAL 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BASE_TYPE 2 + +#endif // #include guard + diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/index/capture.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/index/capture.hpp new file mode 100644 index 0000000..9517a03 --- /dev/null +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/index/capture.hpp @@ -0,0 +1,11 @@ + +#ifndef BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CAPTURE_HPP_ +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CAPTURE_HPP_ + +// WARNING: These index values must match parsing oder (see capture.hpp). + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CAPTURE_TYPE 0 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CAPTURE_NAME 1 + +#endif // #include guard + diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/index/class.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/index/class.hpp new file mode 100644 index 0000000..6d192cf --- /dev/null +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/index/class.hpp @@ -0,0 +1,31 @@ + +#ifndef BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_HPP_ +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_HPP_ + +// WARNING: These index values must match parsing order (see class.hpp). + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_EXPORT 0 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_TEMPLATE 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_TEMPLATE_PARAMS 2 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_FRIEND 3 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_KEY 4 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_VERBATIM 5 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_NAME 6 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_SPECIALIZATION 7 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_FINAL 8 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_VIRT \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_FINAL + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_BASES 9 + +// Must be greater than all indexes (i.e., very last one). +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_MAX 10 + +#endif // #include guard + diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/index/func.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/index/func.hpp new file mode 100644 index 0000000..3a50a02 --- /dev/null +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/index/func.hpp @@ -0,0 +1,55 @@ + +#ifndef BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_HPP_ +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_HPP_ + +// WARNING: These index values must match parsing order (see func.hpp). + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_ACCESS 0 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VERBATIM 1 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXPORT 2 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TEMPLATE 3 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TEMPLATE_PARAMS 4 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_INLINE 5 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_STATIC 6 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXTERN 7 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXPLICIT 8 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VIRTUAL 9 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_FRIEND 10 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_CLASSIFIERS \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_FRIEND + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_RETURN 11 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_OPERATOR_NAME 12 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_NAME 13 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_PARAMS 14 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_CONST 15 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VOLATILE 16 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_CV \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VOLATILE + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_REF 17 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXCEPT 18 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TRAILING_RETURN 19 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_FINAL 20 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_OVERRIDE 21 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VIRT \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_OVERRIDE + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_PRECONDITIONS 22 + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_POSTCONDITIONS 23 + +// Must be greater than all indexes (i.e., very last one). +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_MAX 24 + +#endif // #include guard + diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/index/param.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/index/param.hpp new file mode 100644 index 0000000..3aa9fe2 --- /dev/null +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/index/param.hpp @@ -0,0 +1,12 @@ + +#ifndef BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_PARAM_HPP_ +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_PARAM_HPP_ + +// WARNING: Theses index values must match parsing oder (see param.hpp). + +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_PARAM_TYPE 0 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_PARAM_NAME 1 +#define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_PARAM_DEFAULT 2 + +#endif // #include guard + diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/keyword_list.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/keyword_list.hpp index 6505076..1d44bd4 100644 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/keyword_list.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/keyword_list.hpp @@ -2,7 +2,7 @@ #ifndef BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD_LIST_HPP_ #define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD_LIST_HPP_ -#include +#include #include #include #include @@ -30,11 +30,11 @@ d, decl, traits, keyword, list_parse_macro) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ BOOST_PP_IIF(BOOST_CONTRACT_EXT_PP_IS_EMPTY(keyword), \ traits BOOST_PP_TUPLE_EAT(2) \ , \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK \ )(traits, keyword BOOST_PP_EMPTY), \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD_LIST_EXPAND_TRAITS_( \ list_parse_macro(d, BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl)) \ @@ -58,11 +58,11 @@ d, decl, traits, keyword, remove_keyword_macro, list_parse_macro) \ ( \ decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ BOOST_PP_IIF(BOOST_CONTRACT_EXT_PP_IS_EMPTY(keyword), \ traits BOOST_PP_TUPLE_EAT(2) \ , \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK \ )(traits, BOOST_PP_EMPTY), \ BOOST_PP_EMPTY \ ) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/list-generate.py b/include/boost/contract/ext_/preprocessor/traits/aux_/list-generate.py index 0509a99..0ef7fbd 100644 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/list-generate.py +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/list-generate.py @@ -80,7 +80,7 @@ def code(): BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_{0}_, \\ ( \\ decl_seq (BOOST_PP_NIL), \\ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \\ parse_elem_macro, \\ is_replacement_macro, \\ replace_elem_macro \\ @@ -92,7 +92,7 @@ def code(): decl_traits_parse_is_replace) \\ ( \\ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \\ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \\ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \\ ) @@ -135,9 +135,9 @@ def code(): traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \\ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_{0}_(d, \\ BOOST_PP_SEQ_TAIL(decl_seq), \\ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \\ replace_elem_macro(d, {1}, (BOOST_PP_SEQ_HEAD(decl_seq), \\ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \\ parse_elem_macro, \\ is_replacement_macro, \\ replace_elem_macro \\ @@ -155,7 +155,7 @@ def code(): BOOST_PP_SEQ_PUSH_FRONT \\ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \\ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \\ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \\ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \\ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \\ parse_elem_macro, \\ is_replacement_macro, \\ @@ -174,8 +174,7 @@ file.write(''' // WARNING: FILE AUTOMATICALLY GENERATED, DO NOT MODIFY IT! // Instead, modify and run related generation script "{0}". -#include -#include +#include #include #include #include diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/list.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/list.hpp index cb40d97..b78dc49 100644 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/list.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/list.hpp @@ -5,8 +5,7 @@ // WARNING: FILE AUTOMATICALLY GENERATED, DO NOT MODIFY IT! // Instead, modify and run related generation script "list-generate.py". -#include -#include +#include #include #include #include @@ -142,7 +141,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_1_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -154,7 +153,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -197,9 +196,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_1_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 2, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -217,7 +216,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -296,7 +295,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_2_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -308,7 +307,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -351,9 +350,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_2_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 3, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -371,7 +370,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -450,7 +449,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_3_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -462,7 +461,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -505,9 +504,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_3_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 4, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -525,7 +524,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -604,7 +603,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_4_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -616,7 +615,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -659,9 +658,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_4_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 5, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -679,7 +678,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -758,7 +757,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_5_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -770,7 +769,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -813,9 +812,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_5_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 6, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -833,7 +832,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -912,7 +911,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_6_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -924,7 +923,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -967,9 +966,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_6_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 7, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -987,7 +986,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -1066,7 +1065,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_7_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1078,7 +1077,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -1121,9 +1120,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_7_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 8, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1141,7 +1140,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -1220,7 +1219,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_8_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1232,7 +1231,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -1275,9 +1274,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_8_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 9, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1295,7 +1294,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -1374,7 +1373,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_9_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1386,7 +1385,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -1429,9 +1428,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_9_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 10, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1449,7 +1448,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -1528,7 +1527,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_10_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1540,7 +1539,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -1583,9 +1582,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_10_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 11, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1603,7 +1602,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -1682,7 +1681,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_11_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1694,7 +1693,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -1737,9 +1736,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_11_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 12, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1757,7 +1756,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -1836,7 +1835,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_12_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1848,7 +1847,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -1891,9 +1890,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_12_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 13, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -1911,7 +1910,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -1990,7 +1989,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_13_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2002,7 +2001,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -2045,9 +2044,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_13_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 14, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2065,7 +2064,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -2144,7 +2143,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_14_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2156,7 +2155,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -2199,9 +2198,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_14_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 15, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2219,7 +2218,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -2298,7 +2297,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_15_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2310,7 +2309,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -2353,9 +2352,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_15_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 16, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2373,7 +2372,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -2452,7 +2451,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_16_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2464,7 +2463,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -2507,9 +2506,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_16_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 17, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2527,7 +2526,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -2606,7 +2605,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_17_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2618,7 +2617,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -2661,9 +2660,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_17_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 18, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2681,7 +2680,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -2760,7 +2759,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_18_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2772,7 +2771,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -2815,9 +2814,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_18_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 19, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2835,7 +2834,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -2914,7 +2913,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_19_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2926,7 +2925,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -2969,9 +2968,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_19_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 20, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -2989,7 +2988,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -3068,7 +3067,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_20_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3080,7 +3079,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -3123,9 +3122,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_20_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 21, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3143,7 +3142,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -3222,7 +3221,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_21_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3234,7 +3233,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -3277,9 +3276,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_21_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 22, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3297,7 +3296,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -3376,7 +3375,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_22_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3388,7 +3387,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -3431,9 +3430,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_22_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 23, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3451,7 +3450,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -3530,7 +3529,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_23_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3542,7 +3541,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -3585,9 +3584,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_23_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 24, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3605,7 +3604,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -3684,7 +3683,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_24_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3696,7 +3695,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -3739,9 +3738,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_24_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 25, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3759,7 +3758,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -3838,7 +3837,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_25_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3850,7 +3849,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -3893,9 +3892,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_25_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 26, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -3913,7 +3912,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -3992,7 +3991,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_26_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4004,7 +4003,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -4047,9 +4046,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_26_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 27, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4067,7 +4066,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -4146,7 +4145,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_27_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4158,7 +4157,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -4201,9 +4200,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_27_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 28, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4221,7 +4220,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -4300,7 +4299,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_28_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4312,7 +4311,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -4355,9 +4354,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_28_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 29, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4375,7 +4374,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -4454,7 +4453,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_29_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4466,7 +4465,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -4509,9 +4508,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_29_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 30, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4529,7 +4528,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -4608,7 +4607,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_30_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4620,7 +4619,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -4663,9 +4662,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_30_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 31, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4683,7 +4682,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -4762,7 +4761,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_31_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4774,7 +4773,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -4817,9 +4816,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_31_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 32, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4837,7 +4836,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -4916,7 +4915,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_32_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4928,7 +4927,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -4971,9 +4970,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_32_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 33, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -4991,7 +4990,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -5070,7 +5069,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_33_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5082,7 +5081,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -5125,9 +5124,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_33_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 34, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5145,7 +5144,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -5224,7 +5223,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_34_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5236,7 +5235,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -5279,9 +5278,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_34_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 35, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5299,7 +5298,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -5378,7 +5377,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_35_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5390,7 +5389,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -5433,9 +5432,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_35_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 36, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5453,7 +5452,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -5532,7 +5531,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_36_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5544,7 +5543,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -5587,9 +5586,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_36_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 37, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5607,7 +5606,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -5686,7 +5685,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_37_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5698,7 +5697,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -5741,9 +5740,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_37_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 38, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5761,7 +5760,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -5840,7 +5839,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_38_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5852,7 +5851,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -5895,9 +5894,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_38_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 39, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -5915,7 +5914,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -5994,7 +5993,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_39_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6006,7 +6005,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -6049,9 +6048,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_39_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 40, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6069,7 +6068,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -6148,7 +6147,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_40_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6160,7 +6159,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -6203,9 +6202,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_40_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 41, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6223,7 +6222,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -6302,7 +6301,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_41_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6314,7 +6313,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -6357,9 +6356,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_41_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 42, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6377,7 +6376,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -6456,7 +6455,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_42_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6468,7 +6467,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -6511,9 +6510,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_42_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 43, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6531,7 +6530,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -6610,7 +6609,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_43_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6622,7 +6621,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -6665,9 +6664,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_43_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 44, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6685,7 +6684,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -6764,7 +6763,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_44_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6776,7 +6775,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -6819,9 +6818,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_44_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 45, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6839,7 +6838,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -6918,7 +6917,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_45_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6930,7 +6929,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -6973,9 +6972,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_45_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 46, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -6993,7 +6992,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -7072,7 +7071,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_46_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7084,7 +7083,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -7127,9 +7126,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_46_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 47, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7147,7 +7146,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -7226,7 +7225,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_47_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7238,7 +7237,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -7281,9 +7280,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_47_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 48, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7301,7 +7300,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -7380,7 +7379,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_48_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7392,7 +7391,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -7435,9 +7434,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_48_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 49, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7455,7 +7454,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -7534,7 +7533,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_49_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7546,7 +7545,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -7589,9 +7588,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_49_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 50, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7609,7 +7608,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -7688,7 +7687,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_50_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7700,7 +7699,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -7743,9 +7742,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_50_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 51, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7763,7 +7762,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -7842,7 +7841,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_51_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7854,7 +7853,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -7897,9 +7896,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_51_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 52, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -7917,7 +7916,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -7996,7 +7995,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_52_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8008,7 +8007,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -8051,9 +8050,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_52_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 53, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8071,7 +8070,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -8150,7 +8149,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_53_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8162,7 +8161,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -8205,9 +8204,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_53_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 54, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8225,7 +8224,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -8304,7 +8303,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_54_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8316,7 +8315,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -8359,9 +8358,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_54_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 55, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8379,7 +8378,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -8458,7 +8457,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_55_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8470,7 +8469,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -8513,9 +8512,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_55_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 56, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8533,7 +8532,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -8612,7 +8611,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_56_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8624,7 +8623,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -8667,9 +8666,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_56_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 57, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8687,7 +8686,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -8766,7 +8765,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_57_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8778,7 +8777,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -8821,9 +8820,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_57_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 58, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8841,7 +8840,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -8920,7 +8919,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_58_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8932,7 +8931,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -8975,9 +8974,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_58_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 59, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -8995,7 +8994,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -9074,7 +9073,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_59_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9086,7 +9085,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -9129,9 +9128,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_59_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 60, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9149,7 +9148,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -9228,7 +9227,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_60_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9240,7 +9239,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -9283,9 +9282,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_60_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 61, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9303,7 +9302,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -9382,7 +9381,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_61_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9394,7 +9393,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -9437,9 +9436,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_61_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 62, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9457,7 +9456,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -9536,7 +9535,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_62_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9548,7 +9547,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -9591,9 +9590,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_62_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 63, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9611,7 +9610,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -9690,7 +9689,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_63_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9702,7 +9701,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -9745,9 +9744,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_63_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 64, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9765,7 +9764,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ @@ -9844,7 +9843,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_OP_64_, \ ( \ decl_seq (BOOST_PP_NIL), \ - BOOST_CONTRACT_EXT_PP_TRAITS_INIT, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INIT, \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9856,7 +9855,7 @@ decl_traits_parse_is_replace) \ ( \ BOOST_PP_TUPLE_ELEM(5, 0, decl_traits_parse_is_replace), \ - BOOST_CONTRACT_EXT_PP_TRAITS_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_DONE(BOOST_PP_TUPLE_ELEM(5, 1, \ decl_traits_parse_is_replace)) BOOST_PP_EMPTY \ ) @@ -9899,9 +9898,9 @@ traits, parse_elem_macro, is_replacement_macro, replace_elem_macro) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_LIST_PUSH_BACK_64_(d, \ BOOST_PP_SEQ_TAIL(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(traits), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK(traits), \ replace_elem_macro(d, 65, (BOOST_PP_SEQ_HEAD(decl_seq), \ - BOOST_CONTRACT_EXT_PP_TRAITS_BACK(traits))), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_BACK(traits))), \ parse_elem_macro, \ is_replacement_macro, \ replace_elem_macro \ @@ -9919,7 +9918,7 @@ BOOST_PP_SEQ_PUSH_FRONT \ )(decl_seq, BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, elemdecl_elemtraits))), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, elemdecl_elemtraits)), \ parse_elem_macro, \ is_replacement_macro, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/param_index.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/param_index.hpp deleted file mode 100644 index 5b78c1d..0000000 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/param_index.hpp +++ /dev/null @@ -1,12 +0,0 @@ - -#ifndef BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_AUX_INDEX_HPP_ -#define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_AUX_INDEX_HPP_ - -// WARNING: Theses index values must match parsing oder (see param.hpp). - -#define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_AUX_TYPE_INDEX 0 -#define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_AUX_NAME_INDEX 1 -#define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_AUX_DEFAULT_INDEX 2 - -#endif // #include guard - diff --git a/include/boost/contract/ext_/preprocessor/traits/aux_/type.hpp b/include/boost/contract/ext_/preprocessor/traits/aux_/type.hpp index 3ec2ff4..01210d3 100644 --- a/include/boost/contract/ext_/preprocessor/traits/aux_/type.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/aux_/type.hpp @@ -2,7 +2,6 @@ #ifndef BOOST_CONTRACT_EXT_PP_TRAITS_AUX_TYPE_HPP_ #define BOOST_CONTRACT_EXT_PP_TRAITS_AUX_TYPE_HPP_ -#include #include #include #include @@ -24,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/include/boost/contract/ext_/preprocessor/traits/base.hpp b/include/boost/contract/ext_/preprocessor/traits/base.hpp index 13f180f..c2b7346 100644 --- a/include/boost/contract/ext_/preprocessor/traits/base.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/base.hpp @@ -4,17 +4,17 @@ #include #include -#include +#include /* PUBLIC */ // Precondition: decl = `{[public | protected | private] [virtual] | [virtual] // [public | protected | private]} wrapped-type`. #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_PARSE(decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_BASE_TRAITS_TYPE_PARSE( \ BOOST_CONTRACT_EXT_PP_BASE_TRAITS_CLASSIFIERS_PARSE( \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))) diff --git a/include/boost/contract/ext_/preprocessor/traits/base/classifiers.hpp b/include/boost/contract/ext_/preprocessor/traits/base/classifiers.hpp index f22485c..7a08cbe 100644 --- a/include/boost/contract/ext_/preprocessor/traits/base/classifiers.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/base/classifiers.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_BASE_TRAITS_CLASSIFIERS_HPP_ #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_CLASSIFIERS_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -17,13 +17,13 @@ // Expand to `public | protected | private | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_ACCESS(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_BASE_TRAITS_AUX_ACCESS_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BASE_ACCESS, traits)() // Expand to `virtual | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_VIRTUAL(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_BASE_TRAITS_AUX_VIRTUAL_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BASE_VIRTUAL, traits)() // Implementation: Do NOT use EXPAND for proper expansion (on MSVC). #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_CLASSIFIERS_PARSE(decl_traits) \ @@ -49,7 +49,7 @@ ) #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_VIRTUAL_1ST_PUSH_BACK_(decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ virtual BOOST_PP_EMPTY)) #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_VIRTUAL_1ST_NO_(decl, traits) \ @@ -67,14 +67,15 @@ #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_VIRTUAL_2ND_YES_(decl, traits) \ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_VIRTUAL_REMOVE_FRONT(decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, virtual BOOST_PP_EMPTY) \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ + virtual BOOST_PP_EMPTY) \ ) #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_VIRTUAL_2ND_NO_(decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_ACCESS_(decl, traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD3_PARSE( \ decl, \ public, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/base/type.hpp b/include/boost/contract/ext_/preprocessor/traits/base/type.hpp index aedfdd8..2f1ea13 100644 --- a/include/boost/contract/ext_/preprocessor/traits/base/type.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/base/type.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_BASE_TRAITS_TYPE_HPP_ #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_TYPE_HPP_ -#include -#include +#include +#include #include #include #include @@ -13,8 +13,8 @@ // Expand to `(,,,)`. #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_TYPE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_BASE_TRAITS_AUX_TYPE_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_BASE_TYPE, traits) // Implementation: EXPAND and REM to force proper macro expansion (on MSVC). #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_TYPE_PARSE(decl_traits) \ @@ -30,7 +30,7 @@ #define BOOST_CONTRACT_EXT_PP_BASE_TRAITS_TYPE_PARSE_ARGS_(decl, traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_PARENTHESIZE( \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK(decl)) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/capture.hpp b/include/boost/contract/ext_/preprocessor/traits/capture.hpp index 15050ef..11fc953 100644 --- a/include/boost/contract/ext_/preprocessor/traits/capture.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/capture.hpp @@ -4,16 +4,17 @@ #include #include -#include +#include +#include /* PUBLIC */ // Precondition: decl = `[wrapped-type] name`. #define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_PARSE_D_L(d, l, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_NAME_PARSE( \ BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_TYPE_PARSE_D(d, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ )))) diff --git a/include/boost/contract/ext_/preprocessor/traits/capture/name.hpp b/include/boost/contract/ext_/preprocessor/traits/capture/name.hpp index 4be2042..8e48cdc 100644 --- a/include/boost/contract/ext_/preprocessor/traits/capture/name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/capture/name.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_NAME_HPP_ -#include -#include +#include +#include #include #include @@ -11,14 +11,14 @@ // Expand to `name | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_AUX_NAME_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CAPTURE_NAME, traits) // Precondition: name must always be the last remaining token in decl. #define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_NAME_PARSE(decl_traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits), \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits)) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/capture/type.hpp b/include/boost/contract/ext_/preprocessor/traits/capture/type.hpp index 7300e60..8c76b7b 100644 --- a/include/boost/contract/ext_/preprocessor/traits/capture/type.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/capture/type.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_TYPE_HPP_ #define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_TYPE_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -13,8 +13,8 @@ // Expand to `(,,,) | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_TYPE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_AUX_TYPE_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CAPTURE_TYPE, traits)() // Precondition: decl = `[wrapped-type] ...`. @@ -39,14 +39,14 @@ #define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_TYPE_YES_(decl_type, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_type), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_PP_TUPLE_ELEM(2, 1, decl_type) BOOST_PP_EMPTY) \ ) #define BOOST_CONTRACT_EXT_PP_CAPTURE_TRAITS_TYPE_NO_(decl_type, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_type), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY) \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY) \ ) #endif // #include guard diff --git a/include/boost/contract/ext_/preprocessor/traits/class.hpp b/include/boost/contract/ext_/preprocessor/traits/class.hpp index 13629a8..8415f35 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class.hpp @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include +#include /* PUBLIC */ @@ -30,35 +30,29 @@ BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_FRIEND_PARSE_( \ BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_TEMPLATE_PARSE_(d, \ BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_EXPORT_PARSE_( \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ ))))))))))) /* PRIVATE */ -// To debug or test the pp parsing code, you can #define this internal macro to -// stop parsing at a given trait index as #defined in class_index.hpp (this is -// what some of this library tests do). -// #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST ..._INDEX - -// TODO: If I rename AUX macros in each class/* file then I can use CLASS_TRAITS -// names here (same for func.hpp). -// NOTE: These macros #definitions read TRAITS_CLASS instead of CLASS_TRAITS to -// avoid name clashes with macro #define in class/*. +// To debug or test the pp parsing code, #define this internal macro to stop +// parsing at a given trait index as #defined in aux_/index/class.hpp: +// #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST ... #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_MAX_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_MAX # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_DONE_(decl_traits) \ decl_traits #else # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_DONE_ \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE #endif #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_EXPORT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_EXPORT # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_EXPORT_PARSE_(decl_traits) \ decl_traits #else @@ -68,7 +62,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_TEMPLATE_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_TEMPLATE # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_TEMPLATE_PARSE_(d, decl_traits) \ decl_traits #else @@ -78,7 +72,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_FRIEND_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_FRIEND # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_FRIEND_PARSE_(decl_traits) \ decl_traits #else @@ -88,7 +82,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_KEY_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_KEY # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_KEY_PARSE_(decl_traits) \ decl_traits #else @@ -98,7 +92,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_VERBATIM_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_VERBATIM # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_VERBATIM_PARSE_(decl_traits) \ decl_traits #else @@ -108,7 +102,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_NAME_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_NAME # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_NAME_PARSE_(decl_traits) \ decl_traits #else @@ -118,7 +112,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_SPECIALIZATION_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_SPECIALIZATION # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_SPECIALIZATION_PARSE_( \ decl_traits) \ decl_traits @@ -129,7 +123,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_VIRT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_VIRT # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_VIRT_PARSE_(decl_traits) \ decl_traits #else @@ -139,7 +133,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_BASES_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_BASES # define BOOST_CONTRACT_EXT_PP_TRAITS_CLASS_BASES_PARSE_(d, decl_traits) \ decl_traits #else diff --git a/include/boost/contract/ext_/preprocessor/traits/class/bases.hpp b/include/boost/contract/ext_/preprocessor/traits/class/bases.hpp index 75f2958..b90b89f 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class/bases.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class/bases.hpp @@ -3,10 +3,10 @@ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_BASES_HPP_ #include -#include +#include #include #include -#include +#include #include #include @@ -15,8 +15,8 @@ // Expand to EMPTY() if no base class, otherwise expand to pp-seq of base class // traits (each pp-seq elem. to be inspected via BASE_TRAITS). #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_BASES(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_BASES_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_BASES, traits)() #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_BASES_PARSE_D(d, decl_traits) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD_LIST_PARSE_D(d, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/class/export.hpp b/include/boost/contract/ext_/preprocessor/traits/class/export.hpp index 4c93aae..0ded356 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class/export.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class/export.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_EXPORT_HPP_ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_EXPORT_HPP_ -#include +#include #include -#include +#include #include #include @@ -15,12 +15,12 @@ // Expand to `export | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_EXPORT(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_EXPORT_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_EXPORT, traits)() // Implementation: Trailing EMPTY already put by KEYWORD1. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_EXPORT_PARSE(decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD1_PARSE( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ export, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/class/friend.hpp b/include/boost/contract/ext_/preprocessor/traits/class/friend.hpp index b3ca3e4..adbfb8c 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class/friend.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class/friend.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_FRIEND_HPP_ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_FRIEND_HPP_ -#include +#include #include -#include +#include #include #include @@ -12,12 +12,12 @@ // Expand to `friend | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_FRIEND(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_FRIEND_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_FRIEND, traits)() // Implementation: Trailing EMPTY already put by KEYWORD1. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_FRIEND_PARSE(decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD1_PARSE( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ friend, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/class/key.hpp b/include/boost/contract/ext_/preprocessor/traits/class/key.hpp index 545ee3b..2b337e1 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class/key.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class/key.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_KEY_HPP_ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_KEY_HPP_ -#include -#include +#include +#include #include #include #include @@ -13,8 +13,8 @@ // Expand to `class | struct` (cannot be empty). #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_KEY(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_KEY_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_KEY, traits) #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_KEY_PARSE(decl_traits) \ BOOST_PP_EXPAND(BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_KEY_PARSE_ARGS_ \ @@ -35,14 +35,14 @@ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_KEY_CLASS_(decl, traits) \ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_CLASS_REMOVE_FRONT(decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, class) \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, class) \ ) // Precondition: decl = `struct ...`. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_KEY_STRUCT_(decl, traits) \ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_STRUCT_REMOVE_FRONT(decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, struct) \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, struct) \ ) #endif // #include guard diff --git a/include/boost/contract/ext_/preprocessor/traits/class/name.hpp b/include/boost/contract/ext_/preprocessor/traits/class/name.hpp index e5d635f..c9dc519 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class/name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class/name.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_NAME_HPP_ -#include -#include +#include +#include #include #include #include @@ -13,8 +13,8 @@ // Expand to `name`. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_NAME_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_NAME, traits) // Precondition: decl = `(name) ...`. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_NAME_PARSE(decl_traits) \ @@ -26,7 +26,7 @@ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_NAME_PARSE_ARGS_(decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(1) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_REM_CTOR(1, \ BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl)) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/class/specialization.hpp b/include/boost/contract/ext_/preprocessor/traits/class/specialization.hpp index b75aa24..4fad225 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class/specialization.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class/specialization.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_SPECIALIZATION_HPP_ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_SPECIALIZATION_HPP_ -#include -#include +#include +#include #include #include #include @@ -14,8 +14,8 @@ // Expand to `(,,,) | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_SPECIALIZATION(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_SPECIALIZATION_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_SPECIALIZATION, \ traits \ )() @@ -36,12 +36,12 @@ )(decl, traits) #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_SPECIALIZATION_NO_(decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_SPECIALIZATION_YES_(decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl) BOOST_PP_EMPTY) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/class/template.hpp b/include/boost/contract/ext_/preprocessor/traits/class/template.hpp index 32b5396..dd5d212 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class/template.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class/template.hpp @@ -3,10 +3,10 @@ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_TEMPLATE_HPP_ #include -#include +#include #include #include -#include +#include #include #include @@ -14,14 +14,14 @@ // Expand to `template | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_TEMPLATE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_TEMPLATE_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_TEMPLATE, traits)() // Expand to EMPTY() if no class template parameters, otherwise expand to // pp-seq of param. traits (each pp-seq elem. to be inspected via PARAM_TRAITS). #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_TEMPLATE_PARAMS(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_TEMPLATE_PARAMS_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_TEMPLATE_PARAMS, \ traits \ )() diff --git a/include/boost/contract/ext_/preprocessor/traits/class/verbatim.hpp b/include/boost/contract/ext_/preprocessor/traits/class/verbatim.hpp index a90e2be..c2bdde1 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class/verbatim.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class/verbatim.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_VERBATIM_HPP_ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_VERBATIM_HPP_ -#include +#include #include -#include +#include #include #include @@ -12,12 +12,12 @@ // Expand to `(,,,) | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_VERBATIM(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_VERBATIM_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_VERBATIM, traits)() // Implementation: Trailing EMPTY already put by KEYWORD_PAREN. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_VERBATIM_PARSE(decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD_PAREN_PARSE( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ BOOST_CONTRACT_EXT_PP_KEYWORD_IS_VERBATIM_FRONT, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/class/virt.hpp b/include/boost/contract/ext_/preprocessor/traits/class/virt.hpp index ae1a753..05daa78 100644 --- a/include/boost/contract/ext_/preprocessor/traits/class/virt.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/class/virt.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_VIRT_HPP_ #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_VIRT_HPP_ -#include +#include #include -#include +#include #include #include @@ -12,12 +12,12 @@ // Expand to `final | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_FINAL(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_FINAL_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_FINAL, traits)() // Implementation: Trailing EMPTY already put by KEYWORD1. #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_VIRT_PARSE(decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD1_PARSE( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ final, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func.hpp b/include/boost/contract/ext_/preprocessor/traits/func.hpp index f6f3ced..507280e 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func.hpp @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include /* PUBLIC */ @@ -41,33 +41,32 @@ BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_EXPORT_PARSE_( \ BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_VERBATIM_PARSE_( \ BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_ACCESS_PARSE_( \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ ))))))))))))))))) /* PRIVATE */ -// To debug or test the pp parsing code, you can #define this internal macro to -// stop parsing at a given trait index as #defined in func_index.hpp (this is -// what some of this library tests do). -// #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST ..._INDEX +// To debug or test the pp parsing code, #define this internal macro to stop +// parsing at a given trait index as #defined in aux_/index/func.hpp: +// #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST ... // NOTE: These macros #definitions read TRAITS_FUNC instead of FUNC_TRAITS to // avoid name clashes with macro #define in func/*. #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_MAX_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_MAX # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_DONE_(decl_traits) \ decl_traits #else # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_DONE_ \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE #endif #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_ACCESS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_ACCESS # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_ACCESS_PARSE_(decl_traits) \ decl_traits #else @@ -77,7 +76,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VERBATIM_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VERBATIM # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_VERBATIM_PARSE_(decl_traits) \ decl_traits #else @@ -87,7 +86,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXPORT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXPORT # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_EXPORT_PARSE_(decl_traits) \ decl_traits #else @@ -97,7 +96,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TEMPLATE_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TEMPLATE # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_TEMPLATE_PARSE_(d, decl_traits) \ decl_traits #else @@ -107,7 +106,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_CLASSIFIERS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_CLASSIFIERS # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_CLASSIFIERS_PARSE_( \ d, decl_traits) \ decl_traits @@ -118,7 +117,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_RETURN_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_RETURN # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_RETURN_PARSE_(d, decl_traits) \ decl_traits #else @@ -128,7 +127,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_NAME_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_NAME # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_NAME_PARSE_(d, decl_traits) \ decl_traits #else @@ -138,7 +137,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_PARAMS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_PARAMS # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_PARAMS_PARSE_(d, decl_traits) \ decl_traits #else @@ -148,7 +147,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_CV_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_CV # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_CV_PARSE_(decl_traits) \ decl_traits #else @@ -158,7 +157,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_REF_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_REF # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_REF_PARSE_(decl_traits) \ decl_traits #else @@ -168,7 +167,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXCEPT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXCEPT # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_EXCEPT_PARSE_(decl_traits) \ decl_traits #else @@ -178,7 +177,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TRAILING_RETURN_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TRAILING_RETURN # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_TRAILING_RETURN_PARSE_( \ d, decl_traits) \ decl_traits @@ -189,7 +188,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VIRT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VIRT # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_VIRT_PARSE_(decl_traits) \ decl_traits #else @@ -199,7 +198,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_PRECONDITIONS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_PRECONDITIONS # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_PRECONDITIONS_PARSE_( \ d, decl_traits) \ decl_traits @@ -210,7 +209,7 @@ #if defined(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST) && \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST < \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_POSTCONDITIONS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_POSTCONDITIONS # define BOOST_CONTRACT_EXT_PP_TRAITS_FUNC_POSTCONDITIONS_PARSE_( \ d, decl_traits) \ decl_traits diff --git a/include/boost/contract/ext_/preprocessor/traits/func/access.hpp b/include/boost/contract/ext_/preprocessor/traits/func/access.hpp index 08b9e27..0627d4a 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/access.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/access.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_ACCESS_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_ACCESS_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -14,12 +14,12 @@ // Expand to `public | protected | private | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_ACCESS(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_ACCESS_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_ACCESS, traits)() // Implementation: Trailing EMPTY already put by KEYWORD3. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_ACCESS_PARSE(decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD3_PARSE( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ public, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func/classifiers.hpp b/include/boost/contract/ext_/preprocessor/traits/func/classifiers.hpp index 6cdb721..cd26e3f 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/classifiers.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/classifiers.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CLASSIFIERS_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CLASSIFIERS_HPP_ -#include -#include +#include +#include #include #include #include @@ -25,39 +25,38 @@ // Expand to `inline | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_INLINE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INLINE_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_INLINE, traits)() // Expand to `static | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_STATIC(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_STATIC_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_STATIC, traits)() // Expand to `extern | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXTERN(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXTERN_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXTERN, traits)() // Expand to `explicit | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXPLICIT(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXPLICIT_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXPLICIT, traits)() // Expand to `virtual | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VIRTUAL(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VIRTUAL_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VIRTUAL, traits)() // Expand to `friend | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_FRIEND(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_FRIEND_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_FRIEND, traits)() // NOTE: In general, function classifiers `inline static extern explicit virtual // friend` can appear in most any order (so they are parsed all together here). #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CLASSIFIERS_PARSE_D(d, decl_traits) \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CLASSIFIERS_PRASE_ARGS_( \ - d, \ + BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CLASSIFIERS_PRASE_ARGS_(d, \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits) \ ) @@ -99,12 +98,12 @@ decl, traits, inline_, static_, extern_, explicit_, virtual_, friend_) \ ( \ decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_EXPR_IIF(inline_, inline) BOOST_PP_EMPTY), \ BOOST_PP_EXPR_IIF(static_, static) BOOST_PP_EMPTY), \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func/cv.hpp b/include/boost/contract/ext_/preprocessor/traits/func/cv.hpp index 42106ac..a38d1c2 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/cv.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/cv.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CV_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CV_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -15,13 +15,13 @@ // Expand to `const | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CONST(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_CONST_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_CONST, traits)() // Expand to `volatile | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VOLATILE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VOLATILE_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VOLATILE, traits)() #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CV_PARSE(decl_traits) \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CV_( \ @@ -41,8 +41,8 @@ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_CV_(decl_cv, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_cv), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_EXPR_IIF(BOOST_PP_TUPLE_ELEM(2, 0, \ BOOST_PP_TUPLE_ELEM(2, 1, decl_cv)), \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func/except.hpp b/include/boost/contract/ext_/preprocessor/traits/func/except.hpp index 9f0d09d..4003d11 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/except.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/except.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXCEPT_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXCEPT_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -15,8 +15,8 @@ // Expand to `noexcept | noexcept(,,,) | throw(,,,) | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXCEPT(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXCEPT_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXCEPT, traits)() #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXCEPT_PARSE(decl_traits) \ BOOST_PP_EXPAND(BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXCEPT_PARSE_ARGS_ \ @@ -57,14 +57,14 @@ ) #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXCEPT_NONE_(decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: except = `[(,,,)] EMPTY` (so trailing EMPTY already there). #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXCEPT_( \ decl_except, keyword, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_except), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ keyword BOOST_PP_TUPLE_ELEM(2, 1, decl_except)) \ ) diff --git a/include/boost/contract/ext_/preprocessor/traits/func/export.hpp b/include/boost/contract/ext_/preprocessor/traits/func/export.hpp index befc91b..914435a 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/export.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/export.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXPORT_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXPORT_HPP_ -#include +#include #include -#include +#include #include #include @@ -15,12 +15,12 @@ // Expand to `export | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXPORT(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXPORT_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXPORT, traits)() // Implementation: Trailing EMPTY already put by KEYWORD1. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_EXPORT_PARSE(decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD1_PARSE( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ export, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func/name.hpp b/include/boost/contract/ext_/preprocessor/traits/func/name.hpp index d774bb0..7834533 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/name.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_NAME_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -26,15 +26,15 @@ // Wrapped within parenthesis to handle comma operator `(,)`, conversion // operators for types with commas `(std::map)`, etc. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_OPERATOR_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_OPERATOR_NAME_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_OPERATOR_NAME, traits)() // Expand to `func_name`. // This is always an alphanumeric name (also for operators like `plus`, etc.), // but for destructors where name has the leading symbol `~`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_NAME_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_NAME, traits) #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_NAME_PARSE_D(d, decl_traits) \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_NAME_ARGS_(d, \ @@ -123,7 +123,7 @@ unused, decl, traits) \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_NAME_( \ BOOST_PP_TUPLE_EAT(0) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl) BOOST_PP_EMPTY) \ ) @@ -131,13 +131,13 @@ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_NAME_OPERATOR_NO_( \ unused, decl, traits) \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_NAME_(decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) // Precondition: decl = `(func_name) ...`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_NAME_(decl, traits) \ ( \ BOOST_PP_TUPLE_EAT(1) decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_TUPLE_REM_CTOR(1, \ BOOST_CONTRACT_EXT_PP_PAREN_FRONT(decl)) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func/params.hpp b/include/boost/contract/ext_/preprocessor/traits/func/params.hpp index 8e30cec..4aba020 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/params.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/params.hpp @@ -3,10 +3,10 @@ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_PARAMS_HPP_ #include -#include +#include #include #include -#include +#include #include #include @@ -15,8 +15,8 @@ // Expand to EMPTY() if no function formal parameters, otherwise expand to // pp-seq of param. traits (each pp-seq elem. to be inspected via PARAM_TRAITS). #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_PARAMS(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_PARAMS_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_PARAMS, traits)() #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_PARAMS_PARSE_D(d, decl_traits) \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD_LIST_PUSH_BACK_PARSE_D(d, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func/postconditions.hpp b/include/boost/contract/ext_/preprocessor/traits/func/postconditions.hpp index 833e38a..c116848 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/postconditions.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/postconditions.hpp @@ -3,10 +3,10 @@ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_POSTCONDITIONS_HPP_ #include -#include +#include #include #include -#include +#include #include #include @@ -15,8 +15,8 @@ // Expand to pp-seq of postcondition assertion traits to be inspected via // ASSERTION_TRAITS macro, or to EMPTY() if no postconditions. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_POSTCONDITIONS(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_POSTCONDITIONS_INDEX, traits \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_POSTCONDITIONS, traits \ )() #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_POSTCONDITIONS_PARSE_D( \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func/preconditions.hpp b/include/boost/contract/ext_/preprocessor/traits/func/preconditions.hpp index a3658d9..80413bb 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/preconditions.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/preconditions.hpp @@ -3,10 +3,10 @@ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_PRECONDITIONS_HPP_ #include -#include +#include #include #include -#include +#include #include #include @@ -15,8 +15,8 @@ // Expand to pp-seq of precondition assertion traits to be inspected via // ASSERTION_TRAITS macro, or to EMPTY() if no preconditions. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_PRECONDITIONS(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_PRECONDITIONS_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_PRECONDITIONS, traits)() #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_PRECONDITIONS_PARSE_D( \ d, decl_traits) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func/ref.hpp b/include/boost/contract/ext_/preprocessor/traits/func/ref.hpp index 28623c6..2c6ef74 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/ref.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/ref.hpp @@ -2,8 +2,8 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_REF_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_REF_HPP_ -#include -#include +#include +#include #include #include #include @@ -12,8 +12,8 @@ // Expand to `ref | ref ref | EMPTY()` (ref for lvalue&, ref ref for rvalue&&). #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_REF(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_REF_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_REF, traits)() // Implementation: EXPAND needed for proper expansion (on MSVC). #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_REF_PARSE(decl_traits) \ @@ -44,16 +44,18 @@ )(decl, traits) #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_REF_NO_(decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY)) #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_REF_REF_NO_(decl, traits) \ - (decl, BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, ref BOOST_PP_EMPTY)) + (decl, BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ + ref BOOST_PP_EMPTY)) // Precondition: decl = `ref ...`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_REF_REF_YES_(decl, traits) \ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_REF_REMOVE_FRONT(decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, ref ref BOOST_PP_EMPTY) \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, \ + ref ref BOOST_PP_EMPTY) \ ) #endif // #include guard diff --git a/include/boost/contract/ext_/preprocessor/traits/func/return.hpp b/include/boost/contract/ext_/preprocessor/traits/func/return.hpp index b94b046..1e9c375 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/return.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/return.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_RETURN_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_RETURN_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -17,14 +17,13 @@ // Expand to `result_type | void | auto | EMPTY()` (`auto` for alternative // function syntax, see also `..._TRAILING_RETURN`). #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_RETURN(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_RETURN_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_RETURN, traits)() // Expand to `result_type | void | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_TRAILING_RETURN(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TRAILING_RETURN_INDEX, \ - traits \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TRAILING_RETURN, traits \ )() #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_RETURN_PARSE_D(d, decl_traits) \ @@ -73,7 +72,7 @@ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_AUTO_TYPE_PARSE_D(d, decl), traits) #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_RETURN_(decl_return, traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_return), \ BOOST_PP_TUPLE_ELEM(2, 1, decl_return) BOOST_PP_EMPTY \ @@ -84,7 +83,7 @@ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_RETURN_NO_(d, decl, traits) \ ( \ decl, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, BOOST_PP_EMPTY) \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, BOOST_PP_EMPTY) \ ) // Constructors, destructors, type conversion operators, etc. do no have a diff --git a/include/boost/contract/ext_/preprocessor/traits/func/template.hpp b/include/boost/contract/ext_/preprocessor/traits/func/template.hpp index ae9854a..5f6b611 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/template.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/template.hpp @@ -3,10 +3,10 @@ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_TEMPLATE_HPP_ #include -#include +#include #include #include -#include +#include #include #include @@ -14,14 +14,14 @@ // Expand to `template | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_TEMPLATE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TEMPLATE_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TEMPLATE, traits)() // Expand to EMPTY() if no function template parameters, otherwise expand to // pp-seq of param. traits (each pp-seq elem. to be inspected via PARAM_TRAITS). #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_TEMPLATE_PARAMS(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TEMPLATE_PARAMS_INDEX, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TEMPLATE_PARAMS, \ traits \ )() diff --git a/include/boost/contract/ext_/preprocessor/traits/func/verbatim.hpp b/include/boost/contract/ext_/preprocessor/traits/func/verbatim.hpp index 0fa90a5..43fd247 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/verbatim.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/verbatim.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VERBATIM_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VERBATIM_HPP_ -#include +#include #include -#include +#include #include #include @@ -12,12 +12,12 @@ // Expand to `(,,,) | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VERBATIM(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VERBATIM_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VERBATIM, traits)() // Implementation: Trailing EMPTY already put by KEYWORD_PAREN. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VERBATIM_PARSE(decl_traits) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK( \ BOOST_CONTRACT_EXT_PP_TRAITS_AUX_KEYWORD_PAREN_PARSE( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ BOOST_CONTRACT_EXT_PP_KEYWORD_IS_VERBATIM_FRONT, \ diff --git a/include/boost/contract/ext_/preprocessor/traits/func/virt.hpp b/include/boost/contract/ext_/preprocessor/traits/func/virt.hpp index 5efc6b3..e9a973d 100644 --- a/include/boost/contract/ext_/preprocessor/traits/func/virt.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/func/virt.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VIRT_HPP_ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VIRT_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -15,13 +15,13 @@ // Expand to `final | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_FINAL(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_FINAL_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_FINAL, traits)() // Expand to `override | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_OVERRIDE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_OVERRIDE_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_OVERRIDE, traits)() #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VIRT_PARSE(decl_traits) \ BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VIRT_( \ @@ -41,8 +41,8 @@ #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_VIRT_(decl_virt, traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_virt), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_PP_EXPR_IIF(BOOST_PP_TUPLE_ELEM(2, 0, \ BOOST_PP_TUPLE_ELEM(2, 1, decl_virt)), \ diff --git a/include/boost/contract/ext_/preprocessor/traits/param.hpp b/include/boost/contract/ext_/preprocessor/traits/param.hpp index 7570c75..cb233fb 100644 --- a/include/boost/contract/ext_/preprocessor/traits/param.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/param.hpp @@ -5,25 +5,25 @@ #include #include #include -#include +#include /* PUBLIC */ #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_PARSE_D(d, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_EMPTY_DEFAULT_PARSE( \ BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_NAME_PARSE( \ BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_TYPE_PARSE_D(d, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ ))))) #define BOOST_CONTRACT_EXT_PP_TEMPLATE_PARAM_TRAITS_PARSE_D(d, decl) \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE( \ BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_EMPTY_DEFAULT_PARSE( \ BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_NAME_PARSE( \ BOOST_CONTRACT_EXT_PP_TEMPLATE_PARAM_TRAITS_TYPE_PARSE_D(d, \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_INIT( \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_INIT( \ decl BOOST_PP_NIL \ ))))) diff --git a/include/boost/contract/ext_/preprocessor/traits/param/default.hpp b/include/boost/contract/ext_/preprocessor/traits/param/default.hpp index 8dfc34a..87b3170 100644 --- a/include/boost/contract/ext_/preprocessor/traits/param/default.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/param/default.hpp @@ -2,24 +2,25 @@ #ifndef BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_DEFAULT_HPP_ #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_DEFAULT_HPP_ -#include -#include +#include +#include #include #include +#include #include /* PUBLIC */ // Expand to `(,,,) | EMPTY()`. #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_DEFAULT(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_AUX_DEFAULT_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_PARAM_DEFAULT, traits)() // Initialize default argument to EMPTY without altering decl. #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_EMPTY_DEFAULT_PARSE(decl_traits) \ ( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(BOOST_PP_TUPLE_ELEM(2, 1, \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(BOOST_PP_TUPLE_ELEM(2, 1, \ decl_traits), BOOST_PP_EMPTY) \ ) @@ -29,9 +30,9 @@ d, decl_traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ - BOOST_CONTRACT_EXT_PP_TRAITS_POP_BACK(BOOST_PP_TUPLE_ELEM(2, 1, \ - decl_traits)), \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_POP_BACK( \ + BOOST_PP_TUPLE_ELEM(2, 1, decl_traits)), \ BOOST_CONTRACT_EXT_PP_PARENTHESIZE( \ BOOST_CONTRACT_EXT_PP_KEYWORD_DEFAULT_REMOVE_FRONT( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/param/name.hpp b/include/boost/contract/ext_/preprocessor/traits/param/name.hpp index 925c7a4..c34f26b 100644 --- a/include/boost/contract/ext_/preprocessor/traits/param/name.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/param/name.hpp @@ -2,21 +2,22 @@ #ifndef BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_NAME_HPP_ #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_NAME_HPP_ -#include -#include +#include +#include +#include /* PUBLIC */ // Expand to `[...] name | EMPTY()` (ellipses `...` for variadic templates). #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_NAME(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_AUX_NAME_INDEX, traits)() + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_PARAM_NAME, traits)() // Precondition: name must always be the last remaining token in decl. #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_NAME_PARSE(decl_traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ BOOST_PP_TUPLE_ELEM(2, 1, decl_traits), \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_traits)) \ diff --git a/include/boost/contract/ext_/preprocessor/traits/param/type.hpp b/include/boost/contract/ext_/preprocessor/traits/param/type.hpp index dfe0b31..47e6e30 100644 --- a/include/boost/contract/ext_/preprocessor/traits/param/type.hpp +++ b/include/boost/contract/ext_/preprocessor/traits/param/type.hpp @@ -2,9 +2,9 @@ #ifndef BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_TYPE_HPP_ #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_TYPE_HPP_ -#include +#include #include -#include +#include #include #include #include @@ -21,8 +21,8 @@ // parameters, and template template parameters respectively). // See also TEMPLATE_PARAM macros below for template template parameters. #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_TYPE(traits) \ - BOOST_CONTRACT_EXT_PP_TRAITS_ELEM( \ - BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_AUX_TYPE_INDEX, traits) + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_ELEM( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_PARAM_TYPE, traits) // Expand `template( ,,, ) ...` to `( ,,, )` (this is useful to get the // pp-tuple with the template parameters of a template template parameter). @@ -80,7 +80,7 @@ BOOST_PP_TUPLE_ELEM(2, 1, decl_type)), \ BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_TYPE_NOT_PARSED_ \ , \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_PUSH_BACK \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_PUSH_BACK \ )(decl_type, traits) // Precondition: Unable to parse type so assume decl = `type NIL` (i.e., the @@ -90,7 +90,7 @@ #define BOOST_CONTRACT_EXT_PP_PARAM_TRAITS_TYPE_NOT_PARSED_(decl_type, traits) \ ( \ BOOST_PP_NIL, \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ BOOST_CONTRACT_EXT_PP_NIL_REMOVE_BACK( \ BOOST_PP_TUPLE_ELEM(2, 0, decl_type)) \ @@ -102,7 +102,7 @@ d, decl, traits) \ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_TYPENAME_REMOVE_FRONT(decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, typename) \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, typename) \ ) // Precondition: decl = `class ...`. @@ -110,7 +110,7 @@ d, decl, traits) \ ( \ BOOST_CONTRACT_EXT_PP_KEYWORD_CLASS_REMOVE_FRONT(decl), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK(traits, class) \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK(traits, class) \ ) // Precondition: decl = `template(,,,) ...`. @@ -135,7 +135,7 @@ , \ BOOST_PP_TUPLE_REM(1) \ )(template_template_key), \ - BOOST_CONTRACT_EXT_PP_TRAITS_PUSH_BACK( \ + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_PUSH_BACK( \ traits, \ template \ template_template_params \ diff --git a/test/aux_/pp_traits.hpp b/test/aux_/pp_traits.hpp index e8d150d..691c45d 100644 --- a/test/aux_/pp_traits.hpp +++ b/test/aux_/pp_traits.hpp @@ -2,7 +2,7 @@ #ifndef BOOST_CONTRACT_TEST_AUX_PP_TRAITS_HPP_ #define BOOST_CONTRACT_TEST_AUX_PP_TRAITS_HPP_ -#include +#include #include #include #include @@ -25,7 +25,7 @@ parsed_trait \ ) \ BOOST_CONTRACT_TEST_AUX_PP_TRAITS_( \ - BOOST_CONTRACT_EXT_PP_DECL_TRAITS_DONE(traits_parse_macro(1, \ + BOOST_CONTRACT_EXT_PP_DECL_TRAITS_AUX_DONE(traits_parse_macro(1, \ decl_before_trait decl_at_trait decl_after_trait)), \ traits_elem_macro, \ parsed_trait, \ diff --git a/test/pp_class_traits/bases.cpp b/test/pp_class_traits/bases.cpp index ade159c..4eefe14 100644 --- a/test/pp_class_traits/bases.cpp +++ b/test/pp_class_traits/bases.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_BASES_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_BASES + #include "../aux_/pp_traits.hpp" #include "../aux_/pp_1tuple_rem.hpp" #include diff --git a/test/pp_class_traits/export.cpp b/test/pp_class_traits/export.cpp index 1424c65..31f526b 100644 --- a/test/pp_class_traits/export.cpp +++ b/test/pp_class_traits/export.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_EXPORT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_EXPORT + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_class_traits/friend.cpp b/test/pp_class_traits/friend.cpp index 80e8c74..b2c4730 100644 --- a/test/pp_class_traits/friend.cpp +++ b/test/pp_class_traits/friend.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_FRIEND_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_FRIEND + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_class_traits/key.cpp b/test/pp_class_traits/key.cpp index a137903..a753557 100644 --- a/test/pp_class_traits/key.cpp +++ b/test/pp_class_traits/key.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_KEY_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_KEY + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_class_traits/name.cpp b/test/pp_class_traits/name.cpp index 8f3f814..3042193 100644 --- a/test/pp_class_traits/name.cpp +++ b/test/pp_class_traits/name.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_NAME_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_NAME + #include "../aux_/pp_traits.hpp" #include diff --git a/test/pp_class_traits/specialization.cpp b/test/pp_class_traits/specialization.cpp index 5faa568..b368082 100644 --- a/test/pp_class_traits/specialization.cpp +++ b/test/pp_class_traits/specialization.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_SPECIALIZATION_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_SPECIALIZATION + #include "../aux_/pp_traits.hpp" #include diff --git a/test/pp_class_traits/template.cpp b/test/pp_class_traits/template.cpp index d10c7e3..d540773 100644 --- a/test/pp_class_traits/template.cpp +++ b/test/pp_class_traits/template.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_TEMPLATE_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_TEMPLATE + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_class_traits/verbatim.cpp b/test/pp_class_traits/verbatim.cpp index 8d6bd69..8f06a5f 100644 --- a/test/pp_class_traits/verbatim.cpp +++ b/test/pp_class_traits/verbatim.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_VERBATIM_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_VERBATIM + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_class_traits/virt.cpp b/test/pp_class_traits/virt.cpp index 29d946b..bb43595 100644 --- a/test/pp_class_traits/virt.cpp +++ b/test/pp_class_traits/virt.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_CLASS_TRAITS_AUX_VIRT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_CLASS_VIRT + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/access.cpp b/test/pp_func_traits/access.cpp index a4da061..a1cf04f 100644 --- a/test/pp_func_traits/access.cpp +++ b/test/pp_func_traits/access.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_ACCESS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_ACCESS + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/classifiers.cpp b/test/pp_func_traits/classifiers.cpp index 5ab655c..7c56cbf 100644 --- a/test/pp_func_traits/classifiers.cpp +++ b/test/pp_func_traits/classifiers.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_CLASSIFIERS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_CLASSIFIERS + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/cv.cpp b/test/pp_func_traits/cv.cpp index d4e9cde..d0da0a2 100644 --- a/test/pp_func_traits/cv.cpp +++ b/test/pp_func_traits/cv.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_CV_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_CV + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/except.cpp b/test/pp_func_traits/except.cpp index 3e599a4..cb6df50 100644 --- a/test/pp_func_traits/except.cpp +++ b/test/pp_func_traits/except.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXCEPT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXCEPT + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/export.cpp b/test/pp_func_traits/export.cpp index d440ad9..03da0af 100644 --- a/test/pp_func_traits/export.cpp +++ b/test/pp_func_traits/export.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_EXPORT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_EXPORT + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/name.cpp b/test/pp_func_traits/name.cpp index b5cb01e..a4dcd93 100644 --- a/test/pp_func_traits/name.cpp +++ b/test/pp_func_traits/name.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_NAME_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_NAME + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/params.cpp b/test/pp_func_traits/params.cpp index 73fdfe6..6dab193 100644 --- a/test/pp_func_traits/params.cpp +++ b/test/pp_func_traits/params.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_PARAMS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_PARAMS + #include "../aux_/pp_traits.hpp" #include "../aux_/pp_1tuple_rem.hpp" #include diff --git a/test/pp_func_traits/postconditions.cpp b/test/pp_func_traits/postconditions.cpp index b81924a..61030cb 100644 --- a/test/pp_func_traits/postconditions.cpp +++ b/test/pp_func_traits/postconditions.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_POSTCONDITIONS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_POSTCONDITIONS + #include "../aux_/pp_traits.hpp" #include "../aux_/pp_assertions.hpp" #include diff --git a/test/pp_func_traits/preconditions.cpp b/test/pp_func_traits/preconditions.cpp index bc08832..762b39b 100644 --- a/test/pp_func_traits/preconditions.cpp +++ b/test/pp_func_traits/preconditions.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_PRECONDITIONS_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_PRECONDITIONS + #include "../aux_/pp_traits.hpp" #include "../aux_/pp_assertions.hpp" #include diff --git a/test/pp_func_traits/ref.cpp b/test/pp_func_traits/ref.cpp index ff2f629..ab8f9ab 100644 --- a/test/pp_func_traits/ref.cpp +++ b/test/pp_func_traits/ref.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_REF_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_REF + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/return_.cpp b/test/pp_func_traits/return_.cpp index 48325a0..cab774d 100644 --- a/test/pp_func_traits/return_.cpp +++ b/test/pp_func_traits/return_.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_RETURN_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_RETURN + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/template.cpp b/test/pp_func_traits/template.cpp index 607b5e0..566d37d 100644 --- a/test/pp_func_traits/template.cpp +++ b/test/pp_func_traits/template.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TEMPLATE_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TEMPLATE + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/trailing_return.cpp b/test/pp_func_traits/trailing_return.cpp index 1bffab0..b9582dd 100644 --- a/test/pp_func_traits/trailing_return.cpp +++ b/test/pp_func_traits/trailing_return.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_TRAILING_RETURN_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_TRAILING_RETURN + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/verbatim.cpp b/test/pp_func_traits/verbatim.cpp index c01fa80..7982cda 100644 --- a/test/pp_func_traits/verbatim.cpp +++ b/test/pp_func_traits/verbatim.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VERBATIM_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VERBATIM + #include "../aux_/pp_traits.hpp" #include #include diff --git a/test/pp_func_traits/virt.cpp b/test/pp_func_traits/virt.cpp index 60b2698..138c9f3 100644 --- a/test/pp_func_traits/virt.cpp +++ b/test/pp_func_traits/virt.cpp @@ -4,8 +4,10 @@ # error "this compiler does not support variadic macros" #else +#include #define BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_INDEX_TEST \ - BOOST_CONTRACT_EXT_PP_FUNC_TRAITS_AUX_VIRT_INDEX + BOOST_CONTRACT_EXT_PP_TRAITS_AUX_INDEX_FUNC_VIRT + #include "../aux_/pp_traits.hpp" #include #include