aboutsummaryrefslogtreecommitdiff
path: root/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
commite43fe993a079795ac3d2ba7c9ec5e2a0c8069918 (patch)
treebad21e008e9e31f7083a020c00b379e6704c4ee5 /lib/Parse/ParseExpr.cpp
parent2639ac628cff5dedb4fa60169082b2a1a9dd8694 (diff)
Fix typo correction of template arguments to once again allow type names.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151112 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseExpr.cpp')
-rw-r--r--lib/Parse/ParseExpr.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Parse/ParseExpr.cpp b/lib/Parse/ParseExpr.cpp
index fada2e319c..d2e8752468 100644
--- a/lib/Parse/ParseExpr.cpp
+++ b/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);
}