aboutsummaryrefslogtreecommitdiff
path: root/test/SemaCXX/cxx0x-class.cpp
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2013-01-29 21:40:37 +0000
committerDavid Blaikie <dblaikie@gmail.com>2013-01-29 21:40:37 +0000
commit6933e3b037fcb15b68f41d2b91ee01db45a2d43a (patch)
tree115f10b3c39bb2b64aa906e49d3bf305007c5578 /test/SemaCXX/cxx0x-class.cpp
parent32d28ee6061930b2a9c170cbaaeea028c88a7b89 (diff)
Don't fixit/recover from -Wstatic-float-init when it's not an error.
Fix to change r173414 that lead to Clang changing const to constexpr even under -Wno-static-float-init. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173835 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 5532bcea3e..4e0d5bc3d7 100644
--- a/test/SemaCXX/cxx0x-class.cpp
+++ b/test/SemaCXX/cxx0x-class.cpp
@@ -17,11 +17,11 @@ public:
};
namespace rdar8367341 {
- float foo(); // expected-note 2{{here}}
+ 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'}} expected-error {{constexpr variable 'y' must be initialized by a constant expression}} expected-note {{non-constexpr function 'foo'}}
+ static const float y = foo(); // expected-warning {{requires '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'}}
};