aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/ParseTemplate.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2009-02-10 00:53:15 +0000
committerDouglas Gregor <dgregor@apple.com>2009-02-10 00:53:15 +0000
commit8b642592a35167a3780074e78674e0bece87c40c (patch)
treee0ae2fbbb5ae014d68d4a54e1270235928db8fd6 /lib/Parse/ParseTemplate.cpp
parentdd0574e76439f31c02ba54bd7708725176f9531f (diff)
Teach the type-id/expression disambiguator about different
disambiguation contexts, so that we properly parse template arguments such as A<int()> as type-ids rather than as expressions. Since this can be confusing (especially when the template parameter is a non-type template parameter), we try to give a friendly error message. Almost, eliminate a redundant error message (that should have been a note) and add some ultra-basic checks for non-type template arguments. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64189 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseTemplate.cpp')
-rw-r--r--lib/Parse/ParseTemplate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp
index f860058117..25aea35224 100644
--- a/lib/Parse/ParseTemplate.cpp
+++ b/lib/Parse/ParseTemplate.cpp
@@ -456,7 +456,7 @@ void *Parser::ParseTemplateArgument(bool &ArgIsType) {
// the corresponding template-parameter.
//
// Therefore, we initially try to parse a type-id.
- if (isTypeIdInParens()) {
+ if (isCXXTypeId(TypeIdAsTemplateArgument)) {
ArgIsType = true;
return ParseTypeName();
}