[cfe-commits] r143505 - /cfe/trunk/test/SemaCXX/constant-expression-cxx11.cpp

[Richard Smith]

Author: rsmith
Date: Tue Nov  1 16:48:46 2011
New Revision: 143505

URL: http://llvm.org/viewvc/llvm-project?rev=143505&view=rev
Log:
Fix r143463 to test what it was intended to test.

Modified:
    cfe/trunk/test/SemaCXX/constant-expression-cxx11.cpp

Modified: cfe/trunk/test/SemaCXX/constant-expression-cxx11.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/constant-expression-cxx11.cpp?rev=143505&r1=143504&r2=143505&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/constant-expression-cxx11.cpp (original)
+++ cfe/trunk/test/SemaCXX/constant-expression-cxx11.cpp Tue Nov  1 16:48:46 2011
@@ -107,8 +107,8 @@
     // constant expression even though 'a' is still in scope.
     return ObscureTheTruth(b ? a : k);
   }
-  constexpr int n1a = MaybeReturnJunk(false, 0); // ok
-  constexpr int n2a = MaybeReturnJunk(true, 0); // expected-error {{must be initialized by a constant expression}}
+  constexpr int n1a = MaybeReturnNonstaticRef(false, 0); // ok
+  constexpr int n2a = MaybeReturnNonstaticRef(true, 0); // expected-error {{must be initialized by a constant expression}}
 
   constexpr int InternalReturnJunk(int n) {
     // FIXME: We should reject this: it never produces a constant expression.