Merge pull request #2907 from felixn/fix-travis-cpp-regressions

Fix regressions in travis Cpp tests

tool/resources/org/antlr/v4/tool/templates/codegen/Cpp/Cpp.stg

@@ -547,7 +547,7 @@ LeftRecursiveRuleFunction(currentRule, args, code, locals, ruleCtx, altLabelCtxs
 StructDeclHeader(struct, ctorAttrs, attrs, getters, dispatchMethods, interfaces, extensionMembers) ::= <<
 class <file.exportMacro> <struct.name> : public <if (contextSuperClass)><contextSuperClass><else>antlr4::ParserRuleContext<endif><if(interfaces)>, <interfaces; separator=", "><endif> {
 public:
-  <attrs: {a | <a>;}; separator="\n">
+  <attrs: {a | <a>;}; separator = "\n">
   <if (ctorAttrs)><struct.name>(antlr4::ParserRuleContext *parent, size_t invokingState);<endif>
   <struct.name>(antlr4::ParserRuleContext *parent, size_t invokingState<ctorAttrs: {a | , <a>}>);
 <if (struct.provideCopyFrom)> <! don't need copy unless we have subclasses !>
@@ -601,7 +601,7 @@ class <file.exportMacro> <struct.name> : public <currentRule.name; format = "cap
 public:
   <struct.name>(<currentRule.name; format = "cap">Context *ctx);
 
-  <if (attrs)><attrs: {a | <a>}; separator = "\n"><endif>
+  <if (attrs)><attrs: {a | <a>;}; separator = "\n"><endif>
   <getters: {g | <g>}; separator = "\n">
   <dispatchMethods; separator = "\n">
 };