aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2011-12-12 19:10:03 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2011-12-12 19:10:03 +0000
commit4cd9b8f7fb2cebf614e6e2bc766fad27ffd2e9de (patch)
treea7a36ba370ecade52568456e684b0d98067bc928 /test
parentd83d2e73fdbe425acc4cac7b8130c464cb98333d (diff)
Clean up diagnostic wording for disallowed casts in C++11 constant expressions.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@146395 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r--test/SemaCXX/constant-expression-cxx11.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/SemaCXX/constant-expression-cxx11.cpp b/test/SemaCXX/constant-expression-cxx11.cpp
index 55762b4ea4..3ba76d4299 100644
--- a/test/SemaCXX/constant-expression-cxx11.cpp
+++ b/test/SemaCXX/constant-expression-cxx11.cpp
@@ -301,25 +301,25 @@ struct Str {
// FIXME: In C++ mode, we should say 'integral' not 'integer'
int a : dynamic_cast<S*>(sptr) == dynamic_cast<S*>(sptr); // \
expected-warning {{not integer constant expression}} \
- expected-note {{dynamic_cast not allowed in a constant expression}}
+ expected-note {{dynamic_cast is not allowed in a constant expression}}
int b : reinterpret_cast<S*>(sptr) == reinterpret_cast<S*>(sptr); // \
expected-warning {{not integer constant expression}} \
- expected-note {{reinterpret_cast not allowed in a constant expression}}
+ expected-note {{reinterpret_cast is not allowed in a constant expression}}
int c : (S*)(long)(sptr) == (S*)(long)(sptr); // \
expected-warning {{not integer constant expression}} \
- expected-note {{reinterpreting cast not allowed in a constant expression}}
+ expected-note {{cast interpreted as a reinterpret_cast is not allowed in a constant expression}}
int d : (S*)(42) == (S*)(42); // \
expected-warning {{not integer constant expression}} \
- expected-note {{reinterpreting cast not allowed in a constant expression}}
+ expected-note {{cast interpreted as a reinterpret_cast is not allowed in a constant expression}}
int e : (Str*)(sptr) == (Str*)(sptr); // \
expected-warning {{not integer constant expression}} \
- expected-note {{reinterpreting cast not allowed in a constant expression}}
+ expected-note {{cast interpreted as a reinterpret_cast is not allowed in a constant expression}}
int f : &(Str&)(*sptr) == &(Str&)(*sptr); // \
expected-warning {{not integer constant expression}} \
- expected-note {{reinterpreting cast not allowed in a constant expression}}
+ expected-note {{cast interpreted as a reinterpret_cast is not allowed in a constant expression}}
int g : (S*)(void*)(sptr) == sptr; // \
expected-warning {{not integer constant expression}} \
- expected-note {{reinterpreting cast not allowed in a constant expression}}
+ expected-note {{cast from 'void *' is not allowed in a constant expression}}
};
extern char externalvar[];