summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseExpr.cpp
diff options
context:
space:
mode:
authorKaelyn Uhrain <rikka@google.com>2012-02-22 01:03:07 +0000
committerKaelyn Uhrain <rikka@google.com>2012-02-22 01:03:07 +0000
commit0178200062a9c9cb985d7544061ea558c2d45946 (patch)
treed8de6db08e7727889ec5ce65ca78a230fc40180c /clang/lib/Parse/ParseExpr.cpp
parent9c4cd1bfb11169926d7975cd2980886416e1584c (diff)
downloadbcm5719-llvm-0178200062a9c9cb985d7544061ea558c2d45946.tar.gz
bcm5719-llvm-0178200062a9c9cb985d7544061ea558c2d45946.zip
Fix typo correction of template arguments to once again allow type names.
llvm-svn: 151112
Diffstat (limited to 'clang/lib/Parse/ParseExpr.cpp')
-rw-r--r--clang/lib/Parse/ParseExpr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index fada2e319c5..d2e87524689 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -249,7 +249,7 @@ Parser::ParseAssignmentExprWithObjCMessageExprStart(SourceLocation LBracLoc,
}
-ExprResult Parser::ParseConstantExpression() {
+ExprResult Parser::ParseConstantExpression(TypeCastState isTypeCast) {
// C++03 [basic.def.odr]p2:
// An expression is potentially evaluated unless it appears where an
// integral constant expression is required (see 5.19) [...].
@@ -257,7 +257,7 @@ ExprResult Parser::ParseConstantExpression() {
EnterExpressionEvaluationContext Unevaluated(Actions,
Sema::ConstantEvaluated);
- ExprResult LHS(ParseCastExpression(false));
+ ExprResult LHS(ParseCastExpression(false, false, isTypeCast));
return ParseRHSOfBinaryExpression(LHS, prec::Conditional);
}
OpenPOWER on IntegriCloud