1 files changed, 14 insertions, 3 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index ca1a4f776f..0b7ad74214 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -986,7 +986,18 @@ bool Parser::parseTemplateDeclaration(DeclarationAST *&node)
             match(T_GREATER, &ast->greater_token);
     }
 
-    parseDeclaration(ast->declaration);
+    do {
+        unsigned start_declaration = cursor();
+
+        ast->declaration = 0;
+        if (parseDeclaration(ast->declaration))
+            break;
+
+        _translationUnit->error(start_declaration, "expected a declaration");
+        rewind(start_declaration + 1);
+        skipUntilDeclaration();
+    } while (LA());
+
     node = ast;
     return true;
 }
@@ -2501,10 +2512,10 @@ bool Parser::parseExpressionList(ExpressionListAST *&node)
 {
     DEBUG_THIS_RULE();
 
+#ifdef CPLUSPLUS_WITH_CXXOX_INITIALIZER_LIST
     if (_cxx0xEnabled)
         return parseInitializerList0x(node);
-
-
+#endif
 
     // ### remove me
     ExpressionListAST **expression_list_ptr = &node;