From eaa5c714c868d666d3f849f726f6f85612514a50 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 13 Oct 2014 13:12:59 +0100 Subject: [PATCH] Change generate.cpp to alphabetize it's results to reduce churn in the results. Regenerate the generated files. --- checks/Jamfile.v2 | 68 +++++++------- checks/test_case.cpp | 88 +++++++++--------- test/all/Jamfile.v2 | 68 +++++++------- test/config_info.cpp | 1 + test/config_test.cpp | 212 +++++++++++++++++++++---------------------- tools/generate.cpp | 12 ++- 6 files changed, 229 insertions(+), 220 deletions(-) diff --git a/checks/Jamfile.v2 b/checks/Jamfile.v2 index a55b7ab1..4d2f4373 100644 --- a/checks/Jamfile.v2 +++ b/checks/Jamfile.v2 @@ -1,6 +1,6 @@ # # *** DO NOT EDIT THIS FILE BY HAND *** -# This file was automatically generated on Sat Oct 11 19:26:21 2014 +# This file was automatically generated on Mon Oct 13 13:09:13 2014 # by libs/config/tools/generate.cpp # Copyright John Maddock. # Use, modification and distribution are subject to the @@ -80,9 +80,6 @@ explicit nrvo ; run-simple test_case.cpp : : : TEST_BOOST_HAS_PARTIAL_STD_ALLOCATOR : partial_std_allocator ; alias partial_std_allocator : partial_std_allocator.output ; explicit partial_std_allocator ; -run-simple test_case.cpp : : : TEST_BOOST_HAS_PTHREADS : pthreads ; -alias pthreads : pthreads.output ; -explicit pthreads ; run-simple test_case.cpp : : : TEST_BOOST_HAS_PTHREAD_DELAY_NP : pthread_delay_np ; alias pthread_delay_np : pthread_delay_np.output ; explicit pthread_delay_np ; @@ -92,6 +89,9 @@ explicit pthread_mutexattr_settype ; run-simple test_case.cpp : : : TEST_BOOST_HAS_PTHREAD_YIELD : pthread_yield ; alias pthread_yield : pthread_yield.output ; explicit pthread_yield ; +run-simple test_case.cpp : : : TEST_BOOST_HAS_PTHREADS : pthreads ; +alias pthreads : pthreads.output ; +explicit pthreads ; run-simple test_case.cpp : : : TEST_BOOST_HAS_RVALUE_REFS : rvalue_refs ; alias rvalue_refs : rvalue_refs.output ; explicit rvalue_refs ; @@ -290,12 +290,12 @@ explicit cxx11_hdr_thread ; run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_HDR_TUPLE : cxx11_hdr_tuple ; alias cxx11_hdr_tuple : cxx11_hdr_tuple.output ; explicit cxx11_hdr_tuple ; -run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_HDR_TYPEINDEX : cxx11_hdr_typeindex ; -alias cxx11_hdr_typeindex : cxx11_hdr_typeindex.output ; -explicit cxx11_hdr_typeindex ; run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_HDR_TYPE_TRAITS : cxx11_hdr_type_traits ; alias cxx11_hdr_type_traits : cxx11_hdr_type_traits.output ; explicit cxx11_hdr_type_traits ; +run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_HDR_TYPEINDEX : cxx11_hdr_typeindex ; +alias cxx11_hdr_typeindex : cxx11_hdr_typeindex.output ; +explicit cxx11_hdr_typeindex ; run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_HDR_UNORDERED_MAP : cxx11_hdr_unordered_map ; alias cxx11_hdr_unordered_map : cxx11_hdr_unordered_map.output ; explicit cxx11_hdr_unordered_map ; @@ -377,18 +377,18 @@ explicit dependent_nested_derivations ; run-simple test_case.cpp : : : TEST_BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS : dependent_types_in_template_value_parameters ; alias dependent_types_in_template_value_parameters : dependent_types_in_template_value_parameters.output ; explicit dependent_types_in_template_value_parameters ; -run-simple test_case.cpp : : : TEST_BOOST_NO_EXCEPTIONS : exceptions ; -alias exceptions : exceptions.output ; -explicit exceptions ; run-simple test_case.cpp : : : TEST_BOOST_NO_EXCEPTION_STD_NAMESPACE : exception_std_namespace ; alias exception_std_namespace : exception_std_namespace.output ; explicit exception_std_namespace ; -run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS : cxx11_explicit_conversion_operators ; -alias cxx11_explicit_conversion_operators : cxx11_explicit_conversion_operators.output ; -explicit cxx11_explicit_conversion_operators ; +run-simple test_case.cpp : : : TEST_BOOST_NO_EXCEPTIONS : exceptions ; +alias exceptions : exceptions.output ; +explicit exceptions ; run-simple test_case.cpp : : : TEST_BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS : explicit_function_template_arguments ; alias explicit_function_template_arguments : explicit_function_template_arguments.output ; explicit explicit_function_template_arguments ; +run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS : cxx11_explicit_conversion_operators ; +alias cxx11_explicit_conversion_operators : cxx11_explicit_conversion_operators.output ; +explicit cxx11_explicit_conversion_operators ; run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_EXTERN_TEMPLATE : cxx11_extern_template ; alias cxx11_extern_template : cxx11_extern_template.output ; explicit cxx11_extern_template ; @@ -398,15 +398,15 @@ explicit fenv_h ; run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_FIXED_LENGTH_VARIADIC_TEMPLATE_EXPANSION_PACKS : cxx11_fixed_length_variadic_template_expansion_packs ; alias cxx11_fixed_length_variadic_template_expansion_packs : cxx11_fixed_length_variadic_template_expansion_packs.output ; explicit cxx11_fixed_length_variadic_template_expansion_packs ; +run-simple test_case.cpp : : : TEST_BOOST_NO_FUNCTION_TEMPLATE_ORDERING : function_template_ordering ; +alias function_template_ordering : function_template_ordering.output ; +explicit function_template_ordering ; run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS : cxx11_function_template_default_args ; alias cxx11_function_template_default_args : cxx11_function_template_default_args.output ; explicit cxx11_function_template_default_args ; run-simple test_case.cpp : : : TEST_BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS : function_type_specializations ; alias function_type_specializations : function_type_specializations.output ; explicit function_type_specializations ; -run-simple test_case.cpp : : : TEST_BOOST_NO_FUNCTION_TEMPLATE_ORDERING : function_template_ordering ; -alias function_template_ordering : function_template_ordering.output ; -explicit function_template_ordering ; run-simple test_case.cpp : : : TEST_BOOST_NO_MS_INT64_NUMERIC_LIMITS : ms_int64_numeric_limits ; alias ms_int64_numeric_limits : ms_int64_numeric_limits.output ; explicit ms_int64_numeric_limits ; @@ -446,18 +446,18 @@ explicit long_long ; run-simple test_case.cpp : : : TEST_BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS : member_function_specializations ; alias member_function_specializations : member_function_specializations.output ; explicit member_function_specializations ; -run-simple test_case.cpp : : : TEST_BOOST_NO_MEMBER_TEMPLATES : member_templates ; -alias member_templates : member_templates.output ; -explicit member_templates ; -run-simple test_case.cpp : : : TEST_BOOST_NO_MEMBER_TEMPLATE_FRIENDS : member_template_friends ; -alias member_template_friends : member_template_friends.output ; -explicit member_template_friends ; run-simple test_case.cpp : : : TEST_BOOST_NO_MEMBER_TEMPLATE_KEYWORD : member_template_keyword ; alias member_template_keyword : member_template_keyword.output ; explicit member_template_keyword ; run-simple test_case.cpp : : : TEST_BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS : pointer_to_member_template_parameters ; alias pointer_to_member_template_parameters : pointer_to_member_template_parameters.output ; explicit pointer_to_member_template_parameters ; +run-simple test_case.cpp : : : TEST_BOOST_NO_MEMBER_TEMPLATE_FRIENDS : member_template_friends ; +alias member_template_friends : member_template_friends.output ; +explicit member_template_friends ; +run-simple test_case.cpp : : : TEST_BOOST_NO_MEMBER_TEMPLATES : member_templates ; +alias member_templates : member_templates.output ; +explicit member_templates ; run-simple test_case.cpp : : : TEST_BOOST_NO_NESTED_FRIENDSHIP : nested_friendship ; alias nested_friendship : nested_friendship.output ; explicit nested_friendship ; @@ -470,12 +470,12 @@ explicit cxx11_nullptr ; run-simple test_case.cpp : : : TEST_BOOST_NO_OPERATORS_IN_NAMESPACE : operators_in_namespace ; alias operators_in_namespace : operators_in_namespace.output ; explicit operators_in_namespace ; -run-simple test_case.cpp : : : TEST_BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION : template_partial_specialization ; -alias template_partial_specialization : template_partial_specialization.output ; -explicit template_partial_specialization ; run-simple test_case.cpp : : : TEST_BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS : partial_specialization_implicit_default_args ; alias partial_specialization_implicit_default_args : partial_specialization_implicit_default_args.output ; explicit partial_specialization_implicit_default_args ; +run-simple test_case.cpp : : : TEST_BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION : template_partial_specialization ; +alias template_partial_specialization : template_partial_specialization.output ; +explicit template_partial_specialization ; run-simple test_case.cpp : : : TEST_BOOST_NO_PRIVATE_IN_AGGREGATE : private_in_aggregate ; alias private_in_aggregate : private_in_aggregate.output ; explicit private_in_aggregate ; @@ -512,21 +512,18 @@ explicit stringstream ; run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_STATIC_ASSERT : cxx11_static_assert ; alias cxx11_static_assert : cxx11_static_assert.output ; explicit cxx11_static_assert ; -run-simple test_case.cpp : : : TEST_BOOST_NO_STDC_NAMESPACE : stdc_namespace ; -alias stdc_namespace : stdc_namespace.output ; -explicit stdc_namespace ; run-simple test_case.cpp : : : TEST_BOOST_NO_STD_ALLOCATOR : std_allocator ; alias std_allocator : std_allocator.output ; explicit std_allocator ; run-simple test_case.cpp : : : TEST_BOOST_NO_STD_DISTANCE : std_distance ; alias std_distance : std_distance.output ; explicit std_distance ; -run-simple test_case.cpp : : : TEST_BOOST_NO_STD_ITERATOR : std_iterator ; -alias std_iterator : std_iterator.output ; -explicit std_iterator ; run-simple test_case.cpp : : : TEST_BOOST_NO_STD_ITERATOR_TRAITS : std_iterator_traits ; alias std_iterator_traits : std_iterator_traits.output ; explicit std_iterator_traits ; +run-simple test_case.cpp : : : TEST_BOOST_NO_STD_ITERATOR : std_iterator ; +alias std_iterator : std_iterator.output ; +explicit std_iterator ; run-simple test_case.cpp : : : TEST_BOOST_NO_STD_LOCALE : std_locale ; alias std_locale : std_locale.output ; explicit std_locale ; @@ -551,9 +548,15 @@ explicit std_wstreambuf ; run-simple test_case.cpp : : : TEST_BOOST_NO_STD_WSTRING : std_wstring ; alias std_wstring : std_wstring.output ; explicit std_wstring ; +run-simple test_case.cpp : : : TEST_BOOST_NO_STDC_NAMESPACE : stdc_namespace ; +alias stdc_namespace : stdc_namespace.output ; +explicit stdc_namespace ; run-simple test_case.cpp : : : TEST_BOOST_NO_SWPRINTF : swprintf ; alias swprintf : swprintf.output ; explicit swprintf ; +run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS : cxx11_local_class_template_parameters ; +alias cxx11_local_class_template_parameters : cxx11_local_class_template_parameters.output ; +explicit cxx11_local_class_template_parameters ; run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_TEMPLATE_ALIASES : cxx11_template_aliases ; alias cxx11_template_aliases : cxx11_template_aliases.output ; explicit cxx11_template_aliases ; @@ -563,9 +566,6 @@ explicit templated_iostreams ; run-simple test_case.cpp : : : TEST_BOOST_NO_TEMPLATE_TEMPLATES : template_templates ; alias template_templates : template_templates.output ; explicit template_templates ; -run-simple test_case.cpp : : : TEST_BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS : cxx11_local_class_template_parameters ; -alias cxx11_local_class_template_parameters : cxx11_local_class_template_parameters.output ; -explicit cxx11_local_class_template_parameters ; run-simple test_case.cpp : : : TEST_BOOST_NO_TWO_PHASE_NAME_LOOKUP : two_phase_name_lookup ; alias two_phase_name_lookup : two_phase_name_lookup.output ; explicit two_phase_name_lookup ; diff --git a/checks/test_case.cpp b/checks/test_case.cpp index a7a624ad..708160e1 100644 --- a/checks/test_case.cpp +++ b/checks/test_case.cpp @@ -1,4 +1,4 @@ -// This file was automatically generated on Sat Oct 11 19:26:21 2014 +// This file was automatically generated on Mon Oct 13 13:09:13 2014 // by libs/config/tools/generate.cpp // Copyright John Maddock 2002-4. // Use, modification and distribution are subject to the @@ -81,10 +81,6 @@ namespace test = boost_has_nrvo; # include "../test/boost_has_part_alloc.ipp" namespace test = boost_has_partial_std_allocator; #endif -#ifdef TEST_BOOST_HAS_PTHREADS -# include "../test/boost_has_pthreads.ipp" -namespace test = boost_has_pthreads; -#endif #ifdef TEST_BOOST_HAS_PTHREAD_DELAY_NP # include "../test/boost_has_pthread_delay_np.ipp" namespace test = boost_has_pthread_delay_np; @@ -97,6 +93,10 @@ namespace test = boost_has_pthread_mutexattr_settype; # include "../test/boost_has_pthread_yield.ipp" namespace test = boost_has_pthread_yield; #endif +#ifdef TEST_BOOST_HAS_PTHREADS +# include "../test/boost_has_pthreads.ipp" +namespace test = boost_has_pthreads; +#endif #ifdef TEST_BOOST_HAS_RVALUE_REFS # include "../test/boost_has_rvalue_refs.ipp" namespace test = boost_has_rvalue_refs; @@ -361,14 +361,14 @@ namespace test = boost_no_cxx11_hdr_thread; # include "../test/boost_no_cxx11_hdr_tuple.ipp" namespace test = boost_no_cxx11_hdr_tuple; #endif -#ifdef TEST_BOOST_NO_CXX11_HDR_TYPEINDEX -# include "../test/boost_no_cxx11_hdr_typeindex.ipp" -namespace test = boost_no_cxx11_hdr_typeindex; -#endif #ifdef TEST_BOOST_NO_CXX11_HDR_TYPE_TRAITS # include "../test/boost_no_cxx11_hdr_type_traits.ipp" namespace test = boost_no_cxx11_hdr_type_traits; #endif +#ifdef TEST_BOOST_NO_CXX11_HDR_TYPEINDEX +# include "../test/boost_no_cxx11_hdr_typeindex.ipp" +namespace test = boost_no_cxx11_hdr_typeindex; +#endif #ifdef TEST_BOOST_NO_CXX11_HDR_UNORDERED_MAP # include "../test/boost_no_cxx11_hdr_unordered_map.ipp" namespace test = boost_no_cxx11_hdr_unordered_map; @@ -477,22 +477,22 @@ namespace test = boost_no_dependent_nested_derivations; # include "../test/boost_no_dep_val_param.ipp" namespace test = boost_no_dependent_types_in_template_value_parameters; #endif -#ifdef TEST_BOOST_NO_EXCEPTIONS -# include "../test/boost_no_exceptions.ipp" -namespace test = boost_no_exceptions; -#endif #ifdef TEST_BOOST_NO_EXCEPTION_STD_NAMESPACE # include "../test/boost_no_excep_std.ipp" namespace test = boost_no_exception_std_namespace; #endif -#ifdef TEST_BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS -# include "../test/boost_no_explicit_cvt_ops.ipp" -namespace test = boost_no_cxx11_explicit_conversion_operators; +#ifdef TEST_BOOST_NO_EXCEPTIONS +# include "../test/boost_no_exceptions.ipp" +namespace test = boost_no_exceptions; #endif #ifdef TEST_BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS # include "../test/boost_no_exp_func_tem_arg.ipp" namespace test = boost_no_explicit_function_template_arguments; #endif +#ifdef TEST_BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS +# include "../test/boost_no_explicit_cvt_ops.ipp" +namespace test = boost_no_cxx11_explicit_conversion_operators; +#endif #ifdef TEST_BOOST_NO_CXX11_EXTERN_TEMPLATE # include "../test/boost_no_extern_template.ipp" namespace test = boost_no_cxx11_extern_template; @@ -505,6 +505,10 @@ namespace test = boost_no_fenv_h; # include "../test/boost_no_fixed_len_variadic_templates.ipp" namespace test = boost_no_cxx11_fixed_length_variadic_template_expansion_packs; #endif +#ifdef TEST_BOOST_NO_FUNCTION_TEMPLATE_ORDERING +# include "../test/boost_no_func_tmp_order.ipp" +namespace test = boost_no_function_template_ordering; +#endif #ifdef TEST_BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS # include "../test/boost_no_function_template_default_args.ipp" namespace test = boost_no_cxx11_function_template_default_args; @@ -513,10 +517,6 @@ namespace test = boost_no_cxx11_function_template_default_args; # include "../test/boost_no_function_type_spec.ipp" namespace test = boost_no_function_type_specializations; #endif -#ifdef TEST_BOOST_NO_FUNCTION_TEMPLATE_ORDERING -# include "../test/boost_no_func_tmp_order.ipp" -namespace test = boost_no_function_template_ordering; -#endif #ifdef TEST_BOOST_NO_MS_INT64_NUMERIC_LIMITS # include "../test/boost_no_i64_limits.ipp" namespace test = boost_no_ms_int64_numeric_limits; @@ -569,14 +569,6 @@ namespace test = boost_no_long_long; # include "../test/boost_no_mem_func_spec.ipp" namespace test = boost_no_member_function_specializations; #endif -#ifdef TEST_BOOST_NO_MEMBER_TEMPLATES -# include "../test/boost_no_mem_templates.ipp" -namespace test = boost_no_member_templates; -#endif -#ifdef TEST_BOOST_NO_MEMBER_TEMPLATE_FRIENDS -# include "../test/boost_no_mem_templ_frnds.ipp" -namespace test = boost_no_member_template_friends; -#endif #ifdef TEST_BOOST_NO_MEMBER_TEMPLATE_KEYWORD # include "../test/boost_no_mem_tem_keyword.ipp" namespace test = boost_no_member_template_keyword; @@ -585,6 +577,14 @@ namespace test = boost_no_member_template_keyword; # include "../test/boost_no_mem_tem_pnts.ipp" namespace test = boost_no_pointer_to_member_template_parameters; #endif +#ifdef TEST_BOOST_NO_MEMBER_TEMPLATE_FRIENDS +# include "../test/boost_no_mem_templ_frnds.ipp" +namespace test = boost_no_member_template_friends; +#endif +#ifdef TEST_BOOST_NO_MEMBER_TEMPLATES +# include "../test/boost_no_mem_templates.ipp" +namespace test = boost_no_member_templates; +#endif #ifdef TEST_BOOST_NO_NESTED_FRIENDSHIP # include "../test/boost_no_nested_friendship.ipp" namespace test = boost_no_nested_friendship; @@ -601,14 +601,14 @@ namespace test = boost_no_cxx11_nullptr; # include "../test/boost_no_ops_in_namespace.ipp" namespace test = boost_no_operators_in_namespace; #endif -#ifdef TEST_BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -# include "../test/boost_no_partial_spec.ipp" -namespace test = boost_no_template_partial_specialization; -#endif #ifdef TEST_BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS # include "../test/boost_no_part_spec_def_args.ipp" namespace test = boost_no_partial_specialization_implicit_default_args; #endif +#ifdef TEST_BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +# include "../test/boost_no_partial_spec.ipp" +namespace test = boost_no_template_partial_specialization; +#endif #ifdef TEST_BOOST_NO_PRIVATE_IN_AGGREGATE # include "../test/boost_no_priv_aggregate.ipp" namespace test = boost_no_private_in_aggregate; @@ -657,10 +657,6 @@ namespace test = boost_no_stringstream; # include "../test/boost_no_static_assert.ipp" namespace test = boost_no_cxx11_static_assert; #endif -#ifdef TEST_BOOST_NO_STDC_NAMESPACE -# include "../test/boost_no_stdc_namespace.ipp" -namespace test = boost_no_stdc_namespace; -#endif #ifdef TEST_BOOST_NO_STD_ALLOCATOR # include "../test/boost_no_std_allocator.ipp" namespace test = boost_no_std_allocator; @@ -669,14 +665,14 @@ namespace test = boost_no_std_allocator; # include "../test/boost_no_std_distance.ipp" namespace test = boost_no_std_distance; #endif -#ifdef TEST_BOOST_NO_STD_ITERATOR -# include "../test/boost_no_std_iterator.ipp" -namespace test = boost_no_std_iterator; -#endif #ifdef TEST_BOOST_NO_STD_ITERATOR_TRAITS # include "../test/boost_no_std_iter_traits.ipp" namespace test = boost_no_std_iterator_traits; #endif +#ifdef TEST_BOOST_NO_STD_ITERATOR +# include "../test/boost_no_std_iterator.ipp" +namespace test = boost_no_std_iterator; +#endif #ifdef TEST_BOOST_NO_STD_LOCALE # include "../test/boost_no_std_locale.ipp" namespace test = boost_no_std_locale; @@ -709,10 +705,18 @@ namespace test = boost_no_std_wstreambuf; # include "../test/boost_no_std_wstring.ipp" namespace test = boost_no_std_wstring; #endif +#ifdef TEST_BOOST_NO_STDC_NAMESPACE +# include "../test/boost_no_stdc_namespace.ipp" +namespace test = boost_no_stdc_namespace; +#endif #ifdef TEST_BOOST_NO_SWPRINTF # include "../test/boost_no_swprintf.ipp" namespace test = boost_no_swprintf; #endif +#ifdef TEST_BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS +# include "../test/boost_no_tem_local_classes.ipp" +namespace test = boost_no_cxx11_local_class_template_parameters; +#endif #ifdef TEST_BOOST_NO_CXX11_TEMPLATE_ALIASES # include "../test/boost_no_template_aliases.ipp" namespace test = boost_no_cxx11_template_aliases; @@ -725,10 +729,6 @@ namespace test = boost_no_templated_iostreams; # include "../test/boost_no_template_template.ipp" namespace test = boost_no_template_templates; #endif -#ifdef TEST_BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS -# include "../test/boost_no_tem_local_classes.ipp" -namespace test = boost_no_cxx11_local_class_template_parameters; -#endif #ifdef TEST_BOOST_NO_TWO_PHASE_NAME_LOOKUP # include "../test/boost_no_two_phase_lookup.ipp" namespace test = boost_no_two_phase_name_lookup; diff --git a/test/all/Jamfile.v2 b/test/all/Jamfile.v2 index 9be35d97..fe833397 100644 --- a/test/all/Jamfile.v2 +++ b/test/all/Jamfile.v2 @@ -1,7 +1,7 @@ # # Regression test Jamfile for boost configuration setup. # *** DO NOT EDIT THIS FILE BY HAND *** -# This file was automatically generated on Sat Oct 11 19:26:21 2014 +# This file was automatically generated on Mon Oct 13 13:09:12 2014 # by libs/config/tools/generate.cpp # Copyright John Maddock. # Use, modification and distribution are subject to the @@ -76,9 +76,6 @@ test-suite "BOOST_HAS_NRVO" : test-suite "BOOST_HAS_PARTIAL_STD_ALLOCATOR" : [ run ../has_part_alloc_pass.cpp ] [ compile-fail ../has_part_alloc_fail.cpp ] ; -test-suite "BOOST_HAS_PTHREADS" : -[ run ../has_pthreads_pass.cpp ] -[ compile-fail ../has_pthreads_fail.cpp ] ; test-suite "BOOST_HAS_PTHREAD_DELAY_NP" : [ run ../has_pthread_delay_np_pass.cpp ] [ compile-fail ../has_pthread_delay_np_fail.cpp ] ; @@ -88,6 +85,9 @@ test-suite "BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE" : test-suite "BOOST_HAS_PTHREAD_YIELD" : [ run ../has_pthread_yield_pass.cpp ] [ compile-fail ../has_pthread_yield_fail.cpp ] ; +test-suite "BOOST_HAS_PTHREADS" : +[ run ../has_pthreads_pass.cpp ] +[ compile-fail ../has_pthreads_fail.cpp ] ; test-suite "BOOST_HAS_RVALUE_REFS" : [ run ../has_rvalue_refs_pass.cpp ] [ compile-fail ../has_rvalue_refs_fail.cpp ] ; @@ -286,12 +286,12 @@ test-suite "BOOST_NO_CXX11_HDR_THREAD" : test-suite "BOOST_NO_CXX11_HDR_TUPLE" : [ run ../no_cxx11_hdr_tuple_pass.cpp ] [ compile-fail ../no_cxx11_hdr_tuple_fail.cpp ] ; -test-suite "BOOST_NO_CXX11_HDR_TYPEINDEX" : -[ run ../no_cxx11_hdr_typeindex_pass.cpp ] -[ compile-fail ../no_cxx11_hdr_typeindex_fail.cpp ] ; test-suite "BOOST_NO_CXX11_HDR_TYPE_TRAITS" : [ run ../no_cxx11_hdr_type_traits_pass.cpp ] [ compile-fail ../no_cxx11_hdr_type_traits_fail.cpp ] ; +test-suite "BOOST_NO_CXX11_HDR_TYPEINDEX" : +[ run ../no_cxx11_hdr_typeindex_pass.cpp ] +[ compile-fail ../no_cxx11_hdr_typeindex_fail.cpp ] ; test-suite "BOOST_NO_CXX11_HDR_UNORDERED_MAP" : [ run ../no_cxx11_hdr_unordered_map_pass.cpp ] [ compile-fail ../no_cxx11_hdr_unordered_map_fail.cpp ] ; @@ -373,18 +373,18 @@ test-suite "BOOST_NO_DEPENDENT_NESTED_DERIVATIONS" : test-suite "BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS" : [ run ../no_dep_val_param_pass.cpp ] [ compile-fail ../no_dep_val_param_fail.cpp ] ; -test-suite "BOOST_NO_EXCEPTIONS" : -[ run ../no_exceptions_pass.cpp ] -[ compile-fail ../no_exceptions_fail.cpp ] ; test-suite "BOOST_NO_EXCEPTION_STD_NAMESPACE" : [ run ../no_excep_std_pass.cpp ] [ compile-fail ../no_excep_std_fail.cpp ] ; -test-suite "BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS" : -[ run ../no_explicit_cvt_ops_pass.cpp ] -[ compile-fail ../no_explicit_cvt_ops_fail.cpp ] ; +test-suite "BOOST_NO_EXCEPTIONS" : +[ run ../no_exceptions_pass.cpp ] +[ compile-fail ../no_exceptions_fail.cpp ] ; test-suite "BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS" : [ run ../no_exp_func_tem_arg_pass.cpp ] [ compile-fail ../no_exp_func_tem_arg_fail.cpp ] ; +test-suite "BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS" : +[ run ../no_explicit_cvt_ops_pass.cpp ] +[ compile-fail ../no_explicit_cvt_ops_fail.cpp ] ; test-suite "BOOST_NO_CXX11_EXTERN_TEMPLATE" : [ run ../no_extern_template_pass.cpp ] [ compile-fail ../no_extern_template_fail.cpp ] ; @@ -394,15 +394,15 @@ test-suite "BOOST_NO_FENV_H" : test-suite "BOOST_NO_CXX11_FIXED_LENGTH_VARIADIC_TEMPLATE_EXPANSION_PACKS" : [ run ../no_fixed_len_variadic_templates_pass.cpp ] [ compile-fail ../no_fixed_len_variadic_templates_fail.cpp ] ; +test-suite "BOOST_NO_FUNCTION_TEMPLATE_ORDERING" : +[ run ../no_func_tmp_order_pass.cpp ] +[ compile-fail ../no_func_tmp_order_fail.cpp ] ; test-suite "BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS" : [ run ../no_function_template_default_args_pass.cpp ] [ compile-fail ../no_function_template_default_args_fail.cpp ] ; test-suite "BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS" : [ run ../no_function_type_spec_pass.cpp ] [ compile-fail ../no_function_type_spec_fail.cpp ] ; -test-suite "BOOST_NO_FUNCTION_TEMPLATE_ORDERING" : -[ run ../no_func_tmp_order_pass.cpp ] -[ compile-fail ../no_func_tmp_order_fail.cpp ] ; test-suite "BOOST_NO_MS_INT64_NUMERIC_LIMITS" : [ run ../no_i64_limits_pass.cpp ] [ compile-fail ../no_i64_limits_fail.cpp ] ; @@ -442,18 +442,18 @@ test-suite "BOOST_NO_LONG_LONG" : test-suite "BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS" : [ run ../no_mem_func_spec_pass.cpp ] [ compile-fail ../no_mem_func_spec_fail.cpp ] ; -test-suite "BOOST_NO_MEMBER_TEMPLATES" : -[ run ../no_mem_templates_pass.cpp ] -[ compile-fail ../no_mem_templates_fail.cpp ] ; -test-suite "BOOST_NO_MEMBER_TEMPLATE_FRIENDS" : -[ run ../no_mem_templ_frnds_pass.cpp ] -[ compile-fail ../no_mem_templ_frnds_fail.cpp ] ; test-suite "BOOST_NO_MEMBER_TEMPLATE_KEYWORD" : [ run ../no_mem_tem_keyword_pass.cpp ] [ compile-fail ../no_mem_tem_keyword_fail.cpp ] ; test-suite "BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS" : [ run ../no_mem_tem_pnts_pass.cpp ] [ compile-fail ../no_mem_tem_pnts_fail.cpp ] ; +test-suite "BOOST_NO_MEMBER_TEMPLATE_FRIENDS" : +[ run ../no_mem_templ_frnds_pass.cpp ] +[ compile-fail ../no_mem_templ_frnds_fail.cpp ] ; +test-suite "BOOST_NO_MEMBER_TEMPLATES" : +[ run ../no_mem_templates_pass.cpp ] +[ compile-fail ../no_mem_templates_fail.cpp ] ; test-suite "BOOST_NO_NESTED_FRIENDSHIP" : [ run ../no_nested_friendship_pass.cpp ] [ compile-fail ../no_nested_friendship_fail.cpp ] ; @@ -466,12 +466,12 @@ test-suite "BOOST_NO_CXX11_NULLPTR" : test-suite "BOOST_NO_OPERATORS_IN_NAMESPACE" : [ run ../no_ops_in_namespace_pass.cpp ] [ compile-fail ../no_ops_in_namespace_fail.cpp ] ; -test-suite "BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION" : -[ run ../no_partial_spec_pass.cpp ] -[ compile-fail ../no_partial_spec_fail.cpp ] ; test-suite "BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS" : [ run ../no_part_spec_def_args_pass.cpp ] [ compile-fail ../no_part_spec_def_args_fail.cpp ] ; +test-suite "BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION" : +[ run ../no_partial_spec_pass.cpp ] +[ compile-fail ../no_partial_spec_fail.cpp ] ; test-suite "BOOST_NO_PRIVATE_IN_AGGREGATE" : [ run ../no_priv_aggregate_pass.cpp ] [ compile-fail ../no_priv_aggregate_fail.cpp ] ; @@ -508,21 +508,18 @@ test-suite "BOOST_NO_STRINGSTREAM" : test-suite "BOOST_NO_CXX11_STATIC_ASSERT" : [ run ../no_static_assert_pass.cpp ] [ compile-fail ../no_static_assert_fail.cpp ] ; -test-suite "BOOST_NO_STDC_NAMESPACE" : -[ run ../no_stdc_namespace_pass.cpp ] -[ compile-fail ../no_stdc_namespace_fail.cpp ] ; test-suite "BOOST_NO_STD_ALLOCATOR" : [ run ../no_std_allocator_pass.cpp ] [ compile-fail ../no_std_allocator_fail.cpp ] ; test-suite "BOOST_NO_STD_DISTANCE" : [ run ../no_std_distance_pass.cpp ] [ compile-fail ../no_std_distance_fail.cpp ] ; -test-suite "BOOST_NO_STD_ITERATOR" : -[ run ../no_std_iterator_pass.cpp ] -[ compile-fail ../no_std_iterator_fail.cpp ] ; test-suite "BOOST_NO_STD_ITERATOR_TRAITS" : [ run ../no_std_iter_traits_pass.cpp ] [ compile-fail ../no_std_iter_traits_fail.cpp ] ; +test-suite "BOOST_NO_STD_ITERATOR" : +[ run ../no_std_iterator_pass.cpp ] +[ compile-fail ../no_std_iterator_fail.cpp ] ; test-suite "BOOST_NO_STD_LOCALE" : [ run ../no_std_locale_pass.cpp ] [ compile-fail ../no_std_locale_fail.cpp ] ; @@ -547,9 +544,15 @@ test-suite "BOOST_NO_STD_WSTREAMBUF" : test-suite "BOOST_NO_STD_WSTRING" : [ run ../no_std_wstring_pass.cpp ] [ compile-fail ../no_std_wstring_fail.cpp ] ; +test-suite "BOOST_NO_STDC_NAMESPACE" : +[ run ../no_stdc_namespace_pass.cpp ] +[ compile-fail ../no_stdc_namespace_fail.cpp ] ; test-suite "BOOST_NO_SWPRINTF" : [ run ../no_swprintf_pass.cpp ] [ compile-fail ../no_swprintf_fail.cpp ] ; +test-suite "BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS" : +[ run ../no_tem_local_classes_pass.cpp ] +[ compile-fail ../no_tem_local_classes_fail.cpp ] ; test-suite "BOOST_NO_CXX11_TEMPLATE_ALIASES" : [ run ../no_template_aliases_pass.cpp ] [ compile-fail ../no_template_aliases_fail.cpp ] ; @@ -559,9 +562,6 @@ test-suite "BOOST_NO_TEMPLATED_IOSTREAMS" : test-suite "BOOST_NO_TEMPLATE_TEMPLATES" : [ run ../no_template_template_pass.cpp ] [ compile-fail ../no_template_template_fail.cpp ] ; -test-suite "BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS" : -[ run ../no_tem_local_classes_pass.cpp ] -[ compile-fail ../no_tem_local_classes_fail.cpp ] ; test-suite "BOOST_NO_TWO_PHASE_NAME_LOOKUP" : [ run ../no_two_phase_lookup_pass.cpp ] [ compile-fail ../no_two_phase_lookup_fail.cpp ] ; diff --git a/test/config_info.cpp b/test/config_info.cpp index 803a5250..1c96194c 100644 --- a/test/config_info.cpp +++ b/test/config_info.cpp @@ -1122,6 +1122,7 @@ void print_boost_macros() PRINT_MACRO(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE); PRINT_MACRO(BOOST_NO_USING_TEMPLATE); PRINT_MACRO(BOOST_NO_VOID_RETURNS); + // END GENERATED BLOCK PRINT_MACRO(BOOST_INTEL); diff --git a/test/config_test.cpp b/test/config_test.cpp index 20b51680..5af88239 100644 --- a/test/config_test.cpp +++ b/test/config_test.cpp @@ -1,4 +1,4 @@ -// This file was automatically generated on Sat Oct 11 19:26:21 2014 +// This file was automatically generated on Mon Oct 13 13:09:12 2014 // by libs/config/tools/generate.cpp // Copyright John Maddock 2002-4. // Use, modification and distribution are subject to the @@ -202,16 +202,16 @@ namespace boost_no_cxx11_hdr_thread = empty_boost; #else namespace boost_no_cxx11_hdr_tuple = empty_boost; #endif -#ifndef BOOST_NO_CXX11_HDR_TYPEINDEX -#include "boost_no_cxx11_hdr_typeindex.ipp" -#else -namespace boost_no_cxx11_hdr_typeindex = empty_boost; -#endif #ifndef BOOST_NO_CXX11_HDR_TYPE_TRAITS #include "boost_no_cxx11_hdr_type_traits.ipp" #else namespace boost_no_cxx11_hdr_type_traits = empty_boost; #endif +#ifndef BOOST_NO_CXX11_HDR_TYPEINDEX +#include "boost_no_cxx11_hdr_typeindex.ipp" +#else +namespace boost_no_cxx11_hdr_typeindex = empty_boost; +#endif #ifndef BOOST_NO_CXX11_HDR_UNORDERED_MAP #include "boost_no_cxx11_hdr_unordered_map.ipp" #else @@ -347,26 +347,26 @@ namespace boost_no_dependent_nested_derivations = empty_boost; #else namespace boost_no_dependent_types_in_template_value_parameters = empty_boost; #endif -#ifndef BOOST_NO_EXCEPTIONS -#include "boost_no_exceptions.ipp" -#else -namespace boost_no_exceptions = empty_boost; -#endif #ifndef BOOST_NO_EXCEPTION_STD_NAMESPACE #include "boost_no_excep_std.ipp" #else namespace boost_no_exception_std_namespace = empty_boost; #endif -#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS -#include "boost_no_explicit_cvt_ops.ipp" +#ifndef BOOST_NO_EXCEPTIONS +#include "boost_no_exceptions.ipp" #else -namespace boost_no_cxx11_explicit_conversion_operators = empty_boost; +namespace boost_no_exceptions = empty_boost; #endif #ifndef BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS #include "boost_no_exp_func_tem_arg.ipp" #else namespace boost_no_explicit_function_template_arguments = empty_boost; #endif +#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS +#include "boost_no_explicit_cvt_ops.ipp" +#else +namespace boost_no_cxx11_explicit_conversion_operators = empty_boost; +#endif #ifndef BOOST_NO_CXX11_EXTERN_TEMPLATE #include "boost_no_extern_template.ipp" #else @@ -382,6 +382,11 @@ namespace boost_no_fenv_h = empty_boost; #else namespace boost_no_cxx11_fixed_length_variadic_template_expansion_packs = empty_boost; #endif +#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING +#include "boost_no_func_tmp_order.ipp" +#else +namespace boost_no_function_template_ordering = empty_boost; +#endif #ifndef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS #include "boost_no_function_template_default_args.ipp" #else @@ -392,11 +397,6 @@ namespace boost_no_cxx11_function_template_default_args = empty_boost; #else namespace boost_no_function_type_specializations = empty_boost; #endif -#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING -#include "boost_no_func_tmp_order.ipp" -#else -namespace boost_no_function_template_ordering = empty_boost; -#endif #ifndef BOOST_NO_MS_INT64_NUMERIC_LIMITS #include "boost_no_i64_limits.ipp" #else @@ -462,16 +462,6 @@ namespace boost_no_long_long = empty_boost; #else namespace boost_no_member_function_specializations = empty_boost; #endif -#ifndef BOOST_NO_MEMBER_TEMPLATES -#include "boost_no_mem_templates.ipp" -#else -namespace boost_no_member_templates = empty_boost; -#endif -#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS -#include "boost_no_mem_templ_frnds.ipp" -#else -namespace boost_no_member_template_friends = empty_boost; -#endif #ifndef BOOST_NO_MEMBER_TEMPLATE_KEYWORD #include "boost_no_mem_tem_keyword.ipp" #else @@ -482,6 +472,16 @@ namespace boost_no_member_template_keyword = empty_boost; #else namespace boost_no_pointer_to_member_template_parameters = empty_boost; #endif +#ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS +#include "boost_no_mem_templ_frnds.ipp" +#else +namespace boost_no_member_template_friends = empty_boost; +#endif +#ifndef BOOST_NO_MEMBER_TEMPLATES +#include "boost_no_mem_templates.ipp" +#else +namespace boost_no_member_templates = empty_boost; +#endif #ifndef BOOST_NO_NESTED_FRIENDSHIP #include "boost_no_nested_friendship.ipp" #else @@ -502,16 +502,16 @@ namespace boost_no_cxx11_nullptr = empty_boost; #else namespace boost_no_operators_in_namespace = empty_boost; #endif -#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION -#include "boost_no_partial_spec.ipp" -#else -namespace boost_no_template_partial_specialization = empty_boost; -#endif #ifndef BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS #include "boost_no_part_spec_def_args.ipp" #else namespace boost_no_partial_specialization_implicit_default_args = empty_boost; #endif +#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION +#include "boost_no_partial_spec.ipp" +#else +namespace boost_no_template_partial_specialization = empty_boost; +#endif #ifndef BOOST_NO_PRIVATE_IN_AGGREGATE #include "boost_no_priv_aggregate.ipp" #else @@ -572,11 +572,6 @@ namespace boost_no_stringstream = empty_boost; #else namespace boost_no_cxx11_static_assert = empty_boost; #endif -#ifndef BOOST_NO_STDC_NAMESPACE -#include "boost_no_stdc_namespace.ipp" -#else -namespace boost_no_stdc_namespace = empty_boost; -#endif #ifndef BOOST_NO_STD_ALLOCATOR #include "boost_no_std_allocator.ipp" #else @@ -587,16 +582,16 @@ namespace boost_no_std_allocator = empty_boost; #else namespace boost_no_std_distance = empty_boost; #endif -#ifndef BOOST_NO_STD_ITERATOR -#include "boost_no_std_iterator.ipp" -#else -namespace boost_no_std_iterator = empty_boost; -#endif #ifndef BOOST_NO_STD_ITERATOR_TRAITS #include "boost_no_std_iter_traits.ipp" #else namespace boost_no_std_iterator_traits = empty_boost; #endif +#ifndef BOOST_NO_STD_ITERATOR +#include "boost_no_std_iterator.ipp" +#else +namespace boost_no_std_iterator = empty_boost; +#endif #ifndef BOOST_NO_STD_LOCALE #include "boost_no_std_locale.ipp" #else @@ -637,11 +632,21 @@ namespace boost_no_std_wstreambuf = empty_boost; #else namespace boost_no_std_wstring = empty_boost; #endif +#ifndef BOOST_NO_STDC_NAMESPACE +#include "boost_no_stdc_namespace.ipp" +#else +namespace boost_no_stdc_namespace = empty_boost; +#endif #ifndef BOOST_NO_SWPRINTF #include "boost_no_swprintf.ipp" #else namespace boost_no_swprintf = empty_boost; #endif +#ifndef BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS +#include "boost_no_tem_local_classes.ipp" +#else +namespace boost_no_cxx11_local_class_template_parameters = empty_boost; +#endif #ifndef BOOST_NO_CXX11_TEMPLATE_ALIASES #include "boost_no_template_aliases.ipp" #else @@ -657,11 +662,6 @@ namespace boost_no_templated_iostreams = empty_boost; #else namespace boost_no_template_templates = empty_boost; #endif -#ifndef BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS -#include "boost_no_tem_local_classes.ipp" -#else -namespace boost_no_cxx11_local_class_template_parameters = empty_boost; -#endif #ifndef BOOST_NO_TWO_PHASE_NAME_LOOKUP #include "boost_no_two_phase_lookup.ipp" #else @@ -813,11 +813,6 @@ namespace boost_has_nrvo = empty_boost; #else namespace boost_has_partial_std_allocator = empty_boost; #endif -#ifdef BOOST_HAS_PTHREADS -#include "boost_has_pthreads.ipp" -#else -namespace boost_has_pthreads = empty_boost; -#endif #ifdef BOOST_HAS_PTHREAD_DELAY_NP #include "boost_has_pthread_delay_np.ipp" #else @@ -833,6 +828,11 @@ namespace boost_has_pthread_mutexattr_settype = empty_boost; #else namespace boost_has_pthread_yield = empty_boost; #endif +#ifdef BOOST_HAS_PTHREADS +#include "boost_has_pthreads.ipp" +#else +namespace boost_has_pthreads = empty_boost; +#endif #ifdef BOOST_HAS_RVALUE_REFS #include "boost_has_rvalue_refs.ipp" #else @@ -1076,11 +1076,6 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_HAS_PARTIAL_STD_ALLOCATOR at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_has_pthreads::test()) - { - std::cerr << "Failed test for BOOST_HAS_PTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_has_pthread_delay_np::test()) { std::cerr << "Failed test for BOOST_HAS_PTHREAD_DELAY_NP at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1096,6 +1091,11 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_HAS_PTHREAD_YIELD at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_has_pthreads::test()) + { + std::cerr << "Failed test for BOOST_HAS_PTHREADS at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_has_rvalue_refs::test()) { std::cerr << "Failed test for BOOST_HAS_RVALUE_REFS at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1426,16 +1426,16 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_CXX11_HDR_TUPLE at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_cxx11_hdr_typeindex::test()) - { - std::cerr << "Failed test for BOOST_NO_CXX11_HDR_TYPEINDEX at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_no_cxx11_hdr_type_traits::test()) { std::cerr << "Failed test for BOOST_NO_CXX11_HDR_TYPE_TRAITS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_no_cxx11_hdr_typeindex::test()) + { + std::cerr << "Failed test for BOOST_NO_CXX11_HDR_TYPEINDEX at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_no_cxx11_hdr_unordered_map::test()) { std::cerr << "Failed test for BOOST_NO_CXX11_HDR_UNORDERED_MAP at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1571,19 +1571,14 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_exceptions::test()) - { - std::cerr << "Failed test for BOOST_NO_EXCEPTIONS at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_no_exception_std_namespace::test()) { std::cerr << "Failed test for BOOST_NO_EXCEPTION_STD_NAMESPACE at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_cxx11_explicit_conversion_operators::test()) + if(0 != boost_no_exceptions::test()) { - std::cerr << "Failed test for BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS at: " << __FILE__ << ":" << __LINE__ << std::endl; + std::cerr << "Failed test for BOOST_NO_EXCEPTIONS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } if(0 != boost_no_explicit_function_template_arguments::test()) @@ -1591,6 +1586,11 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_no_cxx11_explicit_conversion_operators::test()) + { + std::cerr << "Failed test for BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_no_cxx11_extern_template::test()) { std::cerr << "Failed test for BOOST_NO_CXX11_EXTERN_TEMPLATE at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1606,6 +1606,11 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_CXX11_FIXED_LENGTH_VARIADIC_TEMPLATE_EXPANSION_PACKS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_no_function_template_ordering::test()) + { + std::cerr << "Failed test for BOOST_NO_FUNCTION_TEMPLATE_ORDERING at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_no_cxx11_function_template_default_args::test()) { std::cerr << "Failed test for BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1616,11 +1621,6 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_FUNCTION_TYPE_SPECIALIZATIONS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_function_template_ordering::test()) - { - std::cerr << "Failed test for BOOST_NO_FUNCTION_TEMPLATE_ORDERING at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_no_ms_int64_numeric_limits::test()) { std::cerr << "Failed test for BOOST_NO_MS_INT64_NUMERIC_LIMITS at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1686,16 +1686,6 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_member_templates::test()) - { - std::cerr << "Failed test for BOOST_NO_MEMBER_TEMPLATES at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } - if(0 != boost_no_member_template_friends::test()) - { - std::cerr << "Failed test for BOOST_NO_MEMBER_TEMPLATE_FRIENDS at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_no_member_template_keyword::test()) { std::cerr << "Failed test for BOOST_NO_MEMBER_TEMPLATE_KEYWORD at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1706,6 +1696,16 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_no_member_template_friends::test()) + { + std::cerr << "Failed test for BOOST_NO_MEMBER_TEMPLATE_FRIENDS at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } + if(0 != boost_no_member_templates::test()) + { + std::cerr << "Failed test for BOOST_NO_MEMBER_TEMPLATES at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_no_nested_friendship::test()) { std::cerr << "Failed test for BOOST_NO_NESTED_FRIENDSHIP at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1726,16 +1726,16 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_OPERATORS_IN_NAMESPACE at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_template_partial_specialization::test()) - { - std::cerr << "Failed test for BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_no_partial_specialization_implicit_default_args::test()) { std::cerr << "Failed test for BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_no_template_partial_specialization::test()) + { + std::cerr << "Failed test for BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_no_private_in_aggregate::test()) { std::cerr << "Failed test for BOOST_NO_PRIVATE_IN_AGGREGATE at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1796,11 +1796,6 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_CXX11_STATIC_ASSERT at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_stdc_namespace::test()) - { - std::cerr << "Failed test for BOOST_NO_STDC_NAMESPACE at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_no_std_allocator::test()) { std::cerr << "Failed test for BOOST_NO_STD_ALLOCATOR at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1811,16 +1806,16 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_STD_DISTANCE at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_std_iterator::test()) - { - std::cerr << "Failed test for BOOST_NO_STD_ITERATOR at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_no_std_iterator_traits::test()) { std::cerr << "Failed test for BOOST_NO_STD_ITERATOR_TRAITS at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_no_std_iterator::test()) + { + std::cerr << "Failed test for BOOST_NO_STD_ITERATOR at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_no_std_locale::test()) { std::cerr << "Failed test for BOOST_NO_STD_LOCALE at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1861,11 +1856,21 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_STD_WSTRING at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_no_stdc_namespace::test()) + { + std::cerr << "Failed test for BOOST_NO_STDC_NAMESPACE at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_no_swprintf::test()) { std::cerr << "Failed test for BOOST_NO_SWPRINTF at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } + if(0 != boost_no_cxx11_local_class_template_parameters::test()) + { + std::cerr << "Failed test for BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS at: " << __FILE__ << ":" << __LINE__ << std::endl; + ++error_count; + } if(0 != boost_no_cxx11_template_aliases::test()) { std::cerr << "Failed test for BOOST_NO_CXX11_TEMPLATE_ALIASES at: " << __FILE__ << ":" << __LINE__ << std::endl; @@ -1881,11 +1886,6 @@ int main( int, char *[] ) std::cerr << "Failed test for BOOST_NO_TEMPLATE_TEMPLATES at: " << __FILE__ << ":" << __LINE__ << std::endl; ++error_count; } - if(0 != boost_no_cxx11_local_class_template_parameters::test()) - { - std::cerr << "Failed test for BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS at: " << __FILE__ << ":" << __LINE__ << std::endl; - ++error_count; - } if(0 != boost_no_two_phase_name_lookup::test()) { std::cerr << "Failed test for BOOST_NO_TWO_PHASE_NAME_LOOKUP at: " << __FILE__ << ":" << __LINE__ << std::endl; diff --git a/tools/generate.cpp b/tools/generate.cpp index 1313b42e..8a8e7708 100644 --- a/tools/generate.cpp +++ b/tools/generate.cpp @@ -324,18 +324,26 @@ int cpp_main(int argc, char* argv[]) } std::cout << "Info: Boost.Config test path set as: " << config_path.string() << std::endl; - // enumerate *.ipp files: + // enumerate *.ipp files and store them in a map for now: boost::regex ipp_mask("boost_(?:(has)|no).*\\.ipp"); boost::smatch ipp_match; fs::directory_iterator i(config_path), j; + std::map files_to_process; while(i != j) { if(boost::regex_match(i->path().leaf().string(), ipp_match, ipp_mask)) { - process_ipp_file(*i, ipp_match[1].matched); + files_to_process[*i] = ipp_match[1].matched; } ++i; } + // Enumerate the files and process them, by defering this until now + // the results are always alphabetized which reduces churn in the + // generated files. + for(std::map::const_iterator pos = files_to_process.begin(); pos != files_to_process.end(); ++pos) + { + process_ipp_file(pos->first, pos->second); + } write_config_test(); write_jamfile_v2(); write_config_info();