From 7b96eb05f3ff36826e9de49b474b6f26a1d5a28f Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 7 Jun 2024 09:06:50 +0200 Subject: [PATCH] Don't add tao_corba.h here, it is already in the cli/src/pre.erb * ridlbe/c++11/writers/stubproxysource.rb: * ridlbe/c++11/writers/stubsource.rb: --- ridlbe/c++11/writers/stubproxysource.rb | 1 - ridlbe/c++11/writers/stubsource.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/ridlbe/c++11/writers/stubproxysource.rb b/ridlbe/c++11/writers/stubproxysource.rb index 3a2e9122..40b7d4b6 100644 --- a/ridlbe/c++11/writers/stubproxysource.rb +++ b/ridlbe/c++11/writers/stubproxysource.rb @@ -28,7 +28,6 @@ def initialize(output = STDOUT, opts = {}) super @default_pre_includes = [] - @default_pre_includes << 'tao/x11/base/tao_corba.h' @default_pre_includes << 'tao/x11/corba.h' @default_post_includes = [] unless params[:no_cdr_streaming] diff --git a/ridlbe/c++11/writers/stubsource.rb b/ridlbe/c++11/writers/stubsource.rb index dc60ed9e..911527cd 100644 --- a/ridlbe/c++11/writers/stubsource.rb +++ b/ridlbe/c++11/writers/stubsource.rb @@ -41,7 +41,6 @@ def initialize(output = STDOUT, opts = {}) if params[:gen_any_ops] && !params[:gen_anytypecode_source] @default_pre_includes << 'tao/AnyTypeCode/Any_Impl_T.h' end - @default_post_includes << 'tao/x11/base/tao_corba.h' unless params[:gen_stub_proxy_source] @default_post_includes << 'tao/x11/anytypecode/typecode.h' if (params[:gen_typecodes] || params[:gen_any_ops]) && !params[:gen_anytypecode_source] @default_post_includes << 'tao/x11/anytypecode/typecode_impl.h' if (params[:gen_typecodes] || params[:gen_any_ops]) && !params[:gen_anytypecode_source] end