diff --git a/include/boost/preprocessor/config/config.hpp b/include/boost/preprocessor/config/config.hpp index b6afbab..0134d88 100644 --- a/include/boost/preprocessor/config/config.hpp +++ b/include/boost/preprocessor/config/config.hpp @@ -74,11 +74,8 @@ # /* variadic support explicitly disabled for all untested compilers */ # if defined __GCCXML__ || defined __CUDACC__ || defined __PATHSCALE__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || defined __SUNPRO_CC || defined __HP_aCC && !defined __EDG__ || defined __MRC__ || defined __SC__ || defined __IBMCPP__ || defined __PGI # define BOOST_PP_VARIADICS 0 -# /* Clang, all versions */ -# elif defined __clang__ -# define BOOST_PP_VARIADICS 1 # /* VC++ (C/C++) */ -# elif defined _MSC_VER && _MSC_VER >= 1400 && !defined __EDG__ +# elif defined _MSC_VER && _MSC_VER >= 1400 && !defined __EDG__ && !defined __clang__ # define BOOST_PP_VARIADICS 1 # define BOOST_PP_VARIADICS_MSVC 1 # /* Wave (C/C++), GCC (C++) */ diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 5e91c86..100df3b 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -19,22 +19,22 @@ project preprocessor_tests : requirements on test-suite preprocessor : - [ compile arithmetic.cpp : gcc:-std=c++0x ] - [ compile array.cpp : gcc:-std=c++0x ] - [ compile comparison.cpp : gcc:-std=c++0x ] - [ compile control.cpp : gcc:-std=c++0x ] - [ compile debug.cpp : gcc:-std=c++0x ] - [ compile facilities.cpp : gcc:-std=c++0x ] - [ compile iteration.cpp : gcc:-std=c++0x ] - [ compile list.cpp : gcc:-std=c++0x ] - [ compile logical.cpp : gcc:-std=c++0x ] - [ compile punctuation.cpp : gcc:-std=c++0x ] - [ compile repetition.cpp : gcc:-std=c++0x ] - [ compile selection.cpp : gcc:-std=c++0x ] - [ compile seq.cpp : gcc:-std=c++0x ] - [ compile slot.cpp : gcc:-std=c++0x ] - [ compile tuple.cpp : gcc:-std=c++0x ] - [ compile variadic.cpp : gcc:-std=c++0x ] + [ compile arithmetic.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile array.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile comparison.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile control.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile debug.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile facilities.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile iteration.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile list.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile logical.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile punctuation.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile repetition.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile selection.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile seq.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile slot.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile tuple.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile variadic.cpp : gcc:-std=c++0x clang:-std=c++0x ] ; test-suite preprocessor_nvm @@ -58,59 +58,59 @@ test-suite preprocessor_nvm test-suite preprocessor_c : [ compile arithmetic.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : arithmetic_c ] [ compile array.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : array_c ] [ compile comparison.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : comparison_c ] [ compile control.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : control_c ] [ compile debug.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : debug_c ] [ compile facilities.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : facilities_c ] [ compile list.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : list_c ] [ compile logical.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : logical_c ] [ compile punctuation.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : punctuation_c ] [ compile selection.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : selection_c ] [ compile seq.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : seq_c ] [ compile slot.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : slot_c ] [ compile tuple.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : tuple_c ] [ compile variadic.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : variadic_c ] ; @@ -119,71 +119,71 @@ test-suite preprocessor_c_nvm : [ compile arithmetic.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : arithmetic_c_nvm ] [ compile array.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : array_c_nvm ] [ compile comparison.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : comparison_c_nvm ] [ compile control.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : control_c_nvm ] [ compile debug.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : debug_c_nvm ] [ compile facilities.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : facilities_c_nvm ] [ compile list.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : list_c_nvm ] [ compile logical.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : logical_c_nvm ] [ compile selection.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : selection_c_nvm ] [ compile seq.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : seq_c_nvm ] [ compile slot.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : slot_c_nvm ] [ compile tuple.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : tuple_c_nvm ] ; test-suite preprocessor_isempty : - [ compile isempty.cpp : gcc:-std=c++0x ] - [ compile-fail isempty_variadic_standard_failure.cpp : gcc:-std=c++0x ] - [ compile-fail isempty_variadic_standard_failure2.cpp : gcc:-std=c++0x ] + [ compile isempty.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile-fail isempty_variadic_standard_failure.cpp : gcc:-std=c++0x clang:-std=c++0x ] + [ compile-fail isempty_variadic_standard_failure2.cpp : gcc:-std=c++0x clang:-std=c++0x ] ; test-suite preprocessor_isempty_nvm @@ -194,15 +194,15 @@ test-suite preprocessor_isempty_nvm test-suite preprocessor_isempty_c : [ compile isempty.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : isempty_c ] [ compile-fail isempty_variadic_standard_failure.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : isempty_variadic_standard_failure_c ] [ compile-fail isempty_variadic_standard_failure2.c - : gcc:-std=c99 + : gcc:-std=c99 clang:-std=c99 : isempty_variadic_standard_failure2_c ] ; @@ -211,7 +211,7 @@ test-suite preprocessor_isempty_c_nvm : [ compile isempty.c : BOOST_PP_VARIADICS=0 - gcc:-std=c99 + gcc:-std=c99 clang:-std=c99 : isempty_c_nvm ] ;