From b4f1ad0cbd93e2dcc6ec24d1cd76011c3d822502 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 9 Apr 2024 15:18:29 +0200
Subject: [PATCH] Fix AMI     * ridlbe/c++11/visitors/pre_post.rb:     *
 ridlbe/c++11/writers/amistubsource.rb:     *
 ridlbe/c++11/writers/stubsource.rb:

---
 ridlbe/c++11/visitors/pre_post.rb     | 6 ------
 ridlbe/c++11/writers/amistubsource.rb | 2 ++
 ridlbe/c++11/writers/stubsource.rb    | 6 ------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/ridlbe/c++11/visitors/pre_post.rb b/ridlbe/c++11/visitors/pre_post.rb
index c81815fb..d8303c2f 100644
--- a/ridlbe/c++11/visitors/pre_post.rb
+++ b/ridlbe/c++11/visitors/pre_post.rb
@@ -20,11 +20,5 @@ def visit
         visit_template(:post)
       end
     end
-
-    class HeaderVisitor < VisitorBase
-      def visit
-        visit_template(:header)
-      end
-    end
   end
 end
diff --git a/ridlbe/c++11/writers/amistubsource.rb b/ridlbe/c++11/writers/amistubsource.rb
index 1fcf8b80..c5fff594 100644
--- a/ridlbe/c++11/writers/amistubsource.rb
+++ b/ridlbe/c++11/writers/amistubsource.rb
@@ -242,6 +242,8 @@ def post_visit(_parser)
         properties[:pre_includes] = @default_pre_includes
         properties[:post_includes] = @default_post_includes
         properties[:includes] = @includes
+        visitor(HeaderVisitor).visit
+        visitor(IncludeStubProxyDefineVisitor).visit
         visitor(PreVisitor) do |v|
           ###
           # Overloads for this visitor only.
diff --git a/ridlbe/c++11/writers/stubsource.rb b/ridlbe/c++11/writers/stubsource.rb
index e8129e39..5fcb89bd 100644
--- a/ridlbe/c++11/writers/stubsource.rb
+++ b/ridlbe/c++11/writers/stubsource.rb
@@ -10,12 +10,6 @@
 
 module IDL
   module Cxx11
-    class IncludeStubProxyDefineVisitor < VisitorBase
-      def visit
-        visit_template(:include_stub_proxy_define)
-      end
-    end
-
     class StubSourceBaseWriter < CxxCodeWriterBase
       def initialize(output = STDOUT, opts = {})
         super