Merge pull request #2836 from sigmasoldi3r/master

[C++ codegen] Fixed deprecation warning for CPP targets > 17

contributors.txt

@@ -248,6 +248,7 @@ YYYY/MM/DD, github id, Full name, email
 2020/03/17, XsongyangX, Song Yang, songyang1218@gmail.com
 2020/04/07, deniskyashif, Denis Kyashif, denis.kyashif@gmail.com
 2020/04/30, TristonianJones, Tristan Swadell, tswadell@google.com
+2020/06/04, sigmasoldi3r, Pablo Blanco, pablobc.1995@gmail.com
 2020/05/25, graknol, Sindre van der Linden, graknol@gmail.com
 2020/05/31, d-markey, David Markey, dmarkey@free.fr
 2020/06/02, cohomology, Kilian Kilger, kkilger AT gmail.com

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

@@ -464,7 +464,11 @@ RuleFunction(currentRule, args, code, locals, ruleCtx, altLabelCtxs, namedAction
   <namedActions.init>
   <locals; separator = "\n">
 
+#if __cplusplus > 201703L
+  auto onExit = finally([=, this] {
+#else
   auto onExit = finally([=] {
+#endif
   <finallyAction>
     exitRule();
   });
@@ -517,7 +521,11 @@ LeftRecursiveRuleFunction(currentRule, args, code, locals, ruleCtx, altLabelCtxs
     <namedActions.init>
 <! TODO: untested !>    <locals; separator = "\n">
 
+#if __cplusplus > 201703L
+  auto onExit = finally([=, this] {
+#else
   auto onExit = finally([=] {
+#endif
   <if (finallyAction)><finallyAction><endif>
     unrollRecursionContexts(parentContext);
   });