diff options
| author | Hans Wennborg <hans@hanshq.net> | 2017-08-11 16:14:07 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2017-08-11 16:14:07 +0000 |
| commit | 3b16c8b2d526bff51bcaaee74ddbbf364b9365e7 (patch) | |
| tree | b5568d5fa8ff9ea2c7506570cb1c0dec68b7160c | |
| parent | d84167fd28cd57353c9b02d22bc7d4a4eeabf2e5 (diff) | |
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.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_50@310721 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Lexer/cxx-features.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/Lexer/cxx-features.cpp b/test/Lexer/cxx-features.cpp index 24f38e51d9..e9a514db75 100644 --- a/test/Lexer/cxx-features.cpp +++ b/test/Lexer/cxx-features.cpp @@ -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) |