summaryrefslogtreecommitdiffstats
path: root/clang/test
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2014-06-20 19:57:12 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2014-06-20 19:57:12 +0000
commit085a64ffc5d447a6a967bb1267396d7b6ee030e2 (patch)
tree02cf6883f80bdc6f0c8415fa6263d0a36ce3bb0b /clang/test
parent7c8d13911a311019e2b56da8682fb41217072fd9 (diff)
downloadbcm5719-llvm-085a64ffc5d447a6a967bb1267396d7b6ee030e2.tar.gz
bcm5719-llvm-085a64ffc5d447a6a967bb1267396d7b6ee030e2.zip
[C++1z] Implement N3928: message in static_assert is optional.
llvm-svn: 211394
Diffstat (limited to 'clang/test')
-rw-r--r--clang/test/SemaCXX/cxx0x-compat.cpp3
-rw-r--r--clang/test/SemaCXX/static-assert.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/clang/test/SemaCXX/cxx0x-compat.cpp b/clang/test/SemaCXX/cxx0x-compat.cpp
index ffbd20fda37..a58a7f875cd 100644
--- a/clang/test/SemaCXX/cxx0x-compat.cpp
+++ b/clang/test/SemaCXX/cxx0x-compat.cpp
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -fsyntax-only -std=c++98 -Wc++11-compat -verify %s
-// RUN: %clang_cc1 -fsyntax-only -std=c++1y -Wc++11-compat -verify %s
+// RUN: %clang_cc1 -fsyntax-only -std=c++1z -Wc++11-compat -verify %s
#if __cplusplus < 201103L
@@ -44,5 +44,6 @@ char c = 'x'_x; // expected-warning {{will be treated as a user-defined literal
#else
auto init_capture = [a(0)] {}; // expected-warning {{initialized lambda captures are incompatible with C++ standards before C++1y}}
+static_assert(true); // expected-warning {{incompatible with C++ standards before C++1z}}
#endif
diff --git a/clang/test/SemaCXX/static-assert.cpp b/clang/test/SemaCXX/static-assert.cpp
index 4a7560ba5b6..c9d93843536 100644
--- a/clang/test/SemaCXX/static-assert.cpp
+++ b/clang/test/SemaCXX/static-assert.cpp
@@ -48,3 +48,6 @@ template<typename T> struct StaticAssertProtected {
struct X { ~X(); };
StaticAssertProtected<int> sap1;
StaticAssertProtected<X> sap2; // expected-note {{instantiation}}
+
+static_assert(true); // expected-warning {{C++1z extension}}
+static_assert(false); // expected-error-re {{failed$}} expected-warning {{extension}}
OpenPOWER on IntegriCloud