Author: hans Date: Fri Aug 11 09:14:07 2017 New Revision: 310721 URL: http://llvm.org/viewvc/llvm-project?rev=310721&view=rev Log: Merging r309054: ------------------------------------------------------------------------ r309054 | rsmith | 2017-07-25 16:31:42 -0700 (Tue, 25 Jul 2017) | 2 lines
Reorder tests to match latest SD-6 draft. ------------------------------------------------------------------------ Modified: cfe/branches/release_50/ (props changed) cfe/branches/release_50/test/Lexer/cxx-features.cpp Propchange: cfe/branches/release_50/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 11 09:14:07 2017 @@ -1,4 +1,4 @@ /cfe/branches/type-system-rewrite:134693-134817 -/cfe/trunk:308455,308722,308824,308897,308996,309058,309112-309113,309226,309263,309327,309382-309383,309488,309503,309523,309569,309607,309633,309636,309640,309722,309752,309975,310006,310057,310158,310191,310359,310691-310692 +/cfe/trunk:308455,308722,308824,308897,308996,309054,309058,309112-309113,309226,309263,309327,309382-309383,309488,309503,309523,309569,309607,309633,309636,309640,309722,309752,309975,310006,310057,310158,310191,310359,310691-310692 /cfe/trunk/test:170344 /cfe/trunk/test/SemaTemplate:126920 Modified: cfe/branches/release_50/test/Lexer/cxx-features.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_50/test/Lexer/cxx-features.cpp?rev=310721&r1=310720&r2=310721&view=diff ============================================================================== --- cfe/branches/release_50/test/Lexer/cxx-features.cpp (original) +++ cfe/branches/release_50/test/Lexer/cxx-features.cpp Fri Aug 11 09:14:07 2017 @@ -22,10 +22,6 @@ // --- C++17 features --- -#if check(variadic_using, 0, 0, 0, 201611) // FIXME: provisional name -#error "wrong value for __cpp_variadic_using" -#endif - #if check(hex_float, 0, 0, 0, 201603) #error "wrong value for __cpp_hex_float" #endif @@ -60,6 +56,10 @@ // static_assert checked below +#if check(deduction_guides, 0, 0, 0, 201611) // FIXME: provisional name +#error "wrong value for __cpp_deduction_guides" +#endif + #if check(template_auto, 0, 0, 0, 201606) // FIXME: provisional name #error "wrong value for __cpp_template_auto" #endif @@ -80,6 +80,10 @@ // inheriting_constructors checked below +#if check(variadic_using, 0, 0, 0, 201611) // FIXME: provisional name +#error "wrong value for __cpp_variadic_using" +#endif + #if check(aggregate_bases, 0, 0, 0, 201603) #error "wrong value for __cpp_aggregate_bases" #endif @@ -96,10 +100,6 @@ #error "wrong value for __cpp_template_template_args" #endif -#if check(deduction_guides, 0, 0, 0, 201611) // FIXME: provisional name -#error "wrong value for __cpp_deduction_guides" -#endif - // --- C++14 features --- #if check(binary_literals, 0, 0, 201304, 201304) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits