summaryrefslogtreecommitdiffstats
path: root/clang/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
commit8505c29593fb4db29103eddace10186741343b32 (patch)
tree4b32b4eba76d55f52353e42bc2a820c8d2d2e202 /clang/test/SemaCXX/cxx0x-class.cpp
parent276a08b5b1e6752ff013b9a3344bc4815c77160c (diff)
downloadbcm5719-llvm-8505c29593fb4db29103eddace10186741343b32.tar.gz
bcm5719-llvm-8505c29593fb4db29103eddace10186741343b32.zip
Move -Wstatic-float-init fixit into a note & don't recover as if constexpr
llvm-svn: 173841
Diffstat (limited to 'clang/test/SemaCXX/cxx0x-class.cpp')
-rw-r--r--clang/test/SemaCXX/cxx0x-class.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/SemaCXX/cxx0x-class.cpp b/clang/test/SemaCXX/cxx0x-class.cpp
index 4e0d5bc3d70..074591e7063 100644
--- a/clang/test/SemaCXX/cxx0x-class.cpp
+++ b/clang/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'}}
};
OpenPOWER on IntegriCloud