diff options
| author | Eli Bendersky <eliben@chromium.org> | 2013-07-15 16:08:08 -0700 |
|---|---|---|
| committer | Eli Bendersky <eliben@chromium.org> | 2013-07-15 16:08:08 -0700 |
| commit | e789858899a7b36caf11b371a97411a1582a482b (patch) | |
| tree | e8c28b178b32010f73b477b3c65b5ff74437530c /test/SemaCXX/constexpr-value-init.cpp | |
| parent | 99a5501f5ae5b75017dfc386d4abf648234e85df (diff) | |
| parent | 20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8 (diff) | |
Merge commit '20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8'
Conflicts:
lib/CodeGen/ItaniumCXXABI.cpp
Diffstat (limited to 'test/SemaCXX/constexpr-value-init.cpp')
| -rw-r--r-- | test/SemaCXX/constexpr-value-init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/SemaCXX/constexpr-value-init.cpp b/test/SemaCXX/constexpr-value-init.cpp index e459f097b9..d137bd88db 100644 --- a/test/SemaCXX/constexpr-value-init.cpp +++ b/test/SemaCXX/constexpr-value-init.cpp @@ -1,7 +1,7 @@ // RUN: %clang_cc1 %s -std=c++11 -fsyntax-only -verify struct A { - constexpr A() : a(b + 1), b(a + 1) {} // expected-note {{uninitialized}} + constexpr A() : a(b + 1), b(a + 1) {} // expected-note {{outside its lifetime}} int a; int b; }; |