diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-06-20 19:57:12 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-06-20 19:57:12 +0000 |
| commit | ca77fdff020f8a77a9a8fc4bdee6612ebad80b09 (patch) | |
| tree | bdd6a5cd383cf63600304362e254007d42bb5ee5 /include/clang/Basic/DiagnosticSemaKinds.td | |
| parent | 0b795c57e5759ed77c8f4a5509317dcdf71b6735 (diff) | |
| download | clang-ca77fdff020f8a77a9a8fc4bdee6612ebad80b09.tar.gz clang-ca77fdff020f8a77a9a8fc4bdee6612ebad80b09.tar.bz2 clang-ca77fdff020f8a77a9a8fc4bdee6612ebad80b09.tar.xz | |
[C++1z] Implement N3928: message in static_assert is optional.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@211394 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic/DiagnosticSemaKinds.td')
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index f7f08fc4cb..035a7377e1 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -931,7 +931,12 @@ def warning_multiple_selectors: Warning< // C++ declarations def err_static_assert_expression_is_not_constant : Error< "static_assert expression is not an integral constant expression">; -def err_static_assert_failed : Error<"static_assert failed %0">; +def err_static_assert_failed : Error<"static_assert failed%select{ %1|}0">; +def ext_static_assert_no_message : ExtWarn< + "static_assert with no message is a C++1z extension">, InGroup<CXX1z>; +def warn_cxx1y_compat_static_assert_no_message : Warning< + "static_assert with no message is incompatible with C++ standards before C++1z">, + DefaultIgnore, InGroup<CXXPre1zCompat>; def warn_inline_namespace_reopened_noninline : Warning< "inline namespace cannot be reopened as a non-inline namespace">; |