Index: test/std/input.output/iostream.format/quoted.manip/quoted.pass.cpp =================================================================== --- test/std/input.output/iostream.format/quoted.manip/quoted.pass.cpp +++ test/std/input.output/iostream.format/quoted.manip/quoted.pass.cpp @@ -6,6 +6,8 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03, c++11 + // // quoted @@ -14,10 +16,6 @@ #include #include #include - -#include "test_macros.h" - -#if TEST_STD_VER > 11 template bool is_skipws ( const std::basic_istream& is ) { @@ -173,12 +171,6 @@ assert ( unquote ( "" ) == "" ); // nothing there assert ( unquote ( L"" ) == L"" ); // nothing there test_padding (); - + return 0; } - -#else -int main(int, char**) { - return 0; -} -#endif Index: test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp =================================================================== --- test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp +++ test/std/utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03 + #include #include #include -#include "test_macros.h" - -#if TEST_STD_VER >= 11 // #include // // template @@ -121,6 +120,3 @@ return 0; } -#else -int main(int, char**) { return 0; } -#endif Index: test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp =================================================================== --- test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp +++ test/std/utilities/memory/default.allocator/allocator_pointers.pass.cpp @@ -6,12 +6,11 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03 + #include #include -#include "test_macros.h" - -#if TEST_STD_VER >= 11 // #include // // template @@ -120,6 +119,3 @@ return 0; } -#else -int main(int, char**) { return 0; } -#endif Index: test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp =================================================================== --- test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp +++ test/std/utilities/meta/meta.unary/meta.unary.cat/nullptr.pass.cpp @@ -11,11 +11,11 @@ // nullptr_t // is_null_pointer +// UNSUPPORTED: c++98, c++03, c++11 + #include #include // for std::nullptr_t -#include "test_macros.h" -#if TEST_STD_VER > 11 template void test_nullptr_imp() { @@ -54,8 +54,3 @@ static_assert(!std::is_null_pointer::value, ""); return 0; } -#else -int main(int, char**) { - return 0; -} -#endif Index: test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp @@ -6,11 +6,9 @@ // //===----------------------------------------------------------------------===// +// UNSUPPORTED: c++98, c++03 + // This is for bugs 18853 and 19118 - -#include "test_macros.h" - -#if TEST_STD_VER >= 11 #include #include @@ -32,6 +30,3 @@ return 0; } -#else -int main(int, char**) { return 0; } -#endif