aboutsummaryrefslogtreecommitdiff
path: root/test/CXX/expr/expr.const/p3-0x.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2013-04-21 01:08:50 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2013-04-21 01:08:50 +0000
commit840462670ba7a6bc26265a2306b35f2f0f01f51c (patch)
tree83c14a10bce99e57a7064e3edb4a50d3c8b300af /test/CXX/expr/expr.const/p3-0x.cpp
parent39b0e269dc8895ecc0f92f08126d3082b2a837a8 (diff)
The 'constexpr implies const' rule for non-static member functions is gone in
C++1y, so stop adding the 'const' there. Provide a compatibility warning for code relying on this in C++11, with a fix-it hint. Update our lazily-written tests to add the const, except for those ones which were testing our implementation of this rule. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@179969 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CXX/expr/expr.const/p3-0x.cpp')
-rw-r--r--test/CXX/expr/expr.const/p3-0x.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/CXX/expr/expr.const/p3-0x.cpp b/test/CXX/expr/expr.const/p3-0x.cpp
index 6ddd11bcee..047e238190 100644
--- a/test/CXX/expr/expr.const/p3-0x.cpp
+++ b/test/CXX/expr/expr.const/p3-0x.cpp
@@ -101,7 +101,7 @@ int n = Val<bool, &S::operator int>::value; // expected-error {{conversion from
namespace NonConstLValue {
struct S {
- constexpr operator int() { return 10; }
+ constexpr operator int() const { return 10; }
};
S s; // not constexpr
// Under the FDIS, this is not a converted constant expression.