aboutsummaryrefslogtreecommitdiff
path: root/test/SemaCXX/cxx0x-class.cpp
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2013-01-29 22:26:08 +0000
committerDavid Blaikie <dblaikie@gmail.com>2013-01-29 22:26:08 +0000
commita367e9de80eb05e78f06dc35c1e050799e735282 (patch)
tree3d7a73d0ea47b3123f80d52dbc6ce004ca047e7d /test/SemaCXX/cxx0x-class.cpp
parent6933e3b037fcb15b68f41d2b91ee01db45a2d43a (diff)
Move -Wstatic-float-init fixit into a note & don't recover as if constexpr
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173841 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/SemaCXX/cxx0x-class.cpp')
-rw-r--r--test/SemaCXX/cxx0x-class.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/SemaCXX/cxx0x-class.cpp b/test/SemaCXX/cxx0x-class.cpp
index 4e0d5bc3d7..074591e706 100644
--- a/test/SemaCXX/cxx0x-class.cpp
+++ b/test/SemaCXX/cxx0x-class.cpp
@@ -20,8 +20,8 @@ namespace rdar8367341 {
float foo(); // expected-note {{here}}
struct A {
- static const float x = 5.0f; // expected-warning {{requires 'constexpr'}}
- static const float y = foo(); // expected-warning {{requires 'constexpr'}}
+ static const float x = 5.0f; // expected-warning {{requires 'constexpr'}} expected-note {{add 'constexpr'}}
+ static const float y = foo(); // expected-warning {{requires 'constexpr'}} expected-note {{add 'constexpr'}}
static constexpr float x2 = 5.0f;
static constexpr float y2 = foo(); // expected-error {{must be initialized by a constant expression}} expected-note {{non-constexpr function 'foo'}}
};