diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
index edc8bcb4daf..f51579b1f7b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
@@ -401,7 +401,7 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
                 case IToken.tEOC:
                     last = consume();
                     last = consumeTemplateArguments(last, argumentList);
-                    if (last.getType() == IToken.tGT)
+                    if (last.getType() == IToken.tGT || last.getType() == IToken.tEOC)
                         hasTemplateId = true;
                 }
             }