diff options
| -rw-r--r-- | clang/lib/Parse/ParseTemplate.cpp | 3 | ||||
| -rw-r--r-- | clang/test/CXX/temp/temp.arg/temp.arg.nontype/p1.cpp | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp index 3a964dd2052..d661ce023a8 100644 --- a/clang/lib/Parse/ParseTemplate.cpp +++ b/clang/lib/Parse/ParseTemplate.cpp @@ -695,7 +695,8 @@ Parser::ParseNonTypeTemplateParameter(unsigned Depth, unsigned Position) { // end of the template-parameter-list rather than a greater-than // operator. GreaterThanIsOperatorScope G(GreaterThanIsOperator, false); - EnterExpressionEvaluationContext Unevaluated(Actions, Sema::Unevaluated); + EnterExpressionEvaluationContext Unevaluated(Actions, + Sema::ConstantEvaluated); DefaultArg = Actions.CorrectDelayedTyposInExpr(ParseAssignmentExpression()); if (DefaultArg.isInvalid()) diff --git a/clang/test/CXX/temp/temp.arg/temp.arg.nontype/p1.cpp b/clang/test/CXX/temp/temp.arg/temp.arg.nontype/p1.cpp index 3f70ca7c81a..22ea018842d 100644 --- a/clang/test/CXX/temp/temp.arg/temp.arg.nontype/p1.cpp +++ b/clang/test/CXX/temp/temp.arg/temp.arg.nontype/p1.cpp @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only -verify -triple=x86_64-linux-gnu %s +// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify -triple=x86_64-linux-gnu %s -DCPP11ONLY // C++11 [temp.arg.nontype]p1: // @@ -6,6 +7,8 @@ // be one of: // -- an integral constant expression; or // -- the name of a non-type template-parameter ; or +#ifndef CPP11ONLY + namespace non_type_tmpl_param { template <int N> struct X0 { X0(); }; template <int N> X0<N>::X0() { } @@ -95,3 +98,14 @@ namespace bad_args { int* iptr = &i; X0<iptr> x0b; // expected-error{{non-type template argument for template parameter of pointer type 'int *' must have its address taken}} } +#endif // CPP11ONLY + +namespace default_args { +#ifdef CPP11ONLY +namespace lambdas { +template<int I = ([] { return 5; }())> //expected-error 2{{constant expression}} expected-note{{constant expression}} +int f(); +} +#endif // CPP11ONLY + +}
\ No newline at end of file |
