From 97e62ecd7da5a2e7fd0be9b8ec0e3877e016b7cb Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue, 9 Apr 2024 14:43:04 +0200
Subject: [PATCH] Changed define generation

    * ridlbe/c++11/templates/cli/hdr/post.erb:
    * ridlbe/c++11/templates/cli/src/pre.erb:
    * ridlbe/c++11/writers/stubproxysource.rb:
    * ridlbe/c++11/writers/stubsource.rb:
---
 ridlbe/c++11/templates/cli/hdr/post.erb | 2 +-
 ridlbe/c++11/templates/cli/src/pre.erb  | 2 --
 ridlbe/c++11/writers/stubproxysource.rb | 7 +++++++
 ridlbe/c++11/writers/stubsource.rb      | 8 +++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ridlbe/c++11/templates/cli/hdr/post.erb b/ridlbe/c++11/templates/cli/hdr/post.erb
index b6193c4f..6eedad84 100644
--- a/ridlbe/c++11/templates/cli/hdr/post.erb
+++ b/ridlbe/c++11/templates/cli/hdr/post.erb
@@ -1,7 +1,7 @@
 
 // generated from <%= ridl_template_path %>
 %unless no_client_proxy_hdr?
-#if defined (__TAOX11_INCLUDE_STUB_PROXY__) && __has_include("<%= client_proxy_hdr %>")
+#if defined (__TAOX11_INCLUDE_STUB_PROXY__)
 # include "<%= client_proxy_hdr %>"
 #endif
 %end
diff --git a/ridlbe/c++11/templates/cli/src/pre.erb b/ridlbe/c++11/templates/cli/src/pre.erb
index 50b056e2..568c53ae 100644
--- a/ridlbe/c++11/templates/cli/src/pre.erb
+++ b/ridlbe/c++11/templates/cli/src/pre.erb
@@ -6,8 +6,6 @@
  *        https://www.remedy.nl
  */
 
-#define __TAOX11_INCLUDE_STUB_PROXY__
-
 % pre_includes.each do |incfile|
 #include "<%= incfile %>"
 % end
diff --git a/ridlbe/c++11/writers/stubproxysource.rb b/ridlbe/c++11/writers/stubproxysource.rb
index 84f6a042..e2f64a90 100644
--- a/ridlbe/c++11/writers/stubproxysource.rb
+++ b/ridlbe/c++11/writers/stubproxysource.rb
@@ -10,6 +10,12 @@
 
 module IDL
   module Cxx11
+    class IncludeStubProxyDefineVisitor < VisitorBase
+      def visit
+        visit_template(:include_stub_proxy_define)
+      end
+    end
+
     class StubProxySourceBaseWriter < CxxCodeWriterBase
       def initialize(output = STDOUT, opts = {})
         super
@@ -250,6 +256,7 @@ def post_visit(_parser)
         properties[:pre_includes] = @default_pre_includes
         properties[:post_includes] = @default_post_includes
         properties[:includes] = @includes
+        visitor(IncludeStubProxyDefineVisitor).visit
         visitor(PreVisitor).visit
       end
 
diff --git a/ridlbe/c++11/writers/stubsource.rb b/ridlbe/c++11/writers/stubsource.rb
index 026da4d5..ab4cb6c8 100644
--- a/ridlbe/c++11/writers/stubsource.rb
+++ b/ridlbe/c++11/writers/stubsource.rb
@@ -10,6 +10,12 @@
 
 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
@@ -213,6 +219,7 @@ def post_visit(_parser)
         properties[:pre_includes] = @default_pre_includes
         properties[:post_includes] = @default_post_includes
         properties[:includes] = @includes
+        visitor(IncludeStubProxyDefineVisitor).visit unless params[:gen_client_proxy_source]
         visitor(PreVisitor).visit
       end
 
@@ -460,7 +467,6 @@ def enter_valuetype(node)
       end
     end
 
-
     class StubSourceAnyOpWriter < StubSourceBaseWriter
       def initialize(output = STDOUT, opts = {})
         super