Generate functions using new AutoCallable intermediate

Author: Aidan63

src/generators/cpp/gen/cppGen.ml

@@ -1500,7 +1500,7 @@ let gen_cpp_ast_expression_tree ctx class_name func_name function_args
     let argsCount = list_num closure.close_args in
     let signature = cpp_closure_signature closure in
     output_i ("HX_BEGIN_LOCAL_FUNC_S" ^ size ^ "(");
-    Printf.sprintf "::hx::Callable_obj<%s>, _hx_Closure_%i" signature closure.close_id |> out;
+    Printf.sprintf "::hx::AutoCallable_obj<%s>, _hx_Closure_%i" signature closure.close_id |> out;
     StringMap.iter
       (fun name var ->
         out ("," ^ cpp_macro_var_type_of var ^ "," ^ keyword_remap name))

src/generators/cpp/gen/cppGenClassImplementation.ml

@@ -20,7 +20,7 @@ let write_closure_header callable_name captures func return_type_str prefix outp
       die (Printf.sprintf "tcf_callable should be a TCppCalllable but was %s" (tcpp_to_string func.tcf_callable)) __LOC__
   in
 
-  Printf.sprintf "struct %s final : public ::hx::Callable_obj< %s > {\n" callable_name func_signature |> output;
+  Printf.sprintf "struct %s final : public ::hx::AutoCallable_obj< %s > {\n" callable_name func_signature |> output;
 
   (match captures with
   | Some obj_name ->