diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 9aa2faad..e88fee0d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,7 +8,7 @@ assignees: '' --- **Version** -Your TAOX11 version from taox11/tao/x11/versionx11.h +Your TAOX11 version from taox11/tao/x11/base/versionx11.h **Describe the bug** A clear and concise description of what the bug is. diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md index 06334579..ba8a5ad3 100644 --- a/.github/ISSUE_TEMPLATE/custom.md +++ b/.github/ISSUE_TEMPLATE/custom.md @@ -8,7 +8,7 @@ assignees: '' --- **Version** -Your TAOX11 version from taox11/tao/x11/versionx11.h +Your TAOX11 version from taox11/tao/x11/base/versionx11.h **Describe the issue** Description of your issue with as much as detail as possible diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 5bcdb661..06f0a474 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -32,7 +32,7 @@ env: TAOX11_ROOT: ${{ github.workspace }} INSTALL_PREFIX: ${{ github.workspace }}/stage X11_BRANCH: master - ACETAOMPC_BRANCH: master + ACETAOMPC_BRANCH: Latest_ACE7TAO3_Micro jobs: build: diff --git a/.gitignore b/.gitignore index a1fa577e..3e4a5f44 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ ACE *C.inl *C.cpp *P.h +*P.cpp *S.h *S.inl *S.cpp diff --git a/bin/MPC/config/ridl_base_defaults.mpb b/bin/MPC/config/ridl_base_defaults.mpb index 36cc95f8..5476cfc3 100644 --- a/bin/MPC/config/ridl_base_defaults.mpb +++ b/bin/MPC/config/ridl_base_defaults.mpb @@ -24,20 +24,23 @@ project: taox11_basedefaults, taobaseidldefaults { optional(source_pre_extension) { commandflags(-GC) += AmiC commandflags(-GCa) += AmiC + commandflags(-Gcpc) += CP + commandflags(-Gatc) += A } optional(header_pre_extension) { - commandflags(!-Scp) += CP + commandflags(!-Scph) += CP commandflags(!-Ssh) += SP commandflags(-GC) += AmiC, AmiCP commandflags(-GCa) += AmiC, AmiCP + commandflags(-Gath) += A } } after -= TAO_IDL_EXE idlflags -= $(TAO_IDLFLAGS) idlflags -= -Sa -St - idlflags += -Wb,pre_include=tao/x11/pre.h \ - -Wb,post_include=tao/x11/post.h -I$(TAOX11_ROOT) + idlflags += -Wb,pre_include=tao/x11/base/pre.h \ + -Wb,post_include=tao/x11/base/post.h -I$(TAOX11_ROOT) idlflags += $(RIDLCFLAGS) -Sci -Ssi -Sa -St } diff --git a/bin/MPC/modules/IDLHelper.pm b/bin/MPC/modules/IDLHelper.pm index cc4cd233..49371854 100644 --- a/bin/MPC/modules/IDLHelper.pm +++ b/bin/MPC/modules/IDLHelper.pm @@ -81,6 +81,20 @@ sub get_output { push(@out, $1); } } + if ($flags =~ /--Gxhcpr/) { + if ($flags =~ /-Wb,stub_proxy_export_file=(\S*)/) { + push(@out, $1); + } elsif ($flags =~ /-Wb,stub_proxy_export_include=(\S*)/) { + push(@out, $1); + } + } + if ($flags =~ /--Gxhat/) { + if ($flags =~ /-Wb,anytypecode_export_file=(\S*)/) { + push(@out, $1); + } elsif ($flags =~ /-Wb,anytypecode_export_include=(\S*)/) { + push(@out, $1); + } + } if ($flags =~ /-Gxhsv/ && $flags =~ /-Wb,svnt_export_include=(\S*)/) { push(@out, $1); } diff --git a/bin/taox11_tests.lst b/bin/taox11_tests.lst index eef0bb8f..0175b9d2 100644 --- a/bin/taox11_tests.lst +++ b/bin/taox11_tests.lst @@ -178,6 +178,10 @@ tests/timebase/run_test.pl: tests/typecode/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO tests/typecode_adapter/orb_create/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO tests/typecode_adapter/resolve_ref/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO +tests/typelib/nocpp/run_test.pl: +tests/typelib/shared/run_test.pl: +tests/typelib/stdlib/run_test.pl: +tests/typelib/taox11/run_test.pl: tests/union/run_test.pl: tests/union/run_cross_tao_server.pl: tests/wchar/run_test.pl: diff --git a/docs/src/compilation.adoc b/docs/src/compilation.adoc index ca809c8b..fad9dc08 100644 --- a/docs/src/compilation.adoc +++ b/docs/src/compilation.adoc @@ -17,8 +17,8 @@ command line options should be used when invoking the RIDL compiler. + Command line options: + ----------------------------------- - -Wb,pre_include=tao/x11/pre.h - -Wb,post_include=tao/x11/post.h + -Wb,pre_include=tao/x11/base/pre.h + -Wb,post_include=tao/x11/base/post.h -I$TAOX11_ROOT -Sci -Ssi @@ -47,8 +47,8 @@ When a client needs to use <>, the following command line options should be applied to the RIDL compiler: ----------------------------------- - -Wb,pre_include=tao/x11/pre.h - -Wb,post_include=tao/x11/post.h + -Wb,pre_include=tao/x11/base/pre.h + -Wb,post_include=tao/x11/base/post.h -I$TAOX11_ROOT -Sci -Ssi diff --git a/docs/src/ridlc.adoc b/docs/src/ridlc.adoc index 166a0f9d..8981edfc 100644 --- a/docs/src/ridlc.adoc +++ b/docs/src/ridlc.adoc @@ -250,11 +250,19 @@ Sets implementation export file to generate for -Gxhimpl| ||-Wb,anytypecode_export_macro=MACRO| -Sets export macro for Any ops and TypeCode| +Sets export macro for Any and TypeCode| ||-Wb,anytypecode_export_include=FILE| -Sets export include file for Any ops and TypeCode| +Sets export include file for Any and TypeCode| + +||-Wb,stub_proxy_export_macro=MACRO| + +Sets export macro for stub proxy| + +||-Wb,stub_proxy_export_include=FILE| + +Sets export include file for stub proxy| ||-Wb,include_guard=MACRO| @@ -314,6 +322,20 @@ Generate Any and TypeCode support implementation in separate *A.cpp file off +||-Gath| + +Generate Any and TypeCode support declarations in separate *A.h file + (not generated by default)| + +off + +||-Gcpc| + +Generate stub proxy implementation in separate *CP.cpp file + (not generated by default)| + +off + ||-Gaia| Generate AnyInsert_Adapter version of the Any insert policy (not generated by default). + @@ -340,6 +362,12 @@ Generate std::ostream insertion operators (not generated by default)| off +||-Guia| + +Generate std::invalid_argument exception as part of our union generation (CORBA::BAD_PARAM by default)| + +off + ||-Gtie| Generate delegation based servant implementation support (not generated by default)| @@ -377,6 +405,20 @@ default).| off +||-Gxhcp| + +Generate export header file for stub proxy code (not generated by +default).| + +off + +||-Gxhat| + +Generate export header file for any and typecode code (not generated by +default).| + +off + ||-Gisrv| Generate implementation classes for servants (not generated by default; @@ -429,9 +471,9 @@ Suppress generation of client header file (generated by default)| off -||-Scp| +||-Scph| -Suppress generation of client proxy header file (generated by default)| +Suppress generation of stub proxy header file (generated by default)| off diff --git a/examples/log_module/my_log_module_export.h b/examples/log_module/my_log_module_export.h index 07d02b2a..40ed043c 100644 --- a/examples/log_module/my_log_module_export.h +++ b/examples/log_module/my_log_module_export.h @@ -9,7 +9,7 @@ #ifndef MY_LOG_MODULE_EXPORT_H #define MY_LOG_MODULE_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (MY_LOGGER_HAS_DLL) # define MY_LOGGER_HAS_DLL 0 diff --git a/orbsvcs/orbsvcs/naming_server/taox11_cosnaming_export.h b/orbsvcs/orbsvcs/naming_server/taox11_cosnaming_export.h index 2dcbb17e..50cef6c9 100644 --- a/orbsvcs/orbsvcs/naming_server/taox11_cosnaming_export.h +++ b/orbsvcs/orbsvcs/naming_server/taox11_cosnaming_export.h @@ -7,7 +7,7 @@ #ifndef TAOX11_COSNAMING_EXPORT_H #define TAOX11_COSNAMING_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_COSNAMING_HAS_DLL) # define TAOX11_COSNAMING_HAS_DLL 0 diff --git a/ridlbe/base/config.rb b/ridlbe/base/config.rb index d861bd60..34caddcc 100644 --- a/ridlbe/base/config.rb +++ b/ridlbe/base/config.rb @@ -22,7 +22,7 @@ def determine_taox11_version beta: 0 } - base = File.join(File.dirname(__FILE__), '..', '..', 'tao', 'x11', 'versionx11.h') + base = File.join(File.dirname(__FILE__), '..', '..', 'tao', 'x11', 'base', 'versionx11.h') File.open(base, 'r') do |file| while (line = file.gets) if VERSION_REGEXP =~ line diff --git a/ridlbe/c++11/config.rb b/ridlbe/c++11/config.rb index 41f7a871..7bc87bf3 100644 --- a/ridlbe/c++11/config.rb +++ b/ridlbe/c++11/config.rb @@ -80,6 +80,10 @@ def self.add_extended_options(ol, _idl_params) 'impl_export_file' => { description: "-Wb,impl_export_file=FILE\t\tSet implementation export file to generate for -Gxhimpl" }, 'anytypecode_export_macro' => { description: "-Wb,anytypecode_export_macro=MACRO\tSet export macro for Any ops and TypeCode" }, 'anytypecode_export_include' => { description: "-Wb,anytypecode_export_include=FILE\tSet export include file for Any ops and TypeCode" }, + 'anytypecode_export_file' => { description: "-Wb,anytypecode_export_file=FILE\t\tSet implementation export file to generate for -Gxhat" }, + 'stub_proxy_export_macro' => { description: "-Wb,stub_proxy_export_macro=MACRO\tSet export macro for stub proxy files" }, + 'stub_proxy_export_include' => { description: "-Wb,stub_proxy_export_include=FILE\tSet export include file for stub proxy files" }, + 'stub_proxy_export_file' => { description: "-Wb,stub_proxy_export_file=FILE\t\tSet implementation export file to generate for -Gxhcp" }, 'include_guard' => { description: "-Wb,include_guard=MACRO\t\tguard to prevent the generated client header file to be included" }, 'safe_include' => { description: "-Wb,safe_include=FILE\t\tinclude that should be used instead of the own generated client header file" }, 'unique_include' => { description: "-Wb,unique_include=FILE\t\tinclude that should be generated as only contents of the generated client header file" } @@ -113,7 +117,9 @@ def self.add_extended_options(ol, _idl_params) 'd' => { option_name: :gen_direct_collocation, description: "-Gd\t\t\tGenerate the code for direct collocation (default is thru-POA collocation)" }, 'atc' => { option_name: :gen_anytypecode_source, - description: "-Gatc\t\t\tGenerate Any and TypeCode support implementation in separate *A.cpp file (not generated by default)" }, + description: "-Gatc\t\t\tGenerate Any and TypeCode support in separate *A.cpp file (not generated by default)" }, + 'ath' => { option_name: :gen_anytypecode_header, + description: "-Gath\t\t\tGenerate Any and TypeCode support in separate *A.h file (not generated by default)" }, 'aia' => { option_name: :gen_anyinsert_adapter_policy, description: "-Gaia\t\t\tGenerate AnyInsert_Adapter version of the Any insert policy (not generated by default)" }, 'ce' => { option_name: :gen_corba_e, @@ -122,6 +128,8 @@ def self.add_extended_options(ol, _idl_params) description: "-Glons\t\t\tGenerate declaration for an object_traits<>::narrow specialization for local objects (not generated by default)" }, 'os' => { option_name: :gen_ostream_operators, description: "-Gos\t\t\tGenerate std::ostream insertion operators (not generated by default)" }, + 'uia' => { option_name: :gen_union_invalid_argument, + description: "-Guia\t\t\tGenerate std::invalid_argument for union API misusage (CORBA::BAD_PARAM by default)" }, 'tie' => { option_name: :gen_tie, description: "-Gtie\t\t\tGenerate delegation based servant implementation support (not generated by default)" }, 'xh' => { option_name: :gen_export, @@ -131,11 +139,17 @@ def self.add_extended_options(ol, _idl_params) 'xhsk' => { option_name: :gen_export_sk, description: "-Gxhsk\t\t\tGenerate export header file for skeleton (not generated by default)" }, 'xhsta' => { option_name: :gen_export_sta, - description: "-Gxhsta\t\t\tGenerate export header file for ami stub (not generated by default)" }, + description: "-Gxhsta\t\t\tGenerate export header file for AMI stub (not generated by default)" }, 'xhimpl' => { option_name: :gen_export_impl, description: "-Gxhimpl\t\t\tGenerate export header file for implementation code (not generated by default)" }, + 'xhcp' => { option_name: :gen_export_stub_proxy, + description: "-Gxhcp\t\t\tGenerate export header file for stub proxy (not generated by default)" }, + 'xhat' => { option_name: :gen_export_anytypecode, + description: "-Gxhat\t\t\tGenerate export header file for Any and TypeCode support (not generated by default)" }, 'isrv' => { option_name: :gen_impl_servant, description: "-Gisrv\t\t\tGenerate implementation classes for servants (not generated by default; ignored with -SS or --stubs-only)" }, + 'cpc' => { option_name: :gen_stub_proxy_source, + description: "-Gcpc\t\t\tGenerate implementation of stub proxy is separate *CP.cpp file (not generated by default)" }, } end @@ -149,6 +163,10 @@ def self.add_extended_options(ol, _idl_params) description: "-Xsta\t\t\tExport ami stub code (not exported by default)" }, 'impl' => { option_name: :export_impl, description: "-Ximpl\t\t\tExport implementation code (not exported by default)" }, + 'cp' => { option_name: :export_stub_proxy, + description: "-Xcp\t\t\tExport stub proxy code (not exported by default)" }, + 'at' => { option_name: :export_anytypecode, + description: "-Xat\t\t\tExport Any and Typecode code (not exported by default)" }, } end @@ -168,8 +186,8 @@ def self.add_extended_options(ol, _idl_params) description: "-Scc\t\t\tSuppress generation of client source file (generated by default)" }, 'ch' => { option_name: :no_client_header, description: "-Sch\t\t\tSuppress generation of client header file (generated by default)" }, - 'cp' => { option_name: :no_client_proxy, - description: "-Scp\t\t\tSuppress generation of client proxy header file (generated by default)" }, + 'cph' => { option_name: :no_stub_proxy_hdr, + description: "-Scph\t\t\tSuppress generation of stub proxy header file (generated by default)" }, 'cdr' => { option_name: :no_cdr_streaming, description: "-Scdr\t\t\tSuppress generation of CDR streaming operators (generated by default)" }, } @@ -202,7 +220,7 @@ def determine_taox11_version beta: 0 } - base = File.join(File.dirname(__FILE__), '..', '..', 'tao', 'x11', 'versionx11.h') + base = File.join(File.dirname(__FILE__), '..', '..', 'tao', 'x11', 'base', 'versionx11.h') File.open(base, 'r') do |file| while (line = file.gets) if VERSION_REGEXP =~ line @@ -328,6 +346,10 @@ def taox11_version IDL::Cxx11.check_impl_export_params(options) + IDL::Cxx11.check_anytypecode_export_params(options) + + IDL::Cxx11.check_stub_proxy_export_params(options) + # generate client stubs if requested if options[:client_stubs] IDL::Cxx11.generate_client_stubs(options) @@ -368,6 +390,14 @@ def taox11_version if options[:gen_export_impl] IDL::Cxx11.gen_impl_export(options) end + + if options[:gen_export_anytypecode] + IDL::Cxx11.gen_anytypecode_export(options) + end + + if options[:gen_export_stub_proxy] + IDL::Cxx11.gen_stub_proxy_export(options) + end end # becfg.on_process_input end # Backend.configure @@ -378,10 +408,14 @@ def self.setup_output(options) options[:output] = File.join(options[:outputdir], File.basename(options[:idlfile], idl_ext) + options[:stub_pfx]) options[:output_ami_incl] = File.join(options[:outputdir], File.basename(options[:idlfile], idl_ext) + options[:ami_pfx] + options[:stub_pfx] + options[:hdr_ext]) options[:output_src] = options[:output] + options[:src_ext] - options[:output_prx] = File.join(options[:outputdir], File.basename(options[:idlfile], idl_ext) + options[:stub_pfx] + options[:proxy_pfx] + options[:hdr_ext]) + options[:output_stub_proxy_header] = File.join(options[:outputdir], File.basename(options[:idlfile], idl_ext) + options[:stub_pfx] + options[:proxy_pfx] + options[:hdr_ext]) + options[:output_stub_proxy_source] = File.join(options[:outputdir], File.basename(options[:idlfile], idl_ext) + options[:stub_pfx] + options[:proxy_pfx] + options[:src_ext]) options[:output] << options[:hdr_ext] if options[:gen_typecodes] && options[:gen_anytypecode_source] - options[:output_atc] = File.join(options[:outputdir], File.basename(options[:idlfile], idl_ext) + options[:anytypecode_pfx] + options[:src_ext]) + options[:output_anytypecode_source] = File.join(options[:outputdir], File.basename(options[:idlfile], idl_ext) + options[:anytypecode_pfx] + options[:src_ext]) + end + if options[:gen_typecodes] && options[:gen_anytypecode_header] + options[:output_anytypecode_header] = File.join(options[:outputdir], File.basename(options[:idlfile], idl_ext) + options[:anytypecode_pfx] + options[:hdr_ext]) end end end @@ -443,6 +477,32 @@ def self.check_impl_export_params(options) end end + def self.check_stub_proxy_export_params(options) + if options.gen_export_stub_proxy || options.export_stub_proxy + unless options.stub_proxy_export_macro || options.base_export_macro + IDL.fatal("ERROR: it isn't allowed to use -Gxhcp or -Xcp without specifying the macro with -Wb,stub_proxy_export_macro=MACRO " + + 'or with -Wb,base_export_macro=MACRO_PREFIX') + end + # only in case export header generation has been explicitly enabled will + # we derive missing export parameters from base parameters + options.stub_proxy_export_macro = options.base_export_macro + '_CLIENT_PROXY' + options.export_macro_pfx unless options.stub_proxy_export_macro || options.base_export_macro.nil? + options.stub_proxy_export_include = options.base_export_include + '_stub_proxy' + options.export_header_pfx unless options.stub_proxy_export_include || options.base_export_include.nil? + end + end + + def self.check_anytypecode_export_params(options) + if options.gen_export_anytypecode || options.export_anytypecode + unless options.anytypecode_export_macro || options.base_export_macro + IDL.fatal("ERROR: it isn't allowed to use -Gxhat or -Xat without specifying the macro with -Wb,anytypecode_export_macro=MACRO " + + 'or with -Wb,base_export_macro=MACRO_PREFIX') + end + # only in case export header generation has been explicitly enabled will + # we derive missing export parameters from base parameters + options.anytypecode_export_macro = options.base_export_macro + '_ANYTYPECODE' + options.export_macro_pfx unless options.anytypecode_export_macro || options.base_export_macro.nil? + options.anytypecode_export_include = options.base_export_include + '_anytypecode' + options.export_header_pfx unless options.anytypecode_export_include || options.base_export_include.nil? + end + end + def self.generate_client_stubs(options) options[:ami] = false # schedule productions @@ -458,16 +518,28 @@ def self.generate_client_stubs(options) IDL.push_production(:stub_source, ::IDL::Cxx11::StubSourceWriter.new(co_src, options)) end end - unless options[:no_client_proxy] - if options[:output_prx] - co_prx = GenFile.new(options[:output_prx]) - IDL.push_production(:stub_proxy, ::IDL::Cxx11::StubProxyHeaderWriter.new(co_prx, options)) + unless options[:no_stub_proxy_hdr] + if options[:output_stub_proxy_header] + co_prx = GenFile.new(options[:output_stub_proxy_header]) + IDL.push_production(:stub_proxy_header, ::IDL::Cxx11::StubProxyHeaderWriter.new(co_prx, options)) + end + end + if options[:gen_stub_proxy_source] + if options[:output_stub_proxy_source] + co_prx = GenFile.new(options[:output_stub_proxy_source]) + IDL.push_production(:stub_proxy_source, ::IDL::Cxx11::StubProxySourceWriter.new(co_prx, options)) end end - if ((options[:gen_anytypecode_source] || false) && options[:gen_typecodes]) - if options[:output_atc] - co_atc = GenFile.new(options[:output_atc]) - IDL.push_production(:any_typecode, ::IDL::Cxx11::AnyTypeCodeWriter.new(co_atc, options)) + if options[:gen_anytypecode_source] && options[:gen_typecodes] + if options[:output_anytypecode_source] + co_atc = GenFile.new(options[:output_anytypecode_source]) + IDL.push_production(:any_typecode_source, ::IDL::Cxx11::AnyTypeCodeWriter.new(co_atc, options)) + end + end + if options[:gen_anytypecode_header] && options[:gen_typecodes] + if options[:output_anytypecode_header] + co_ath = GenFile.new(options[:output_anytypecode_header]) + IDL.push_production(:any_typecode_header, ::IDL::Cxx11::AnyTypeCodeHeaderWriter.new(co_ath, options)) end end end @@ -540,7 +612,7 @@ def self.generate_ami_support(options) end if options[:ami_stub_output_prx] co_prx = GenFile.new(options[:ami_stub_output_prx]) - IDL.push_production(:ami_stub_proxy, ::IDL::Cxx11::AmiStubProxyHeaderWriter.new(co_prx, options)) + IDL.push_production(:ami_stub_proxy_header, ::IDL::Cxx11::AmiStubProxyHeaderWriter.new(co_prx, options)) end end end @@ -624,6 +696,36 @@ def self.gen_impl_export(options) '-Wb,impl_export_include=FILE or -Wb,base_export_include=FILE_PREFIX') end end + + def self.gen_anytypecode_export(options) + return if IDL.has_production?(:anytypecode_export_header) + + export_file = options.anytypecode_export_file || options.anytypecode_export_include + if export_file + so = GenFile.new(File.join(options.outputdir, export_file)) + IDL.push_production( + :anytypecode_export_header, + ::IDL::Cxx11::ExportHeaderWriter.new(options.anytypecode_export_macro, export_file, so, options)) + else + IDL.fatal('ERROR: it is not allowed to use -Gxhimpl without specifying the file with -Wb,impl_export_file=FILE, ' + + '-Wb,impl_export_include=FILE or -Wb,base_export_include=FILE_PREFIX') + end + end + + def self.gen_stub_proxy_export(options) + return if IDL.has_production?(:stub_proxy_export_header) + + export_file = options.stub_proxy_export_file || options.stub_proxy_export_include + if export_file + so = GenFile.new(File.join(options.outputdir, export_file)) + IDL.push_production( + :stub_proxy_export_header, + ::IDL::Cxx11::ExportHeaderWriter.new(options.stub_proxy_export_macro, export_file, so, options)) + else + IDL.fatal('ERROR: it is not allowed to use -Gxhimpl without specifying the file with -Wb,impl_export_file=FILE, ' + + '-Wb,impl_export_include=FILE or -Wb,base_export_include=FILE_PREFIX') + end + end end # Cxx11 end # IDL diff --git a/ridlbe/c++11/templates/cli/hdr/anyop.erb b/ridlbe/c++11/templates/cli/hdr/anyop.erb index a9f1d773..12b3212e 100644 --- a/ridlbe/c++11/templates/cli/hdr/anyop.erb +++ b/ridlbe/c++11/templates/cli/hdr/anyop.erb @@ -2,9 +2,9 @@ // generated from <%= ridl_template_path %> #if !defined (__TAOX11_ANYOP_<%= scoped_cxxname.to_include_guard %>_DECL__) #define __TAOX11_ANYOP_<%= scoped_cxxname.to_include_guard %>_DECL__ -<%= anytypecode_export_macro %>void operator<<= (TAOX11_CORBA::Any &, <%= scoped_cxx_in_type %>); +<%= anytypecode_export_macro %>void operator<<= (TAOX11_CORBA::Any&, <%= scoped_cxx_in_type %>); % unless (is_pod? || is_reference?) -<%= anytypecode_export_macro %>void operator<<= (TAOX11_CORBA::Any &, <%= scoped_cxx_move_type %>); +<%= anytypecode_export_macro %>void operator<<= (TAOX11_CORBA::Any&, <%= scoped_cxx_move_type %>); % end -<%= anytypecode_export_macro %>bool operator>>= (const TAOX11_CORBA::Any &, <%= scoped_cxx_out_type %>); +<%= anytypecode_export_macro %>bool operator>>= (const TAOX11_CORBA::Any&, <%= scoped_cxx_out_type %>); #endif diff --git a/ridlbe/c++11/templates/cli/hdr/post.erb b/ridlbe/c++11/templates/cli/hdr/post.erb index 6d508d35..55f9b8d3 100644 --- a/ridlbe/c++11/templates/cli/hdr/post.erb +++ b/ridlbe/c++11/templates/cli/hdr/post.erb @@ -1,10 +1,15 @@ // generated from <%= ridl_template_path %> -% unless no_client_proxy? -#if defined (__TAOX11_INCLUDE_STUB_PROXY__) -#include "<%= client_proxy %>" +%unless no_stub_proxy_hdr? +#if !defined (TAOX11_DISABLE_INCLUDE_STUB_PROXY_HDR) && defined (__TAOX11_INCLUDE_STUB_PROXY__) && __has_include("<%= stub_proxy_hdr %>") +# include "<%= stub_proxy_hdr %>" #endif -% end +%end +%if anytypecode_hdr? +#if !defined (TAOX11_DISABLE_INCLUDE_ANYTYPECODE) && __has_include("<%= anytypecode_hdr %>") +# include "<%= anytypecode_hdr %>" +#endif +%end % if additional_post_includes? % additional_post_includes.each do |inc| diff --git a/ridlbe/c++11/templates/cli/hdr/typedef_anyop.erb b/ridlbe/c++11/templates/cli/hdr/typedef_anyop.erb index 3c71b15c..0f87f75b 100644 --- a/ridlbe/c++11/templates/cli/hdr/typedef_anyop.erb +++ b/ridlbe/c++11/templates/cli/hdr/typedef_anyop.erb @@ -7,12 +7,9 @@ #define _ALIAS_ANYOP_<%= alias_md5 %>_DECL_ #define _ALIAS_ANYOP_<%= scoped_cxxname.scope_to_cxxname %>_IMPL_ -<%= anytypecode_export_macro %> void -_any_cp_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any&, <%= scoped_cxx_in_type %>); -<%= anytypecode_export_macro %> void -_any_mv_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any&, <%= scoped_cxx_move_type %>); -<%= anytypecode_export_macro %> bool -_any_out_<%= scoped_cxxname.scope_to_cxxname %> (const TAOX11_CORBA::Any&, <%= scoped_cxx_out_type %>); +<%= anytypecode_export_macro %>void _any_cp_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any&, <%= scoped_cxx_in_type %>); +<%= anytypecode_export_macro %>void _any_mv_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any&, <%= scoped_cxx_move_type %>); +<%= anytypecode_export_macro %>bool _any_out_<%= scoped_cxxname.scope_to_cxxname %> (const TAOX11_CORBA::Any&, <%= scoped_cxx_out_type %>); /// Copying any insertion operator inline void operator<<= (TAOX11_CORBA::Any& any, <%= scoped_cxx_in_type %> _val) diff --git a/ridlbe/c++11/templates/cli/inl/union_inl.erb b/ridlbe/c++11/templates/cli/inl/union_inl.erb index 35927d44..5907902c 100644 --- a/ridlbe/c++11/templates/cli/inl/union_inl.erb +++ b/ridlbe/c++11/templates/cli/inl/union_inl.erb @@ -108,7 +108,7 @@ inline void <%= scoped_cxxname %>::_d (<%= switch_in_cxxtype %> discval) % # single member % _ndefmem = non_default_members % if all_labels_single? || (switchtype_boolean? && (!_ndefmem.empty? && _ndefmem.first.labels.size==1)) - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; % # with any other boolean switch (single member for all labels) all label changes are valid % elsif switchtype_boolean? this->disc_ = discval; @@ -128,7 +128,7 @@ inline void <%= scoped_cxxname %>::_d (<%= switch_in_cxxtype %> discval) % end break; default: - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; } } break; @@ -144,7 +144,7 @@ inline void <%= scoped_cxxname %>::_d (<%= switch_in_cxxtype %> discval) case <%= _lbl %>: % end unless _m.is_default? % end - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; default: break; } @@ -172,7 +172,7 @@ inline void <%= scoped_cxxname %>::<%= _m.cxxname %> (<%= _m.cxx_in_type %> _x11 % _lbl = _m.labels.first if (<%= _lbl == 'true' ? '!' : '' %>_x11_disc) { - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; } % end % else @@ -184,7 +184,7 @@ inline void <%= scoped_cxxname %>::<%= _m.cxxname %> (<%= _m.cxx_in_type %> _x11 case <%= _lbl %>: % end unless _m2.is_default? % end - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; default: break; % else @@ -193,7 +193,7 @@ inline void <%= scoped_cxxname %>::<%= _m.cxxname %> (<%= _m.cxx_in_type %> _x11 % end break; default: - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; % end } % end @@ -234,7 +234,7 @@ inline void <%= scoped_cxxname %>::<%= _m.cxxname %> (<%= _m.cxx_move_type %> _x % _lbl = _m.labels.first if (<%= _lbl == 'true' ? '!' : '' %>_x11_disc) { - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; } % end % else @@ -246,7 +246,7 @@ inline void <%= scoped_cxxname %>::<%= _m.cxxname %> (<%= _m.cxx_move_type %> _x case <%= _lbl %>: % end unless _m2.is_default? % end - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; default: break; % else @@ -255,7 +255,7 @@ inline void <%= scoped_cxxname %>::<%= _m.cxxname %> (<%= _m.cxx_move_type %> _x % end break; default: - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; % end } % end @@ -293,7 +293,7 @@ inline <%= _m.scoped_cxx_in_type %> <%= scoped_cxxname %>::<%= _m.cxxname %> () % _lbl = _m.labels.first if (<%= _lbl == 'true' ? '!' : '' %>this->disc_) { - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; } % end % else @@ -305,7 +305,7 @@ inline <%= _m.scoped_cxx_in_type %> <%= scoped_cxxname %>::<%= _m.cxxname %> () case <%= _lbl %>: % end unless _m2.is_default? % end - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; default: break; % else @@ -314,7 +314,7 @@ inline <%= _m.scoped_cxx_in_type %> <%= scoped_cxxname %>::<%= _m.cxxname %> () % end break; default: - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; % end } % end @@ -328,7 +328,7 @@ inline <%= _m.scoped_cxx_out_type %> <%= scoped_cxxname %>::<%= _m.cxxname %> () % _lbl = _m.labels.first if (<%= _lbl == 'true' ? '!' : '' %>this->disc_) { - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; } % end % else @@ -340,7 +340,7 @@ inline <%= _m.scoped_cxx_out_type %> <%= scoped_cxxname %>::<%= _m.cxxname %> () case <%= _lbl %>: % end unless _m2.is_default? % end - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; default: break; % else @@ -349,7 +349,7 @@ inline <%= _m.scoped_cxx_out_type %> <%= scoped_cxxname %>::<%= _m.cxxname %> () % end break; default: - throw TAOX11_NAMESPACE::CORBA::BAD_PARAM (); + throw <%= invalid_argument_exception %>; % end } % end diff --git a/ridlbe/c++11/templates/cli/prx/array_cdr.erb b/ridlbe/c++11/templates/cli/prx/array_cdr.erb index eab5dd91..6fe257b2 100644 --- a/ridlbe/c++11/templates/cli/prx/array_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/array_cdr.erb @@ -16,11 +16,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// @name CDR streaming operator specializations for <%= scoped_cxxname %> //@{ -inline TAO_CORBA::Boolean operator<< (TAO_OutputCDR &cdr, const IDL::traits<<%= scoped_cxxtype %>>::value_type &v) +inline TAO_CORBA::Boolean operator<< (TAO_OutputCDR& cdr, const IDL::traits<<%= scoped_cxxtype %>>::value_type& v) { return taox11_array_cdr<<%= cxxdim_sizes.size-1 %>U, <%= scoped_cxxtype %>::value_type, <%= cxxdim_sizes.first %>>::insert (cdr, v); } -inline TAO_CORBA::Boolean operator>> (TAO_InputCDR &cdr, IDL::traits<<%= scoped_cxxtype %>>::value_type& v) +inline TAO_CORBA::Boolean operator>> (TAO_InputCDR& cdr, IDL::traits<<%= scoped_cxxtype %>>::value_type& v) { return taox11_array_cdr<<%= cxxdim_sizes.size-1 %>U, <%= scoped_cxxtype %>::value_type, <%= cxxdim_sizes.first %>>::extract (cdr, v); } diff --git a/ridlbe/c++11/templates/cli/prx/bitmask_cdr.erb b/ridlbe/c++11/templates/cli/prx/bitmask_cdr.erb index 3df48f71..3f710ecd 100644 --- a/ridlbe/c++11/templates/cli/prx/bitmask_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/bitmask_cdr.erb @@ -15,8 +15,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// @name CDR streaming operator specializations for <%= scoped_cxxname %> //@{ -<%= stub_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, const <%= scoped_cxxname %>&); -<%= stub_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, const <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxxname %>&); //@} TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/ridlbe/c++11/templates/cli/prx/bitset_cdr.erb b/ridlbe/c++11/templates/cli/prx/bitset_cdr.erb index 632ddc43..20d947e6 100644 --- a/ridlbe/c++11/templates/cli/prx/bitset_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/bitset_cdr.erb @@ -14,8 +14,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// @name CDR streaming operator specializations for <%= scoped_cxxname %> //@{ -<%= stub_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, const <%= scoped_cxxname %>&); -<%= stub_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, const <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxxname %>&); //@} TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/ridlbe/c++11/templates/cli/prx/enum_cdr.erb b/ridlbe/c++11/templates/cli/prx/enum_cdr.erb index 3df48f71..3f710ecd 100644 --- a/ridlbe/c++11/templates/cli/prx/enum_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/enum_cdr.erb @@ -15,8 +15,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// @name CDR streaming operator specializations for <%= scoped_cxxname %> //@{ -<%= stub_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, const <%= scoped_cxxname %>&); -<%= stub_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, const <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxxname %>&); //@} TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/ridlbe/c++11/templates/cli/prx/except_cdr.erb b/ridlbe/c++11/templates/cli/prx/except_cdr.erb index 3c18b8c7..c28ab194 100644 --- a/ridlbe/c++11/templates/cli/prx/except_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/except_cdr.erb @@ -4,8 +4,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// @name CDR streaming operator specializations for <%= scoped_cxxname %> //@{ -<%= stub_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, const <%= scoped_cxxname %>&); -<%= stub_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR&, const <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR&, <%= scoped_cxxname %>&); //@} TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/ridlbe/c++11/templates/cli/prx/interface_cdr.erb b/ridlbe/c++11/templates/cli/prx/interface_cdr.erb index f5370e38..bda114fd 100644 --- a/ridlbe/c++11/templates/cli/prx/interface_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/interface_cdr.erb @@ -22,13 +22,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL % if is_abstract? %# Abstract interfaces %# -<%= stub_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, <%= scoped_cxx_in_type %>); -<%= stub_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxx_out_type %>); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR&, <%= scoped_cxx_in_type %>); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR&, <%= scoped_cxx_out_type %>); % else %# Remote interfaces %# -<%= stub_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &strm, <%= scoped_cxx_in_type %> _tao_objref); -<%= stub_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &strm, <%= scoped_cxx_out_type %> _tao_objref); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR& strm, <%= scoped_cxx_in_type %> _tao_objref); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR& strm, <%= scoped_cxx_out_type %> _tao_objref); % end //@} diff --git a/ridlbe/c++11/templates/cli/prx/pre.erb b/ridlbe/c++11/templates/cli/prx/pre.erb index 1158aff1..158bd0ae 100644 --- a/ridlbe/c++11/templates/cli/prx/pre.erb +++ b/ridlbe/c++11/templates/cli/prx/pre.erb @@ -17,8 +17,10 @@ #include "<%= incfile %>" % end % post_includes.each do |incfile| - #include "<%= incfile %>" % end +% if stub_proxy_export_include? +#include /**/ "<%= stub_proxy_export_include %>" +% end <%= taox11_version_check %> diff --git a/ridlbe/c++11/templates/cli/prx/string_cdr.erb b/ridlbe/c++11/templates/cli/prx/string_cdr.erb index 556487a7..8445986e 100644 --- a/ridlbe/c++11/templates/cli/prx/string_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/string_cdr.erb @@ -15,8 +15,8 @@ class TAOX11_NAMESPACE::Arg_Traits<<%= scoped_cxxtype %>> TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// CDR streaming methods for <%= scoped_cxxname %> -<%= stub_export_macro %>bool _cdr_in_<%= scoped_cxxname.scope_to_cxxname %> (TAO_OutputCDR &, const IDL::traits<<%= scoped_cxxtype %>>::value_type&); -<%= stub_export_macro %>bool _cdr_out_<%= scoped_cxxname.scope_to_cxxname %> (TAO_InputCDR &, IDL::traits<<%= scoped_cxxtype %>>::value_type&); +<%= stub_proxy_export_macro %>bool _cdr_in_<%= scoped_cxxname.scope_to_cxxname %> (TAO_OutputCDR &, const IDL::traits<<%= scoped_cxxtype %>>::value_type&); +<%= stub_proxy_export_macro %>bool _cdr_out_<%= scoped_cxxname.scope_to_cxxname %> (TAO_InputCDR &, IDL::traits<<%= scoped_cxxtype %>>::value_type&); #define _ALIAS_<%= scoped_cxxname.scope_to_cxxname %>_CDR_OPS_IMPL_ /// @name CDR streaming operator specializations for <%= scoped_cxxname %> diff --git a/ridlbe/c++11/templates/cli/prx/struct_cdr.erb b/ridlbe/c++11/templates/cli/prx/struct_cdr.erb index 3df48f71..86a94ebc 100644 --- a/ridlbe/c++11/templates/cli/prx/struct_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/struct_cdr.erb @@ -15,8 +15,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// @name CDR streaming operator specializations for <%= scoped_cxxname %> //@{ -<%= stub_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, const <%= scoped_cxxname %>&); -<%= stub_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR&, const <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR&, <%= scoped_cxxname %>&); //@} TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/ridlbe/c++11/templates/cli/prx/union_cdr.erb b/ridlbe/c++11/templates/cli/prx/union_cdr.erb index 3df48f71..86a94ebc 100644 --- a/ridlbe/c++11/templates/cli/prx/union_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/union_cdr.erb @@ -15,8 +15,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// @name CDR streaming operator specializations for <%= scoped_cxxname %> //@{ -<%= stub_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, const <%= scoped_cxxname %>&); -<%= stub_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR&, const <%= scoped_cxxname %>&); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR&, <%= scoped_cxxname %>&); //@} TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/ridlbe/c++11/templates/cli/prx/value_cdr.erb b/ridlbe/c++11/templates/cli/prx/value_cdr.erb index 16dad534..c59e3b86 100644 --- a/ridlbe/c++11/templates/cli/prx/value_cdr.erb +++ b/ridlbe/c++11/templates/cli/prx/value_cdr.erb @@ -18,8 +18,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// @name CDR streaming operator specializations for <%= scoped_cxxname %> //@{ -<%= stub_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, <%= scoped_cxx_in_type %>); -<%= stub_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR &, <%= scoped_cxx_out_type %>); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator<< (TAO_OutputCDR&, <%= scoped_cxx_in_type %>); +<%= stub_proxy_export_macro %>TAO_CORBA::Boolean operator>> (TAO_InputCDR&, <%= scoped_cxx_out_type %>); //@} TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/ridlbe/c++11/templates/cli/src/ami/interface_amic_cdr.erb b/ridlbe/c++11/templates/cli/src/ami/interface_amic_cdr.erb index c143f47a..bf255e3a 100644 --- a/ridlbe/c++11/templates/cli/src/ami/interface_amic_cdr.erb +++ b/ridlbe/c++11/templates/cli/src/ami/interface_amic_cdr.erb @@ -1,13 +1,13 @@ // generated from <%= ridl_template_path %> /// CDR streaming operator specializations for <%= amic_scoped_cxxname %> -TAO_CORBA::Boolean operator<< (TAO_OutputCDR &strm, TAOX11_NAMESPACE::CORBA::amic_traits<<%= scoped_cxxname %>>::ref_type _tao_objref) +TAO_CORBA::Boolean operator<< (TAO_OutputCDR& strm, TAOX11_NAMESPACE::CORBA::amic_traits<<%= scoped_cxxname %>>::ref_type _tao_objref) { TAOX11_IDL::traits::ref_type _x11_obj { std::move(_tao_objref) }; return (strm << _x11_obj); } -TAO_CORBA::Boolean operator>> (TAO_InputCDR &strm, TAOX11_NAMESPACE::CORBA::amic_traits<<%= scoped_cxxname %>>::ref_type& _tao_objref) +TAO_CORBA::Boolean operator>> (TAO_InputCDR& strm, TAOX11_NAMESPACE::CORBA::amic_traits<<%= scoped_cxxname %>>::ref_type& _tao_objref) { TAO_CORBA::Object_var obj; if (!(strm >> obj.inout ())) diff --git a/ridlbe/c++11/templates/cli/src/anytc/pre.erb b/ridlbe/c++11/templates/cli/src/anytc/pre.erb index 50b056e2..6091b9e3 100644 --- a/ridlbe/c++11/templates/cli/src/anytc/pre.erb +++ b/ridlbe/c++11/templates/cli/src/anytc/pre.erb @@ -11,11 +11,9 @@ % pre_includes.each do |incfile| #include "<%= incfile %>" % end - % includes.each do |incfile| #include "<%= incfile %>" % end - % post_includes.each do |incfile| #include "<%= incfile %>" % end diff --git a/ridlbe/c++11/templates/cli/src/enum_anyop.erb b/ridlbe/c++11/templates/cli/src/enum_anyop.erb index 964144a6..aeff078a 100644 --- a/ridlbe/c++11/templates/cli/src/enum_anyop.erb +++ b/ridlbe/c++11/templates/cli/src/enum_anyop.erb @@ -1,19 +1,13 @@ // generated from <%= ridl_template_path %> /// Any insertion operator for <%= scoped_cxxname %> -void operator<<= (TAOX11_CORBA::Any &any, <%= scoped_cxx_in_type %> _val) +void operator<<= (TAOX11_CORBA::Any& any, <%= scoped_cxx_in_type %> _val) { - TAOX11_NAMESPACE::Any_Basic_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, - TAOX11_NAMESPACE::CDR_Marshal_Policy - >::insert (any, <%= scoped_cxx_typecode %>, _val); + TAOX11_NAMESPACE::Any_Basic_Impl_T>, TAOX11_NAMESPACE::CDR_Marshal_Policy>::insert (any, <%= scoped_cxx_typecode %>, _val); } /// Any extraction operator for <%= scoped_cxxname %> -bool operator>>= (const TAOX11_CORBA::Any &any, <%= scoped_cxx_out_type %> _val) +bool operator>>= (const TAOX11_CORBA::Any& any, <%= scoped_cxx_out_type %> _val) { - return TAOX11_NAMESPACE::Any_Basic_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, - TAOX11_NAMESPACE::CDR_Marshal_Policy - >::extract (any, <%= scoped_cxx_typecode %>, _val); + return TAOX11_NAMESPACE::Any_Basic_Impl_T>, TAOX11_NAMESPACE::CDR_Marshal_Policy >::extract (any, <%= scoped_cxx_typecode %>, _val); } diff --git a/ridlbe/c++11/templates/cli/src/header.erb b/ridlbe/c++11/templates/cli/src/header.erb new file mode 100644 index 00000000..c3b5da61 --- /dev/null +++ b/ridlbe/c++11/templates/cli/src/header.erb @@ -0,0 +1,7 @@ +/** + * **** Code generated by the RIDL Compiler **** + * RIDL has been developed by: + * Remedy IT Expertise BV + * The Netherlands + * https://www.remedy.nl + */ diff --git a/ridlbe/c++11/templates/cli/src/include_stub_proxy_define.erb b/ridlbe/c++11/templates/cli/src/include_stub_proxy_define.erb new file mode 100644 index 00000000..8cc2c8a6 --- /dev/null +++ b/ridlbe/c++11/templates/cli/src/include_stub_proxy_define.erb @@ -0,0 +1,3 @@ + +#define __TAOX11_INCLUDE_STUB_PROXY__ + diff --git a/ridlbe/c++11/templates/cli/src/interface_anyop.erb b/ridlbe/c++11/templates/cli/src/interface_anyop.erb index ce9e53f3..17c47fe2 100644 --- a/ridlbe/c++11/templates/cli/src/interface_anyop.erb +++ b/ridlbe/c++11/templates/cli/src/interface_anyop.erb @@ -1,41 +1,22 @@ // generated from <%= ridl_template_path %> /// Any insertion operator for <%= scoped_cxxname %> -void operator<<= (TAOX11_CORBA::Any &any, <%= scoped_cxx_in_type %> _val) +void operator<<= (TAOX11_CORBA::Any& any, <%= scoped_cxx_in_type %> _val) { % if is_abstract? - TAOX11_NAMESPACE::Any_AbstractBase_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, - TAOX11_NAMESPACE::CDR_Marshal_Policy - >::insert (any, <%= scoped_cxx_typecode %>, std::move(_val)); + TAOX11_NAMESPACE::Any_AbstractBase_Impl_T>, TAOX11_NAMESPACE::CDR_Marshal_Policy >::insert (any, <%= scoped_cxx_typecode %>, std::move(_val)); % else - TAOX11_NAMESPACE::Any_Object_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::insert (any, <%= scoped_cxx_typecode %>, std::move(_val)); + TAOX11_NAMESPACE::Any_Object_Impl_T>,<% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::insert (any, <%= scoped_cxx_typecode %>, std::move(_val)); % end } /// Any extraction operator for <%= scoped_cxxname %> -bool operator>>= (const TAOX11_CORBA::Any &any, <%= scoped_cxx_out_type %> _val) +bool operator>>= (const TAOX11_CORBA::Any& any, <%= scoped_cxx_out_type %> _val) { % if is_abstract? - return TAOX11_NAMESPACE::Any_AbstractBase_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, - TAOX11_NAMESPACE::CDR_Marshal_Policy - >::extract (any, <%= scoped_cxx_typecode %>, _val); + return TAOX11_NAMESPACE::Any_AbstractBase_Impl_T>, TAOX11_NAMESPACE::CDR_Marshal_Policy >::extract (any, <%= scoped_cxx_typecode %>, _val); % else - return TAOX11_NAMESPACE::Any_Object_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end + return TAOX11_NAMESPACE::Any_Object_Impl_T>, <% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %> >::extract (any, <%= scoped_cxx_typecode %>, _val); % end } diff --git a/ridlbe/c++11/templates/cli/src/interface_cdr.erb b/ridlbe/c++11/templates/cli/src/interface_cdr.erb index 20e92666..d634fd0d 100644 --- a/ridlbe/c++11/templates/cli/src/interface_cdr.erb +++ b/ridlbe/c++11/templates/cli/src/interface_cdr.erb @@ -4,24 +4,24 @@ %# Abstract interfaces %# /// Abstract interface CDR streaming operator specializations -TAO_CORBA::Boolean operator<< (TAO_OutputCDR &cdr, <%= scoped_cxx_in_type %> _absref) +TAO_CORBA::Boolean operator<< (TAO_OutputCDR& cdr, <%= scoped_cxx_in_type %> _absref) { return TAOX11_CORBA::AbstractBase::_abs_marshal (cdr, std::move(_absref)); } -TAO_CORBA::Boolean operator>> (TAO_InputCDR &cdr, <%= scoped_cxx_out_type %> _absref) +TAO_CORBA::Boolean operator>> (TAO_InputCDR& cdr, <%= scoped_cxx_out_type %> _absref) { return ::<%= scoped_cxxname %>::_abs_unmarshal (cdr, _absref); } % else /// CDR streaming operator specializations for <%= scoped_cxxname %> -TAO_CORBA::Boolean operator<< (TAO_OutputCDR &strm, <%= scoped_cxx_in_type %> _tao_objref) +TAO_CORBA::Boolean operator<< (TAO_OutputCDR& strm, <%= scoped_cxx_in_type %> _tao_objref) { TAOX11_IDL::traits::ref_type _x11_obj { std::move(_tao_objref) }; return (strm << _x11_obj); } -TAO_CORBA::Boolean operator>> (TAO_InputCDR &strm, <%= scoped_cxx_out_type %> _tao_objref) +TAO_CORBA::Boolean operator>> (TAO_InputCDR& strm, <%= scoped_cxx_out_type %> _tao_objref) { TAO_CORBA::Object_var obj; if (!(strm >> obj.inout ())) diff --git a/ridlbe/c++11/templates/cli/src/interface_proxy.erb b/ridlbe/c++11/templates/cli/src/interface_proxy.erb index bf849c5a..95a99a00 100644 --- a/ridlbe/c++11/templates/cli/src/interface_proxy.erb +++ b/ridlbe/c++11/templates/cli/src/interface_proxy.erb @@ -1,10 +1,6 @@ // generated from <%= ridl_template_path %> -<%= proxy_cxxname %>::<%= proxy_cxxname %> ( - TAO_Stub *objref, - TAO_CORBA::Boolean _tao_collocated, - TAO_Abstract_ServantBase *servant, - TAO_ORB_Core *oc) : +<%= proxy_cxxname %>::<%= proxy_cxxname %> (TAO_Stub *objref, TAO_CORBA::Boolean _tao_collocated, TAO_Abstract_ServantBase *servant, TAO_ORB_Core *oc) : TAO_CORBA::Object (objref, _tao_collocated, servant, oc) % if is_derived? % _bases = ancestors.dup.find_all { |_a| !_a.is_abstract? } @@ -15,9 +11,7 @@ { } -<%= proxy_cxxname %>::<%= proxy_cxxname %> ( - TAO_IOP::IOR *ior, - TAO_ORB_Core *orb_core) : +<%= proxy_cxxname %>::<%= proxy_cxxname %> (TAO_IOP::IOR *ior, TAO_ORB_Core *orb_core) : TAO_CORBA::Object (ior, orb_core) % if is_derived? % _bases = ancestors.dup.find_all { |_a| !_a.is_abstract? } @@ -40,8 +34,7 @@ } <%= proxy_cxxname %>::_ptr_type -<%= proxy_cxxname %>::_narrow ( - TAO_CORBA::Object::_ptr_type _tao_objref) +<%= proxy_cxxname %>::_narrow (TAO_CORBA::Object::_ptr_type _tao_objref) { return TAO_TAO::Narrow_Utils<<%= proxy_cxxname %>>::narrow (_tao_objref, "<%= repository_id %>"); } diff --git a/ridlbe/c++11/templates/cli/src/pre.erb b/ridlbe/c++11/templates/cli/src/pre.erb index 50b056e2..36aaaf12 100644 --- a/ridlbe/c++11/templates/cli/src/pre.erb +++ b/ridlbe/c++11/templates/cli/src/pre.erb @@ -1,21 +1,12 @@ -/** - * **** Code generated by the RIDL Compiler **** - * RIDL has been developed by: - * Remedy IT Expertise BV - * The Netherlands - * https://www.remedy.nl - */ - -#define __TAOX11_INCLUDE_STUB_PROXY__ - +#if __has_include("tao/x11/base/tao_corba.h") +# include "tao/x11/base/tao_corba.h" +#endif % pre_includes.each do |incfile| #include "<%= incfile %>" % end - % includes.each do |incfile| #include "<%= incfile %>" % end - % post_includes.each do |incfile| #include "<%= incfile %>" % end diff --git a/ridlbe/c++11/templates/cli/src/struct_anyop.erb b/ridlbe/c++11/templates/cli/src/struct_anyop.erb index 87a1aadd..d8a0d02d 100644 --- a/ridlbe/c++11/templates/cli/src/struct_anyop.erb +++ b/ridlbe/c++11/templates/cli/src/struct_anyop.erb @@ -1,40 +1,19 @@ // generated from <%= ridl_template_path %> /// Copying any insertion operator for <%= scoped_cxxname %> -void operator<<= (TAOX11_CORBA::Any &any, <%= scoped_cxx_in_type %> _struct) +void operator<<= (TAOX11_CORBA::Any& any, <%= scoped_cxx_in_type %> _struct) { - TAOX11_NAMESPACE::Any_Dual_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::insert_copy (any, <%= scoped_cxx_typecode %>, _struct); + TAOX11_NAMESPACE::Any_Dual_Impl_T>, <% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::insert_copy (any, <%= scoped_cxx_typecode %>, _struct); } /// Non copying any insertion operator for <%= scoped_cxxname %> -void operator<<= (TAOX11_CORBA::Any &any, <%= scoped_cxx_move_type %> _struct) +void operator<<= (TAOX11_CORBA::Any& any, <%= scoped_cxx_move_type %> _struct) { - Any_Dual_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::insert (any, <%= scoped_cxx_typecode %>, std::move(_struct)); + Any_Dual_Impl_T>,<% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::insert (any, <%= scoped_cxx_typecode %>, std::move(_struct)); } /// Any extraction operator for <%= scoped_cxxname %> -bool operator>>= (const TAOX11_CORBA::Any &any, <%= scoped_cxx_out_type %> _struct) +bool operator>>= (const TAOX11_CORBA::Any& any, <%= scoped_cxx_out_type %> _struct) { - return Any_Dual_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::extract (any, <%= scoped_cxx_typecode %>, _struct); + return Any_Dual_Impl_T>,<% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::extract (any, <%= scoped_cxx_typecode %>, _struct); } diff --git a/ridlbe/c++11/templates/cli/src/typedef_anyop.erb b/ridlbe/c++11/templates/cli/src/typedef_anyop.erb index 6ecc6043..27ce6d9c 100644 --- a/ridlbe/c++11/templates/cli/src/typedef_anyop.erb +++ b/ridlbe/c++11/templates/cli/src/typedef_anyop.erb @@ -1,40 +1,16 @@ // generated from <%= ridl_template_path %> #if defined(_ALIAS_ANYOP_<%= scoped_cxxname.scope_to_cxxname %>_IMPL_) -void -_any_cp_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any& any, <%= scoped_cxx_in_type %> _val) +void _any_cp_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any& any, <%= scoped_cxx_in_type %> _val) { - TAOX11_NAMESPACE::Any_Dual_Impl_T< - IDL::traits<<%= scoped_cxxname %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::insert_copy (any, <%= scoped_cxx_typecode %>, _val); + TAOX11_NAMESPACE::Any_Dual_Impl_T>, <% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::insert_copy (any, <%= scoped_cxx_typecode %>, _val); } -void -_any_mv_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any& any, <%= scoped_cxx_move_type %> _val) +void _any_mv_in_<%= scoped_cxxname.scope_to_cxxname %> (TAOX11_CORBA::Any& any, <%= scoped_cxx_move_type %> _val) { - Any_Dual_Impl_T< - IDL::traits<<%= scoped_cxxname %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::insert (any, <%= scoped_cxx_typecode %>, std::move(_val)); + Any_Dual_Impl_T>, <% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::insert (any, <%= scoped_cxx_typecode %>, std::move(_val)); } -bool -_any_out_<%= scoped_cxxname.scope_to_cxxname %> (const TAOX11_CORBA::Any& any, <%= scoped_cxx_out_type %> _val) +bool _any_out_<%= scoped_cxxname.scope_to_cxxname %> (const TAOX11_CORBA::Any& any, <%= scoped_cxx_out_type %> _val) { - return Any_Dual_Impl_T< - IDL::traits<<%= scoped_cxxname %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::extract (any, <%= scoped_cxx_typecode %>, _val); + return Any_Dual_Impl_T>, <% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::extract (any, <%= scoped_cxx_typecode %>, _val); } #endif // _ALIAS_ANYOP_<%= scoped_cxxname.scope_to_cxxname %>_IMPL_ diff --git a/ridlbe/c++11/templates/cli/src/union_anyop.erb b/ridlbe/c++11/templates/cli/src/union_anyop.erb index 86104f93..636471a8 100644 --- a/ridlbe/c++11/templates/cli/src/union_anyop.erb +++ b/ridlbe/c++11/templates/cli/src/union_anyop.erb @@ -1,40 +1,19 @@ // generated from <%= ridl_template_path %> /// Any insertion operator for <%= scoped_cxxname %> -void operator<<= (TAOX11_CORBA::Any &any, <%= scoped_cxx_in_type %> _union) +void operator<<= (TAOX11_CORBA::Any& any, <%= scoped_cxx_in_type %> _union) { - Any_Dual_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::insert_copy (any, <%= scoped_cxx_typecode %>, _union); + Any_Dual_Impl_T>,<% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::insert_copy (any, <%= scoped_cxx_typecode %>, _union); } /// Any insertion operator for <%= scoped_cxxname %> -void operator<<= (TAOX11_CORBA::Any &any, <%= scoped_cxx_move_type %> _union) +void operator<<= (TAOX11_CORBA::Any& any, <%= scoped_cxx_move_type %> _union) { - Any_Dual_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::insert (any, <%= scoped_cxx_typecode %>, std::move(_union)); + Any_Dual_Impl_T>,<% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::insert (any, <%= scoped_cxx_typecode %>, std::move(_union)); } /// Any extraction operator for <%= scoped_cxxname %> -bool operator>>= (const TAOX11_CORBA::Any &any, <%= scoped_cxx_out_type %> _union) +bool operator>>= (const TAOX11_CORBA::Any& any, <%= scoped_cxx_out_type %> _union) { - return Any_Dual_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::extract (any, <%= scoped_cxx_typecode %>, _union); + return Any_Dual_Impl_T>,<% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::extract (any, <%= scoped_cxx_typecode %>, _union); } diff --git a/ridlbe/c++11/templates/cli/src/value_anyop.erb b/ridlbe/c++11/templates/cli/src/value_anyop.erb index a1a07615..895e5a69 100644 --- a/ridlbe/c++11/templates/cli/src/value_anyop.erb +++ b/ridlbe/c++11/templates/cli/src/value_anyop.erb @@ -1,27 +1,13 @@ // generated from <%= ridl_template_path %> /// Any insertion operator for <%= scoped_cxxname %> -void operator<<= (TAOX11_CORBA::Any &any, <%= scoped_cxx_in_type %> _val) +void operator<<= (TAOX11_CORBA::Any& any, <%= scoped_cxx_in_type %> _val) { - TAOX11_NAMESPACE::Any_Value_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::insert (any, <%= scoped_cxx_typecode %>, std::move(_val)); + TAOX11_NAMESPACE::Any_Value_Impl_T>,<% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy%<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::insert (any, <%= scoped_cxx_typecode %>, std::move(_val)); } /// Any extraction operator for <%= scoped_cxxname %> -bool operator>>= (const TAOX11_CORBA::Any &any, <%= scoped_cxx_out_type %> _val) +bool operator>>= (const TAOX11_CORBA::Any& any, <%= scoped_cxx_out_type %> _val) { - return TAOX11_NAMESPACE::Any_Value_Impl_T< - IDL::traits<<%= scoped_cxxtype %>>, -% if is_local? - TAOX11_NAMESPACE::NULL_Marshal_Policy -% else - TAOX11_NAMESPACE::CDR_Marshal_Policy -% end - >::extract (any, <%= scoped_cxx_typecode %>, _val); + return TAOX11_NAMESPACE::Any_Value_Impl_T>,<% if is_local? %>TAOX11_NAMESPACE::NULL_Marshal_Policy<% else %>TAOX11_NAMESPACE::CDR_Marshal_Policy<% end %>>::extract (any, <%= scoped_cxx_typecode %>, _val); } diff --git a/ridlbe/c++11/templates/cli/src/value_cdr.erb b/ridlbe/c++11/templates/cli/src/value_cdr.erb index eb4dc129..43b5a11f 100644 --- a/ridlbe/c++11/templates/cli/src/value_cdr.erb +++ b/ridlbe/c++11/templates/cli/src/value_cdr.erb @@ -1,13 +1,9 @@ // generated from <%= ridl_template_path %> // CDR streaming operator specializations -TAO_CORBA::Boolean operator<< (TAO_OutputCDR &strm, <%= scoped_cxx_in_type %> _vbox) +TAO_CORBA::Boolean operator<< (TAO_OutputCDR& strm, <%= scoped_cxx_in_type %> _vbox) { - return - TAOX11_CORBA::ValueBase::_obv_marshal ( - strm, - std::move(_vbox), - reinterpret_cast (std::addressof(<%= scoped_cxxname %>::_obv_unmarshal))); + return TAOX11_CORBA::ValueBase::_obv_marshal (strm, std::move(_vbox), reinterpret_cast (std::addressof(<%= scoped_cxxname %>::_obv_unmarshal))); } TAO_CORBA::Boolean operator>> (TAO_InputCDR &strm, <%= scoped_cxx_out_type %> _vbox) diff --git a/ridlbe/c++11/templates/exp/hdr/taox11_export.erb b/ridlbe/c++11/templates/exp/hdr/taox11_export.erb index 2d334b49..21feabe4 100644 --- a/ridlbe/c++11/templates/exp/hdr/taox11_export.erb +++ b/ridlbe/c++11/templates/exp/hdr/taox11_export.erb @@ -7,7 +7,7 @@ */ <%= include_guard_start %> -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" <%= taox11_version_check %> diff --git a/ridlbe/c++11/templates/srv/src/pre.erb b/ridlbe/c++11/templates/srv/src/pre.erb index 09af28ca..38b22c9f 100644 --- a/ridlbe/c++11/templates/srv/src/pre.erb +++ b/ridlbe/c++11/templates/srv/src/pre.erb @@ -11,11 +11,9 @@ % pre_includes.each do |incfile| #include "<%= incfile %>" % end - % includes.each do |incfile| #include "<%= incfile %>" % end - % post_includes.each do |incfile| #include "<%= incfile %>" % end diff --git a/ridlbe/c++11/visitorbase.rb b/ridlbe/c++11/visitorbase.rb index 5519d8f3..99059e80 100644 --- a/ridlbe/c++11/visitorbase.rb +++ b/ridlbe/c++11/visitorbase.rb @@ -33,12 +33,28 @@ def no_client_inline? params[:no_client_inline] end - def client_proxy - File.basename(params[:output_prx] || (File.basename(params[:idlfile], params[:idlext]) + params[:stub_pfx] + params[:proxy_pfx] + '.h')) + def anytypecode_hdr + File.basename(params[:output_anytypecode_header] || (File.basename(params[:idlfile], params[:idlext]) + params[:stub_pfx] + params[:anytypecode_pfx] + '.h')) end - def no_client_proxy? - params[:no_client_proxy] && params[:ami_stub_output_prx].nil? + def stub_proxy_hdr + File.basename(params[:output_stub_proxy_header] || (File.basename(params[:idlfile], params[:idlext]) + params[:stub_pfx] + params[:proxy_pfx] + '.h')) + end + + def stub_proxy_source + File.basename(params[:output_stub_proxy_source] || (File.basename(params[:idlfile], params[:idlext]) + params[:stub_pfx] + params[:proxy_pfx] + '.cpp')) + end + + def no_stub_proxy_hdr? + params[:no_stub_proxy_hdr] && params[:ami_stub_output_prx].nil? + end + + def stub_proxy_src? + params[:gen_stub_proxy_source] + end + + def anytypecode_hdr? + params[:gen_anytypecode_header] end def client_source @@ -130,17 +146,29 @@ def implementation_export_macro end def anytypecode_export_include? - !params[:anytypecode_export_include].nil? + !(params[:anytypecode_export_include] || params[:export_include]).nil? end def anytypecode_export_include - params[:anytypecode_export_include] + params[:anytypecode_export_include] || params[:export_include] end def anytypecode_export_macro params[:anytypecode_export_macro] ? params[:anytypecode_export_macro] + ' ' : self.stub_export_macro end + def stub_proxy_export_include? + !params[:stub_proxy_export_include].nil? + end + + def stub_proxy_export_include + params[:stub_proxy_export_include] + end + + def stub_proxy_export_macro + params[:stub_proxy_export_macro] ? params[:stub_proxy_export_macro] + ' ' : self.stub_export_macro + end + def skel_export_include? !(params[:skel_export_include] || params[:export_include]).nil? && params[:svnt_skeletons] end diff --git a/ridlbe/c++11/visitors/header.rb b/ridlbe/c++11/visitors/header.rb new file mode 100644 index 00000000..451f8841 --- /dev/null +++ b/ridlbe/c++11/visitors/header.rb @@ -0,0 +1,18 @@ +#-------------------------------------------------------------------- +# @file header.rb +# @author Johnny Willemsen +# +# @brief visitor class +# +# @copyright Copyright (c) Remedy IT Expertise BV +#-------------------------------------------------------------------- + +module IDL + module Cxx11 + class HeaderVisitor < VisitorBase + def visit + visit_template(:header) + end + end + end +end diff --git a/ridlbe/c++11/visitors/union.rb b/ridlbe/c++11/visitors/union.rb index 2c77b0f4..3092c13f 100644 --- a/ridlbe/c++11/visitors/union.rb +++ b/ridlbe/c++11/visitors/union.rb @@ -122,6 +122,14 @@ def switchtype node.switchtype end + def invalid_argument_exception + if params[:gen_stub_proxy_source] || params[:gen_union_invalid_argument] + 'std::invalid_argument ("")' + else + 'TAOX11_NAMESPACE::CORBA::BAD_PARAM ()' + end + end + # template mapping map_template :typecode, :typecode diff --git a/ridlbe/c++11/writers/amistubheader.rb b/ridlbe/c++11/writers/amistubheader.rb index 5f9a950c..a12b3244 100644 --- a/ridlbe/c++11/writers/amistubheader.rb +++ b/ridlbe/c++11/writers/amistubheader.rb @@ -28,8 +28,8 @@ class AmiStubHeaderWriter < AmiStubHeaderBaseWriter def initialize(output = STDOUT, opts = {}) super @default_pre_includes = [ - 'tao/x11/stddef.h', - 'tao/x11/basic_traits.h', + 'tao/x11/base/stddef.h', + 'tao/x11/base/basic_traits.h', 'tao/x11/corba.h', 'tao/x11/system_exception.h' ] @@ -90,8 +90,8 @@ def post_visit(parser) visitor(PostVisitor) do |v| v.class_eval do ### - # Overload standard #client_proxy for this visitor instance - def client_proxy + # Overload standard #stub_proxy for this visitor instance + def stub_proxy_hdr File.basename(params[:idlfile], params[:idlext]) + params[:ami_pfx] + params[:stub_pfx] + params[:proxy_pfx] + '.h' end end diff --git a/ridlbe/c++11/writers/amistubsource.rb b/ridlbe/c++11/writers/amistubsource.rb index 19519fda..6a4af941 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/anytypecodehdr.rb b/ridlbe/c++11/writers/anytypecodehdr.rb new file mode 100644 index 00000000..dc4126dc --- /dev/null +++ b/ridlbe/c++11/writers/anytypecodehdr.rb @@ -0,0 +1,169 @@ +#-------------------------------------------------------------------- +# @file anytypecodehdr.rb +# @author Johnny Willemsen +# +# @brief walker class for Any and TypeCode support +# +# @copyright Copyright (c) Remedy IT Expertise BV +#-------------------------------------------------------------------- +require 'ridlbe/c++11/writers/stubheader' +require 'ridlbe/c++11/writers/helpers/version_helper' +require 'ridlbe/c++11/writers/helpers/include_guard_helper' + +module IDL + module Cxx11 + class AnyTypeCodeHeaderBaseWriter < CxxCodeWriterBase + def initialize(output = STDOUT, opts = {}) + super + self.template_root = File.join('cli', 'hdr') + end + + attr_accessor :include_guard + end + + class AnyTypeCodeHeaderWriter < AnyTypeCodeHeaderBaseWriter + helper Cxx11::IncludeGuardHelper + + def initialize(output = STDOUT, opts = {}) + super + @default_pre_includes = [] + @default_post_includes = [] + + @include_guard = "__RIDL_#{File.basename(params[:output_anytypecode_header] || '').to_random_include_guard}_INCLUDED__" + end + + def pre_visit(parser) + visit_includes(parser) + + visit_typecodes(parser) + + super + end + + def post_visit(parser) + visit_anyops(parser) + + super + visitor(PostVisitor).visit + end + + def visit_includes(parser) + writer(AnyTypeCodeHeaderIncludeWriter, + { default_pre_includes: @default_pre_includes, + default_post_includes: @default_post_includes }) do |w| + w.include_guard = @include_guard + w.visit_nodes(parser) + end + end + + def visit_anyops(parser) + writer(StubHeaderAnyOpWriter).visit_nodes(parser) + end + + def visit_typecodes(parser) + writer(StubHeaderTypecodeWriter).visit_nodes(parser) + end + end # AnyTypeCodeHeaderWriter + + class AnyTypeCodeHeaderIncludeWriter < AnyTypeCodeHeaderBaseWriter + helper Cxx11::VersionHelper + helper Cxx11::IncludeGuardHelper + + def initialize(output = STDOUT, opts = {}) + super + @includes = [] + @default_pre_includes = params[:default_pre_includes] + @default_post_includes = params[:default_post_includes] + @default_post_includes << 'tao/x11/anytypecode/any.h' + + if params[:gen_typecodes] + if params[:gen_anytypecode_source] + @default_post_includes << 'tao/x11/anytypecode/typecode_ref.h' + else + @default_post_includes << 'tao/x11/anytypecode/typecode.h' + end + end + @default_post_includes << 'tao/x11/anytypecode/typecode_constants.h' if params[:gen_typecodes] + end + + attr_reader :includes + + def post_visit(_parser) + properties[:includes] = @includes + properties[:pre_includes] = @default_pre_includes + properties[:post_includes] = @default_post_includes + visitor(PreVisitor).visit + end + + def default_pre_includes + @default_pre_includes + end + + def default_post_includes + @default_post_includes + end + + def declare_interface(node) + return if node.is_pseudo? + end + + def enter_interface(node) + end + + def visit_exception(_node) + end + + def visit_operation(node) + end + + def visit_attribute(node) + end + + def declare_valuetype(_node) + end + + def enter_valuetype(node) + end + + def visit_valuebox(node) + end + + def enter_struct(node) + end + + def enter_union(node) + end + + def enter_exception(node) + end + + def visit_typedef(node) + end + + private + + def check_idl_type(idl_type) + idl_type = idl_type.resolved_type + case idl_type + when IDL::Type::Any + add_include('tao/x11/anytypecode/any.h') unless params[:gen_any_ops] + when IDL::Type::Servant + add_include('tao/x11/portable_server/servant_forward.h') + when IDL::Type::AbstractBase + add_post_include('tao/x11/valuetype/abstract_base.h') + when IDL::Type::WString, + IDL::Type::WChar + add_post_include('tao/x11/base/wstringwchar_ostream.h') if params[:gen_ostream_operators] + end + end + + def add_include(inc_file) + @includes << inc_file unless @includes.include?(inc_file) + end + + def add_post_include(inc_file) + @default_post_includes << inc_file unless @default_post_includes.include?(inc_file) + end + end + end # Cxx11 +end # IDL diff --git a/ridlbe/c++11/writers/anytypecodesrc.rb b/ridlbe/c++11/writers/anytypecodesrc.rb index 6e6a2583..52da1434 100644 --- a/ridlbe/c++11/writers/anytypecodesrc.rb +++ b/ridlbe/c++11/writers/anytypecodesrc.rb @@ -10,14 +10,14 @@ module IDL module Cxx11 - class AnyTypeCodeBaseWriter < CxxCodeWriterBase + class AnyTypeCodeSourceBaseWriter < CxxCodeWriterBase def initialize(output = STDOUT, opts = {}) super self.template_root = File.join('cli', 'src', 'anytc') end end - class AnyTypeCodeWriter < AnyTypeCodeBaseWriter + class AnyTypeCodeWriter < AnyTypeCodeSourceBaseWriter def initialize(output = STDOUT, opts = {}) super @default_pre_includes = [ @@ -33,7 +33,7 @@ def initialize(output = STDOUT, opts = {}) @default_pre_includes << 'tao/AnyTypeCode/Any_Impl_T.h' end @default_post_includes = [ - 'tao/x11/tao_corba.h', + 'tao/x11/base/tao_corba.h', 'tao/x11/objproxy.h', 'tao/x11/system_exception_x11.h', 'tao/x11/exception_macros.h', @@ -58,7 +58,7 @@ def post_visit(parser) end def visit_includes(parser) - writer(AnyTypeCodeIncludeWriter, + writer(AnyTypeCodeSourceIncludeWriter, { default_pre_includes: @default_pre_includes, default_post_includes: @default_post_includes }).visit_nodes(parser) end @@ -72,7 +72,7 @@ def visit_typecodes(parser) end end # AnyTypeCodeWriter - class AnyTypeCodeIncludeWriter < AnyTypeCodeBaseWriter + class AnyTypeCodeSourceIncludeWriter < AnyTypeCodeSourceBaseWriter def initialize(output = STDOUT, opts = {}) super @default_pre_includes = params[:default_pre_includes] diff --git a/ridlbe/c++11/writers/helpers/version_helper.rb b/ridlbe/c++11/writers/helpers/version_helper.rb index fbd820ce..6fb8fb4d 100644 --- a/ridlbe/c++11/writers/helpers/version_helper.rb +++ b/ridlbe/c++11/writers/helpers/version_helper.rb @@ -11,7 +11,7 @@ module IDL module Cxx11 module VersionHelper def taox11_version_header - 'tao/x11/versionx11.h' + 'tao/x11/base/versionx11.h' end def taox11_version diff --git a/ridlbe/c++11/writers/stubheader.rb b/ridlbe/c++11/writers/stubheader.rb index f7971539..4d00747a 100644 --- a/ridlbe/c++11/writers/stubheader.rb +++ b/ridlbe/c++11/writers/stubheader.rb @@ -27,22 +27,24 @@ class StubHeaderWriter < StubHeaderBaseWriter def initialize(output = STDOUT, opts = {}) super @default_pre_includes = [ - 'tao/x11/stddef.h', - 'tao/x11/basic_traits.h', - 'tao/x11/corba.h' + 'tao/x11/base/stddef.h', + 'tao/x11/base/basic_traits.h' ] - @default_pre_includes << 'tao/x11/orb.h' unless params[:no_orb_include] + @default_pre_includes << 'tao/x11/corba.h' unless params[:gen_stub_proxy_source] @default_post_includes = [] - @default_post_includes << 'tao/x11/anytypecode/any.h' if params[:gen_any_ops] - if params[:gen_typecodes] - if params[:gen_anytypecode_source] - @default_post_includes << 'tao/x11/anytypecode/typecode_ref.h' - else - @default_post_includes << 'tao/x11/anytypecode/typecode.h' + + unless params[:output_anytypecode_header] + @default_post_includes << 'tao/x11/anytypecode/any.h' if params[:gen_any_ops] + if params[:gen_typecodes] + if params[:gen_anytypecode_source] + @default_post_includes << 'tao/x11/anytypecode/typecode_ref.h' + else + @default_post_includes << 'tao/x11/anytypecode/typecode.h' + end end + @default_post_includes << 'tao/x11/anytypecode/typecode_constants.h' if params[:gen_typecodes] end - @default_post_includes << 'tao/x11/anytypecode/typecode_constants.h' if params[:gen_typecodes] @include_guard = "__RIDL_#{File.basename(params[:output] || '').to_random_include_guard}_INCLUDED__" @@ -329,11 +331,11 @@ def visit_includes(parser) end def visit_anyops(parser) - writer(StubHeaderAnyOpWriter).visit_nodes(parser) + writer(StubHeaderAnyOpWriter).visit_nodes(parser) unless params[:gen_anytypecode_header] end def visit_typecodes(parser) - writer(StubHeaderTypecodeWriter).visit_nodes(parser) + writer(StubHeaderTypecodeWriter).visit_nodes(parser) unless params[:gen_anytypecode_header] end def visit_idl_traits(parser) @@ -382,6 +384,8 @@ def declare_interface(node) def enter_interface(node) return if node.is_pseudo? + add_pre_include('tao/x11/orb.h') unless params[:no_orb_include] + add_post_include('tao/x11/object_ostream.h') unless node.is_abstract? @@ -431,7 +435,8 @@ def enter_struct(node) end def enter_union(node) - add_include('tao/x11/system_exception.h') + add_include('tao/x11/system_exception.h') unless params[:gen_stub_proxy_source] + add_pre_include('stdexcept') if params[:gen_stub_proxy_source] node.members.each { |m| check_idl_type(m.idltype) } end @@ -451,21 +456,21 @@ def visit_typedef(node) when IDL::Type::Fixed add_include('tao/x11/fixed_t.h') when IDL::Type::Sequence - add_include('tao/x11/bounded_vector_t.h') if idl_type.size.to_i.positive? - add_include('tao/x11/bounded_type_traits_t.h') if idl_type.size.to_i.positive? + add_include('tao/x11/base/bounded_vector_t.h') if idl_type.size.to_i.positive? + add_include('tao/x11/base/bounded_type_traits_t.h') if idl_type.size.to_i.positive? check_idl_type(idl_type.basetype) when IDL::Type::Map add_include('map') - add_include('tao/x11/bounded_map_t.h') if idl_type.size.to_i.positive? - add_include('tao/x11/bounded_type_traits_t.h') if idl_type.size.to_i.positive? + add_include('tao/x11/base/bounded_map_t.h') if idl_type.size.to_i.positive? + add_include('tao/x11/base/bounded_type_traits_t.h') if idl_type.size.to_i.positive? check_idl_type(idl_type.keytype) check_idl_type(idl_type.valuetype) when IDL::Type::Array check_idl_type(idl_type.basetype) when IDL::Type::String, IDL::Type::WString - add_include('tao/x11/bounded_string_t.h') if idl_type.size.to_i.positive? - add_include('tao/x11/bounded_type_traits_t.h') if idl_type.size.to_i.positive? + add_include('tao/x11/base/bounded_string_t.h') if idl_type.size.to_i.positive? + add_include('tao/x11/base/bounded_type_traits_t.h') if idl_type.size.to_i.positive? check_idl_type(idl_type) end end @@ -487,7 +492,7 @@ def check_idl_type(idl_type) add_post_include('tao/x11/valuetype/abstract_base.h') when IDL::Type::WString, IDL::Type::WChar - add_post_include('tao/x11/wstringwchar_ostream.h') if params[:gen_ostream_operators] + add_post_include('tao/x11/base/wstringwchar_ostream.h') if params[:gen_ostream_operators] end end @@ -498,6 +503,10 @@ def add_include(inc_file) def add_post_include(inc_file) @default_post_includes << inc_file unless @default_post_includes.include?(inc_file) end + + def add_pre_include(inc_file) + @default_pre_includes << inc_file unless @default_pre_includes.include?(inc_file) + end end class StubHeaderIDLTraitsWriter < StubHeaderBaseWriter diff --git a/ridlbe/c++11/writers/stubproxy.rb b/ridlbe/c++11/writers/stubproxyheader.rb similarity index 97% rename from ridlbe/c++11/writers/stubproxy.rb rename to ridlbe/c++11/writers/stubproxyheader.rb index 47119bcb..853a7ca4 100644 --- a/ridlbe/c++11/writers/stubproxy.rb +++ b/ridlbe/c++11/writers/stubproxyheader.rb @@ -1,8 +1,8 @@ #-------------------------------------------------------------------- -# @file stubproxy.rb +# @file stubproxyheader.rb # @author Martin Corino # -# @brief walker class for stub header +# @brief walker class for stub proxy header # # @copyright Copyright (c) Remedy IT Expertise BV #-------------------------------------------------------------------- @@ -30,8 +30,10 @@ def initialize(output = STDOUT, opts = {}) @default_post_includes = [] end + @object_varout = false + def visit_nodes(parser) - @include_guard = "__RIDL_#{File.basename(params[:output_prx] || '').to_random_include_guard}_INCLUDED__" + @include_guard = "__RIDL_#{File.basename(params[:output_stub_proxy_header] || '').to_random_include_guard}_INCLUDED__" super visitor(PostVisitor).visit end @@ -73,6 +75,9 @@ def enter_interface(node) super return if node.is_local? || node.is_pseudo? || node.is_abstract? + # varout generation is only necessary for interfaces + @object_varout = true + println printiln('// generated from StubProxyHeaderWriter#enter_interface') visitor(InterfaceVisitor).visit_pre(node) @@ -101,7 +106,7 @@ def visit_cdr(parser) end def visit_obj_var_out_specializations(parser) - writer(StubProxyHeaderVarOutWriter).visit_nodes(parser) + writer(StubProxyHeaderVarOutWriter).visit_nodes(parser) if @object_varout end def visit_obj_ref_traits_specializations(parser) diff --git a/ridlbe/c++11/writers/stubproxysource.rb b/ridlbe/c++11/writers/stubproxysource.rb new file mode 100644 index 00000000..a2f5ac0b --- /dev/null +++ b/ridlbe/c++11/writers/stubproxysource.rb @@ -0,0 +1,478 @@ +#-------------------------------------------------------------------- +# @file stubproxysource.rb +# @author Johnny Willemsen +# +# @brief walker class for stub proxy source +# +# @copyright Copyright (c) Remedy IT Expertise BV +#-------------------------------------------------------------------- +require 'ridlbe/c++11/writerbase' + +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 + self.template_root = File.join('cli', 'src') + end + end + + class StubProxySourceWriter < StubProxySourceBaseWriter + 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] + @default_pre_includes << 'tao/CDR.h' + @default_post_includes << 'tao/x11/cdr_long_double.h' + end + end + + # Object traits are only required for interfaces and valuetypes + @object_traits_specializations = false + # Proxy implementation is only required for interfaces + @proxy_impl = false + + def enter_interface(node) + super + + @object_traits_specializations = true + + return if node.is_local? || node.is_pseudo? || node.is_abstract? + + @proxy_impl = true + end + + def enter_valuetype(node) + @object_traits_specializations = true + super + end + + def pre_visit(parser) + visit_includes(parser) + + super + end + + def post_visit(parser) + # stub proxy implementations + if @proxy_impl + visit_proxy_implementation(parser) + end + + if @object_traits_specializations + # Object ref traits specializations + visit_proxy_object_ref_traits_specializations(parser) unless params[:no_stub_proxy_hdr] + end + + # CDR operators + visit_cdr(parser) unless params[:no_cdr_streaming] + + super + visitor(PostVisitor).visit + end + + def visit_cdr(parser) + writer(StubProxySourceCDRWriter).visit_nodes(parser) + end + + def visit_includes(parser) + writer(StubProxySourceIncludeWriter, + { default_pre_includes: @default_pre_includes, + default_post_includes: @default_post_includes }).visit_nodes(parser) + end + + def visit_proxy_object_ref_traits_specializations(parser) + writer(StubSourceProxyObjRefTraitsWriter).visit_nodes(parser) + end + + def visit_proxy_implementation(parser) + writer(StubProxySourceProxyImplWriter).visit_nodes(parser) + end + end # StubProxySourceWriter + + class StubProxySourceCDRWriter < StubProxySourceBaseWriter + def initialize(output = STDOUT, opts = {}) + super + # CDR operators are generated outside the scopes of the IDL defined types + # in a common naming scope so do not track scopes such that all typenames + # will always be generated fully scoped. + self.disable_scope_tracking = true + end + + def pre_visit(parser) + super + printiln('// generated from StubProxySourceCDRWriter#pre_visit') + println('TAO_BEGIN_VERSIONED_NAMESPACE_DECL') + end + + def post_visit(parser) + println + println('TAO_END_VERSIONED_NAMESPACE_DECL') + super + end + + def enter_interface(node) + return if node.is_local? || node.is_pseudo? || params[:no_cdr_streaming] + + visitor(InterfaceVisitor).visit_cdr(node) + end + + def enter_valuetype(node) + return if node.is_local? || params[:no_cdr_streaming] + + visitor(ValuetypeVisitor).visit_cdr(node) + end + + def visit_valuebox(node) + return if node.is_local? || params[:no_cdr_streaming] + + visitor(ValueboxVisitor).visit_cdr(node) + end + + def enter_struct(node) + return if node.is_local? || params[:no_cdr_streaming] + + visitor(StructVisitor).visit_cdr(node) + end + + def enter_union(node) + return if node.is_local? || params[:no_cdr_streaming] + + visitor(UnionVisitor).visit_cdr(node) + end + + def enter_exception(node) + return if params[:no_cdr_streaming] + + visitor(ExceptionVisitor).visit_cdr(node) + end + + def visit_enum(node) + return if params[:no_cdr_streaming] + + visitor(EnumVisitor).visit_cdr(node) + end + + def visit_bitmask(node) + return if params[:no_cdr_streaming] + + visitor(BitmaskVisitor).visit_cdr(node) + end + + def visit_bitset(node) + return if params[:no_cdr_streaming] + + visitor(BitsetVisitor).visit_cdr(node) + end + + def visit_typedef(node) + return if node.is_local? || params[:no_cdr_streaming] + # nothing to do if this is just an alias for another defined type + return if node.idltype.is_a?(IDL::Type::ScopedName) || node.idltype.resolved_type.is_standard_type? + + idl_type = node.idltype.resolved_type + case idl_type + when IDL::Type::String, IDL::Type::WString + visitor(StringVisitor).visit_cdr(node) # only bounded, unbounded is standard_type + end + end + end # StubProxySourceCDRWriter + + class StubProxySourceProxyImplWriter < StubProxySourceBaseWriter + def initialize(output = STDOUT, opts = {}) + super + end + + def enter_module(node) + super + println + printiln('// generated from StubProxySourceProxyImplWriter') + printiln('namespace ' + node.cxxname) + printiln('{') + inc_nest + end + + def leave_module(node) + dec_nest + printiln("} // namespace #{node.cxxname}") + println + super + end + + def enter_interface(node) + super + return if node.is_local? || node.is_pseudo? || node.is_abstract? + + visitor(InterfaceVisitor).visit_proxy(node) + println + end + end + + class StubSourceProxyObjRefTraitsWriter < StubProxySourceBaseWriter + def initialize(output = STDOUT, opts = {}) + super + end + + def pre_visit(_parser) + println + printiln('// generated from StubSourceProxyObjRefTraitsWriter#pre_visit') + end + + def post_visit(parser); end + + def enter_interface(node) + return if node.is_local? || node.is_pseudo? || node.is_abstract? + + visitor(InterfaceVisitor).visit_object_ref_traits(node) + end + end + + class StubProxySourceIncludeWriter < StubProxySourceBaseWriter + def initialize(output = STDOUT, opts = {}) + super + @default_pre_includes = params[:default_pre_includes] + @default_post_includes = params[:default_post_includes] + @includes = [] + end + + def generate_typecodes? + params[:gen_typecodes] && !params[:gen_anytypecode_source] + end + + def generate_anyops? + params[:gen_any_ops] && !params[:gen_anytypecode_source] + end + + attr_reader :includes + + 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).visit + end + + def enter_interface(node) + add_pre_include('tao/Object_T.h') unless node.is_local? + add_pre_include('tao/Invocation_Adapter.h') unless node.is_local? + if generate_typecodes? + add_pre_include('tao/AnyTypeCode/Objref_TypeCode_Static.h') + end + add_post_include('tao/x11/anytypecode/any_basic_impl_t.h') if generate_anyops? + add_post_include('tao/x11/exception_macros.h') unless node.is_local? + return if node.is_local? || node.is_pseudo? || node.is_abstract? + + add_post_include('tao/x11/objproxy.h') + check_idl_type(node.idltype) + end + + def visit_operation(node) + return if node.enclosure.is_local? || (node.enclosure.respond_to?(:is_pseudo?) && node.enclosure.is_pseudo?) || (node.enclosure.respond_to?(:is_abstract?) && node.enclosure.is_abstract?) + + check_idl_type(node.idltype) + node.params.each { |parm| check_idl_type(parm.idltype) } + unless node.raises.empty? + add_include('tao/x11/user_exception_proxy_in_t.h') + add_include('tao/x11/user_exception_proxy_out.h') + add_include('tao/Exception_Data.h') + end + end + + def visit_attribute(node) + return if node.enclosure.is_local? || (node.enclosure.respond_to?(:is_pseudo?) && node.enclosure.is_pseudo?) || (node.enclosure.respond_to?(:is_abstract?) && node.enclosure.is_abstract?) + + check_idl_type(node.idltype) + add_include('tao/x11/basic_arguments.h') unless node.readonly ## for void return of setter + unless node.get_raises.empty? && node.set_raises.empty? + add_include('tao/x11/user_exception_proxy_in_t.h') + add_include('tao/x11/user_exception_proxy_out.h') + add_include('tao/Exception_Data.h') + end + end + + def enter_valuetype(node) + if generate_typecodes? + add_pre_include('tao/AnyTypeCode/Value_TypeCode_Static.h') + add_pre_include('tao/AnyTypeCode/TypeCode_Value_Field.h') + add_pre_include('tao/AnyTypeCode/Recursive_Type_TypeCode.h') if node.is_recursive? + end + add_post_include('tao/x11/anytypecode/any_basic_impl_t.h') if generate_anyops? + add_post_include('tao/x11/anytypecode/typecode.h') # in case not added yet + add_post_include('tao/x11/valuetype/valuetype_proxies.h') # after typecode includes + return if node.is_abstract? || node.is_local? + + node.state_members.each { |m| check_idl_type(m.idltype) } + end + + def visit_valuebox(node) + if generate_typecodes? + add_pre_include('tao/AnyTypeCode/Alias_TypeCode_Static.h') + end + add_post_include('tao/x11/anytypecode/any_basic_impl_t.h') if generate_anyops? + add_post_include('tao/x11/anytypecode/typecode.h') # in case not added yet + add_post_include('tao/x11/valuetype/valuetype_proxies.h') # after typecode includes + return if node.is_local? + + check_idl_type(node.boxed_type) + end + + def enter_struct(node) + if generate_typecodes? + add_pre_include('tao/AnyTypeCode/Struct_TypeCode_Static.h') + add_pre_include('tao/AnyTypeCode/TypeCode_Struct_Field.h') + add_pre_include('tao/AnyTypeCode/Recursive_Type_TypeCode.h') if node.is_recursive? + end + add_post_include('tao/x11/anytypecode/any_dual_impl_t.h') if generate_anyops? + return if node.is_local? + + # arg template included in P.h + node.members.each { |m| check_idl_type(m.idltype) } + end + + def enter_union(node) + if generate_typecodes? + add_pre_include('tao/AnyTypeCode/Union_TypeCode_Static.h') + add_post_include('tao/x11/anytypecode/typecode_case_t.h') + add_pre_include('tao/AnyTypeCode/Recursive_Type_TypeCode.h') if node.is_recursive? + end + add_post_include('tao/x11/anytypecode/any_dual_impl_t.h') if generate_anyops? + return if node.is_local? + + # arg template included in P.h + node.members.each { |m| check_idl_type(m.idltype) } + end + + def enter_exception(node) + if generate_typecodes? + add_pre_include('tao/AnyTypeCode/Struct_TypeCode_Static.h') + add_pre_include('tao/AnyTypeCode/TypeCode_Struct_Field.h') + end + add_post_include('tao/x11/anytypecode/any_dual_impl_t.h') if generate_anyops? + # arg template included in P.h + node.members.each { |m| check_idl_type(m.idltype) } + end + + def visit_enum(_node) + if generate_typecodes? + add_pre_include('tao/AnyTypeCode/Enum_TypeCode_Static.h') + end + add_post_include('tao/x11/anytypecode/any_basic_impl_t.h') if generate_anyops? + end + + def visit_bitmask(_node) + if generate_typecodes? + add_pre_include('tao/AnyTypeCode/Enum_TypeCode_Static.h') + end + add_post_include('tao/x11/anytypecode/any_basic_impl_t.h') if generate_anyops? + end + + def visit_bitset(_node) + if generate_typecodes? + add_pre_include('tao/AnyTypeCode/Enum_TypeCode_Static.h') + end + add_post_include('tao/x11/anytypecode/any_basic_impl_t.h') if generate_anyops? + end + + def visit_typedef(node) + return if node.idltype.resolved_type.is_a?(IDL::Type::Native) + + add_pre_include('tao/AnyTypeCode/Alias_TypeCode_Static.h') if generate_typecodes? + # just an alias or a sequence, array or fixed? + unless node.idltype.is_a?(IDL::Type::ScopedName) + add_post_include('tao/x11/anytypecode/any_dual_impl_t.h') if generate_anyops? + if generate_typecodes? + idl_type = node.idltype.resolved_type + case idl_type + when IDL::Type::String, + IDL::Type::WString + add_pre_include('tao/AnyTypeCode/String_TypeCode_Static.h') + when IDL::Type::Sequence, + IDL::Type::Array + add_pre_include('tao/AnyTypeCode/Sequence_TypeCode_Static.h') + unless node.is_local? + check_idl_type(idl_type) + check_idl_type(idl_type.basetype) + end + when IDL::Type::Map + add_pre_include('tao/AnyTypeCode/Sequence_TypeCode_Static.h') + unless node.is_local? + check_idl_type(idl_type) + check_idl_type(idl_type.basetype) + end + end + end + end + end + + private + + def check_idl_type(idl_type) + idl_type = idl_type.resolved_type + case idl_type + when IDL::Type::Char, + IDL::Type::Boolean, + IDL::Type::WChar, + IDL::Type::Octet + add_include('tao/x11/special_basic_arguments.h') unless params[:no_cdr_streaming] + when IDL::Type::LongDouble + add_include('tao/x11/basic_arguments.h') unless params[:no_cdr_streaming] + when IDL::Type::Integer, + IDL::Type::Double, + IDL::Type::Float, + IDL::Type::Void + add_include('tao/x11/basic_arguments.h') unless params[:no_cdr_streaming] + when IDL::Type::String, + IDL::Type::WString + add_include('tao/x11/basic_arguments.h') unless params[:no_cdr_streaming] + when IDL::Type::Object, + IDL::Type::Interface, + IDL::Type::Component + add_include('tao/x11/stub_arg_traits.h') unless params[:no_cdr_streaming] + when IDL::Type::Sequence + # arg template included in P.h + check_idl_type(idl_type.basetype) + when IDL::Type::Map + # arg template included in P.h + check_idl_type(idl_type.keytype) + check_idl_type(idl_type.valuetype) + when IDL::Type::Array + # arg template included in P.h + check_idl_type(idl_type.basetype) + when IDL::Type::Servant + add_include('tao/x11/portable_server/servantbase.h') + end + end + + def add_include(inc_file) + @includes << inc_file unless @includes.include?(inc_file) || + @default_pre_includes.include?(inc_file) || + @default_post_includes.include?(inc_file) + end + + def add_pre_include(inc_file) + @default_pre_includes << inc_file unless @includes.include?(inc_file) || + @default_pre_includes.include?(inc_file) || + @default_post_includes.include?(inc_file) + end + + def add_post_include(inc_file) + @default_post_includes << inc_file unless @includes.include?(inc_file) || + @default_pre_includes.include?(inc_file) || + @default_post_includes.include?(inc_file) + end + end + + end +end diff --git a/ridlbe/c++11/writers/stubsource.rb b/ridlbe/c++11/writers/stubsource.rb index 9a771c9f..dc60ed9e 100644 --- a/ridlbe/c++11/writers/stubsource.rb +++ b/ridlbe/c++11/writers/stubsource.rb @@ -25,9 +25,14 @@ def initialize(output = STDOUT, opts = {}) # Object traits are only required for interfaces and valuetypes @object_traits_specializations = false + # Proxy implementation is only required for interfaces + @proxy_impl = false + @default_pre_includes = [] - unless params[:no_cdr_streaming] + @default_post_includes = [] + unless params[:no_cdr_streaming] || params[:gen_stub_proxy_source] @default_pre_includes << 'tao/CDR.h' + @default_post_includes << 'tao/x11/cdr_long_double.h' end if params[:gen_typecodes] && !params[:gen_anytypecode_source] @default_pre_includes << 'tao/AnyTypeCode/TypeCode.h' @@ -36,9 +41,7 @@ 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/tao_corba.h' - ] + @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 @@ -53,7 +56,7 @@ def pre_visit(parser) def post_visit(parser) # stub proxy implementations - visit_proxy(parser) unless params[:no_client_proxy] + visit_proxy_implementation(parser) if @proxy_impl && !params[:gen_stub_proxy_source] visit_anyops(parser) if params[:gen_any_ops] && !params[:gen_anytypecode_source] @@ -62,11 +65,11 @@ def post_visit(parser) visit_object_traits_specializations(parser) # Object ref traits specializations - visit_proxy_object_ref_traits_specializations(parser) unless params[:no_client_proxy] + visit_proxy_object_ref_traits_specializations(parser) unless params[:no_stub_proxy_hdr] || params[:gen_stub_proxy_source] end # CDR operators - visit_cdr(parser) unless params[:no_cdr_streaming] + visit_cdr(parser) unless params[:gen_stub_proxy_source] super visitor(PostVisitor).visit @@ -89,9 +92,14 @@ def leave_module(node) end def enter_interface(node) - @object_traits_specializations = true return if node.is_abstract? + if !node.is_local? && !node.is_pseudo? && !node.is_abstract? + @proxy_impl = true + end + + @object_traits_specializations = true + visitor(InterfaceVisitor).visit_pre(node) end @@ -141,10 +149,6 @@ def visit_includes(parser) default_post_includes: @default_post_includes }).visit_nodes(parser) end - def visit_proxy(parser) - writer(StubProxySourceWriter).visit_nodes(parser) unless params[:no_client_proxy] - end - def visit_anyops(parser) writer(StubSourceAnyOpWriter).visit_nodes(parser) end @@ -153,17 +157,21 @@ def visit_object_traits_specializations(parser) writer(StubSourceObjTraitsWriter).visit_nodes(parser) end - def visit_proxy_object_ref_traits_specializations(parser) - writer(StubSourceProxyObjRefTraitsWriter).visit_nodes(parser) + def visit_proxy_implementation(parser) + writer(StubProxySourceProxyImplWriter).visit_nodes(parser) unless params[:gen_stub_proxy_source] end - def visit_cdr(parser) - writer(StubSourceCDRWriter).visit_nodes(parser) unless params[:no_cdr_streaming] + def visit_proxy_object_ref_traits_specializations(parser) + writer(StubSourceProxyObjRefTraitsWriter).visit_nodes(parser) end def visit_typecodes(parser) writer(StubSourceTypecodeWriter).visit_nodes(parser) end + + def visit_cdr(parser) + writer(StubProxySourceCDRWriter).visit_nodes(parser) unless params[:no_cdr_streaming] + end end # StubSourceWriter class StubSourceIncludeWriter < StubSourceBaseWriter @@ -188,6 +196,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).visit end @@ -202,6 +212,7 @@ def enter_interface(node) return if node.is_local? || node.is_pseudo? || node.is_abstract? add_post_include('tao/x11/objproxy.h') + check_idl_type(node.idltype) end @@ -352,21 +363,21 @@ def check_idl_type(idl_type) IDL::Type::Boolean, IDL::Type::WChar, IDL::Type::Octet - add_include('tao/x11/special_basic_arguments.h') unless params[:no_cdr_streaming] + add_include('tao/x11/special_basic_arguments.h') unless params[:no_cdr_streaming] || params[:gen_stub_proxy_source] when IDL::Type::LongDouble - add_include('tao/x11/basic_arguments.h') unless params[:no_cdr_streaming] + add_include('tao/x11/basic_arguments.h') unless params[:no_cdr_streaming] || params[:gen_stub_proxy_source] when IDL::Type::Integer, IDL::Type::Double, IDL::Type::Float, IDL::Type::Void - add_include('tao/x11/basic_arguments.h') unless params[:no_cdr_streaming] + add_include('tao/x11/basic_arguments.h') unless params[:no_cdr_streaming] || params[:gen_stub_proxy_source] when IDL::Type::String, IDL::Type::WString - add_include('tao/x11/basic_arguments.h') unless params[:no_cdr_streaming] + add_include('tao/x11/basic_arguments.h') unless params[:no_cdr_streaming] || params[:gen_stub_proxy_source] when IDL::Type::Object, IDL::Type::Interface, IDL::Type::Component - add_include('tao/x11/stub_arg_traits.h') unless params[:no_cdr_streaming] + add_include('tao/x11/stub_arg_traits.h') unless params[:no_cdr_streaming] || params[:gen_stub_proxy_source] when IDL::Type::Sequence # arg template included in P.h check_idl_type(idl_type.basetype) @@ -401,36 +412,6 @@ def add_post_include(inc_file) end end - class StubProxySourceWriter < StubSourceBaseWriter - def initialize(output = STDOUT, opts = {}) - super - end - - def enter_module(node) - super - println - printiln('// generated from StubProxySourceWriter#enter_module') - printiln('namespace ' + node.cxxname) - printiln('{') - inc_nest - end - - def leave_module(node) - dec_nest - printiln("} // namespace #{node.cxxname}") - println - super - end - - def enter_interface(node) - super - return if node.is_local? || node.is_pseudo? || node.is_abstract? - - visitor(InterfaceVisitor).visit_proxy(node) - println - end - end # StubProxySourceWriter - class StubSourceObjTraitsWriter < StubSourceBaseWriter def initialize(output = STDOUT, opts = {}) super @@ -464,113 +445,6 @@ def enter_valuetype(node) end end - class StubSourceProxyObjRefTraitsWriter < StubSourceBaseWriter - def initialize(output = STDOUT, opts = {}) - super - end - - def pre_visit(_parser) - println - printiln('// generated from StubSourceProxyObjRefTraitsWriter#pre_visit') - end - - def post_visit(parser); end - - def enter_interface(node) - return if node.is_local? || node.is_pseudo? || node.is_abstract? - - visitor(InterfaceVisitor).visit_object_ref_traits(node) - end - end - - class StubSourceCDRWriter < StubSourceBaseWriter - def initialize(output = STDOUT, opts = {}) - super - # CDR operators are generated outside the scopes of the IDL defined types - # in a common naming scope so do not track scopes such that all typenames - # will always be generated fully scoped. - self.disable_scope_tracking = true - end - - def pre_visit(parser) - super - printiln('// generated from StubSourceCDRWriter#pre_visit') - println('TAO_BEGIN_VERSIONED_NAMESPACE_DECL') - end - - def post_visit(parser) - println - println('TAO_END_VERSIONED_NAMESPACE_DECL') - super - end - - def enter_interface(node) - return if node.is_local? || node.is_pseudo? || params[:no_cdr_streaming] - - visitor(InterfaceVisitor).visit_cdr(node) - end - - def enter_valuetype(node) - return if node.is_local? || params[:no_cdr_streaming] - - visitor(ValuetypeVisitor).visit_cdr(node) - end - - def visit_valuebox(node) - return if node.is_local? || params[:no_cdr_streaming] - - visitor(ValueboxVisitor).visit_cdr(node) - end - - def enter_struct(node) - return if node.is_local? || params[:no_cdr_streaming] - - visitor(StructVisitor).visit_cdr(node) - end - - def enter_union(node) - return if node.is_local? || params[:no_cdr_streaming] - - visitor(UnionVisitor).visit_cdr(node) - end - - def enter_exception(node) - return if params[:no_cdr_streaming] - - visitor(ExceptionVisitor).visit_cdr(node) - end - - def visit_enum(node) - return if params[:no_cdr_streaming] - - visitor(EnumVisitor).visit_cdr(node) - end - - def visit_bitmask(node) - return if params[:no_cdr_streaming] - - visitor(BitmaskVisitor).visit_cdr(node) - end - - def visit_bitset(node) - return if params[:no_cdr_streaming] - - visitor(BitsetVisitor).visit_cdr(node) - end - - def visit_typedef(node) - return if node.is_local? || params[:no_cdr_streaming] - # nothing to do if this is just an alias for another defined type - return if node.idltype.is_a?(IDL::Type::ScopedName) || node.idltype.resolved_type.is_standard_type? - - idl_type = node.idltype.resolved_type - case idl_type - when IDL::Type::String, IDL::Type::WString - visitor(StringVisitor).visit_cdr(node) # only bounded, unbounded is standard_type - end - end - end # StubProxySourceCDRWriter - class StubSourceAnyOpWriter < StubSourceBaseWriter def initialize(output = STDOUT, opts = {}) super @@ -587,8 +461,7 @@ def pre_visit(parser) def post_visit(parser) dec_nest - println - println(' } // namespace TAOX11_NAMESPACE::CORBA') + println('} // namespace TAOX11_NAMESPACE::CORBA') super end diff --git a/tao/rules.taox11.GNU b/tao/rules.taox11.GNU index 61c46ef5..7c69a912 100644 --- a/tao/rules.taox11.GNU +++ b/tao/rules.taox11.GNU @@ -21,13 +21,13 @@ endif # with different minor or major or beta versions to fail. # ifeq (cmd,$(findstring cmd,$(SHELL))) -TAOX11_MAJOR_VERSION := $(shell awk "/TAOX11_MAJOR_VERSION/ { print $$3}" ${TAOX11_ROOT}/tao/x11/versionx11.h) -TAOX11_MINOR_VERSION := $(shell awk "/TAOX11_MINOR_VERSION/ { print $$3}" ${TAOX11_ROOT}/tao/x11/versionx11.h) -TAOX11_MICRO_VERSION := $(shell awk "/TAOX11_MICRO_VERSION/ { print $$3}" ${TAOX11_ROOT}/tao/x11/versionx11.h) +TAOX11_MAJOR_VERSION := $(shell awk "/TAOX11_MAJOR_VERSION/ { print $$3}" ${TAOX11_ROOT}/tao/x11/base/versionx11.h) +TAOX11_MINOR_VERSION := $(shell awk "/TAOX11_MINOR_VERSION/ { print $$3}" ${TAOX11_ROOT}/tao/x11/base/versionx11.h) +TAOX11_MICRO_VERSION := $(shell awk "/TAOX11_MICRO_VERSION/ { print $$3}" ${TAOX11_ROOT}/tao/x11/base/versionx11.h) else -TAOX11_MAJOR_VERSION := $(shell awk '/TAOX11_MAJOR_VERSION/ { print $$3}' ${TAOX11_ROOT}/tao/x11/versionx11.h) -TAOX11_MINOR_VERSION := $(shell awk '/TAOX11_MINOR_VERSION/ { print $$3}' ${TAOX11_ROOT}/tao/x11/versionx11.h) -TAOX11_MICRO_VERSION := $(shell awk '/TAOX11_MICRO_VERSION/ { print $$3}' ${TAOX11_ROOT}/tao/x11/versionx11.h) +TAOX11_MAJOR_VERSION := $(shell awk '/TAOX11_MAJOR_VERSION/ { print $$3}' ${TAOX11_ROOT}/tao/x11/base/versionx11.h) +TAOX11_MINOR_VERSION := $(shell awk '/TAOX11_MINOR_VERSION/ { print $$3}' ${TAOX11_ROOT}/tao/x11/base/versionx11.h) +TAOX11_MICRO_VERSION := $(shell awk '/TAOX11_MICRO_VERSION/ { print $$3}' ${TAOX11_ROOT}/tao/x11/base/versionx11.h) endif GNUACE_PROJECT_VERSION ?= $(TAOX11_MAJOR_VERSION).$(TAOX11_MINOR_VERSION).$(TAOX11_MICRO_VERSION) diff --git a/tao/x11/PolicyC.h b/tao/x11/PolicyC.h index a4a8c9bf..85a33cca 100644 --- a/tao/x11/PolicyC.h +++ b/tao/x11/PolicyC.h @@ -18,17 +18,17 @@ #ifndef __RIDL_POLICYC_H_INCLUDED__ #define __RIDL_POLICYC_H_INCLUDED__ -#include /**/ "tao/x11/pre.h" +#include /**/ "tao/x11/base/pre.h" -#include "tao/x11/stddef.h" -#include "tao/x11/basic_traits.h" +#include "tao/x11/base/stddef.h" +#include "tao/x11/base/basic_traits.h" #include "tao/x11/corba.h" #include "tao/x11/system_exception.h" #include "tao/x11/object.h" #include "tao/x11/user_exception.h" #include "tao/x11/anytypecode/any.h" #include "tao/x11/anytypecode/typecode_ref.h" -#include "tao/x11/taox11_export.h" +#include "tao/x11/base/taox11_export.h" using namespace TAOX11_NAMESPACE; @@ -518,7 +518,7 @@ TAOX11_Export std::ostream& operator<< ( #include "PolicyP.h" #endif -#include /**/ "tao/x11/post.h" +#include /**/ "tao/x11/base/post.h" #endif // __RIDL_POLICYC_H_INCLUDED__ diff --git a/tao/x11/amic_traits_t.h b/tao/x11/amic_traits_t.h index 85b73045..0d1f8a74 100644 --- a/tao/x11/amic_traits_t.h +++ b/tao/x11/amic_traits_t.h @@ -10,7 +10,7 @@ #ifndef TAOX11_AMIC_TRAITS_T_H_INCLUDED #define TAOX11_AMIC_TRAITS_T_H_INCLUDED -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/anyinsert_adapter.h b/tao/x11/anyinsert_adapter.h index 261c38f0..c2f203bb 100644 --- a/tao/x11/anyinsert_adapter.h +++ b/tao/x11/anyinsert_adapter.h @@ -14,8 +14,8 @@ #include "ace/Service_Object.h" -#include "tao/x11/tao_corba.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/tao_corba.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_traits_t.h" #include "tao/x11/system_exception.h" diff --git a/tao/x11/anytypecode/any.cpp b/tao/x11/anytypecode/any.cpp index fc2148d3..70774ed2 100644 --- a/tao/x11/anytypecode/any.cpp +++ b/tao/x11/anytypecode/any.cpp @@ -8,7 +8,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/object.h" #include "tao/x11/stub_arg_traits.h" #include "tao/x11/anytypecode/any.h" diff --git a/tao/x11/anytypecode/any.h b/tao/x11/anytypecode/any.h index 3d4a6d1b..510eb61f 100644 --- a/tao/x11/anytypecode/any.h +++ b/tao/x11/anytypecode/any.h @@ -15,11 +15,11 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/system_exception.h" #include "tao/x11/object_fwd.h" -#include "tao/x11/basic_traits.h" -#include "tao/x11/taox11_export.h" +#include "tao/x11/base/basic_traits.h" +#include "tao/x11/base/taox11_export.h" #include "tao/x11/anytypecode/any_impl.h" #include "tao/x11/anytypecode/typecode_ref.h" diff --git a/tao/x11/anytypecode/any_arg_traits.h b/tao/x11/anytypecode/any_arg_traits.h index d94eb8ae..afb38166 100644 --- a/tao/x11/anytypecode/any_arg_traits.h +++ b/tao/x11/anytypecode/any_arg_traits.h @@ -15,7 +15,7 @@ #include "tao/CORBA_methods.h" #include "tao/x11/basic_argument_t.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/arg_traits_t.h" #include "tao/x11/anyinsert_policy_t.h" diff --git a/tao/x11/anytypecode/any_impl.h b/tao/x11/anytypecode/any_impl.h index a62467de..b3c24f76 100644 --- a/tao/x11/anytypecode/any_impl.h +++ b/tao/x11/anytypecode/any_impl.h @@ -14,9 +14,9 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_fwd.h" -#include "tao/x11/taox11_export.h" +#include "tao/x11/base/taox11_export.h" #include "tao/x11/anytypecode/typecode_ref.h" #include "tao/x11/anytypecode/taox11_anytypecode_export.h" diff --git a/tao/x11/anytypecode/any_util.h b/tao/x11/anytypecode/any_util.h index c0c7f309..28818363 100644 --- a/tao/x11/anytypecode/any_util.h +++ b/tao/x11/anytypecode/any_util.h @@ -14,8 +14,8 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/tao_corba.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/tao_corba.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/anytypecode/taox11_anytypecode_export.h" #include "tao/x11/anytypecode/any_arg_traits.h" diff --git a/tao/x11/anytypecode/anyinsert.h b/tao/x11/anytypecode/anyinsert.h index 384adb50..92733cf4 100644 --- a/tao/x11/anytypecode/anyinsert.h +++ b/tao/x11/anytypecode/anyinsert.h @@ -13,11 +13,11 @@ #pragma once -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/PolicyC.h" #include "ace/Service_Config.h" -#include "tao/x11/basic_traits.h" +#include "tao/x11/base/basic_traits.h" #include "tao/x11/anyinsert_adapter.h" #include "tao/x11/anytypecode/any.h" diff --git a/tao/x11/anytypecode/system_exceptionA.cpp b/tao/x11/anytypecode/system_exceptionA.cpp index 1d99c682..ca1ecc53 100644 --- a/tao/x11/anytypecode/system_exceptionA.cpp +++ b/tao/x11/anytypecode/system_exceptionA.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/corba.h" #include "tao/x11/system_exception.h" #include "tao/x11/system_exception_x11.h" diff --git a/tao/x11/anytypecode/taox11_anytypecode_export.h b/tao/x11/anytypecode/taox11_anytypecode_export.h index 793db2ad..a3600be5 100644 --- a/tao/x11/anytypecode/taox11_anytypecode_export.h +++ b/tao/x11/anytypecode/taox11_anytypecode_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_ANYTYPECODE_EXPORT_H #define TAOX11_ANYTYPECODE_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_ANYTYPECODE_HAS_DLL) # define TAOX11_ANYTYPECODE_HAS_DLL 0 diff --git a/tao/x11/anytypecode/typecode_case_t.h b/tao/x11/anytypecode/typecode_case_t.h index 8b8a8eb6..02b8dc0e 100644 --- a/tao/x11/anytypecode/typecode_case_t.h +++ b/tao/x11/anytypecode/typecode_case_t.h @@ -12,7 +12,7 @@ #pragma once -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/AnyTypeCode/TypeCode.h" #include "tao/AnyTypeCode/TypeCode_Case_Base_T.h" diff --git a/tao/x11/anytypecode/typecode_impl.cpp b/tao/x11/anytypecode/typecode_impl.cpp index 0619bb04..fbb52589 100644 --- a/tao/x11/anytypecode/typecode_impl.cpp +++ b/tao/x11/anytypecode/typecode_impl.cpp @@ -15,7 +15,7 @@ #include "tao/AnyTypeCode/Struct_TypeCode_Static.h" #include "tao/AnyTypeCode/TypeCode_Struct_Field.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/anytypecode/taox11_anytypecode_export.h" #include "tao/x11/object_traits_t.h" #include "tao/x11/anytypecode/any_util.h" diff --git a/tao/x11/anytypecode/typecode_impl.h b/tao/x11/anytypecode/typecode_impl.h index acb6beb6..02181a69 100644 --- a/tao/x11/anytypecode/typecode_impl.h +++ b/tao/x11/anytypecode/typecode_impl.h @@ -15,7 +15,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/sequence_cdr_t.h" #include "tao/x11/anytypecode/VisibilityC.h" diff --git a/tao/x11/anytypecode/typecode_ref.h b/tao/x11/anytypecode/typecode_ref.h index 5e8ff3bb..495c5772 100644 --- a/tao/x11/anytypecode/typecode_ref.h +++ b/tao/x11/anytypecode/typecode_ref.h @@ -13,7 +13,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/system_exception.h" #include "tao/x11/object_traits_t.h" #include "tao/x11/anytypecode/taox11_anytypecode_export.h" diff --git a/tao/x11/arg_traits_t.h b/tao/x11/arg_traits_t.h index 7928b6e8..3e04b1c1 100644 --- a/tao/x11/arg_traits_t.h +++ b/tao/x11/arg_traits_t.h @@ -12,7 +12,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/array_cdr_t.h b/tao/x11/array_cdr_t.h index 81866bca..a4129e18 100644 --- a/tao/x11/array_cdr_t.h +++ b/tao/x11/array_cdr_t.h @@ -12,9 +12,9 @@ #include #include -#include "tao/x11/tao_corba.h" -#include "tao/x11/taox11_export.h" -#include "tao/x11/basic_traits.h" +#include "tao/x11/base/tao_corba.h" +#include "tao/x11/base/taox11_export.h" +#include "tao/x11/base/basic_traits.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/x11/basic_traits.h b/tao/x11/base/basic_traits.h similarity index 99% rename from tao/x11/basic_traits.h rename to tao/x11/base/basic_traits.h index 5372ceca..c0c8b1d9 100644 --- a/tao/x11/basic_traits.h +++ b/tao/x11/base/basic_traits.h @@ -10,7 +10,7 @@ #ifndef TAOX11_BASIC_TRAITS_H_INCLUDED #define TAOX11_BASIC_TRAITS_H_INCLUDED -#include "tao/x11/idl_traits_t.h" +#include "tao/x11/base/idl_traits_t.h" namespace TAOX11_NAMESPACE { @@ -411,7 +411,6 @@ namespace TAOX11_NAMESPACE typename writer_t::formatter_t>::type; return IDL::traits::write_on (os, w.val_, formatter_t ()); } - } // namespace IDL } // namespace TAOX11_NAMESPACE diff --git a/tao/x11/bounded_map_t.h b/tao/x11/base/bounded_map_t.h similarity index 98% rename from tao/x11/bounded_map_t.h rename to tao/x11/base/bounded_map_t.h index 065e00d0..6750d2be 100644 --- a/tao/x11/bounded_map_t.h +++ b/tao/x11/base/bounded_map_t.h @@ -13,7 +13,7 @@ #include #include -#include "tao/x11/versioned_x11_namespace.h" +#include "tao/x11/base/versioned_x11_namespace.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/bounded_string_t.h b/tao/x11/base/bounded_string_t.h similarity index 99% rename from tao/x11/bounded_string_t.h rename to tao/x11/base/bounded_string_t.h index 465dd1e4..2e459970 100644 --- a/tao/x11/bounded_string_t.h +++ b/tao/x11/base/bounded_string_t.h @@ -12,7 +12,7 @@ #define __IDL_BOUNDED_STRING_T_H_INCLUDED__ #include -#include "tao/x11/versioned_x11_namespace.h" +#include "tao/x11/base/versioned_x11_namespace.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/bounded_type_traits_t.h b/tao/x11/base/bounded_type_traits_t.h similarity index 90% rename from tao/x11/bounded_type_traits_t.h rename to tao/x11/base/bounded_type_traits_t.h index ed7d35c6..e1c9e7ac 100644 --- a/tao/x11/bounded_type_traits_t.h +++ b/tao/x11/base/bounded_type_traits_t.h @@ -9,8 +9,7 @@ #ifndef TAOX11_BOUNDED_TYPE_TRAITS_T_H_INCLUDED #define TAOX11_BOUNDED_TYPE_TRAITS_T_H_INCLUDED -#include "tao/x11/idl_traits_t.h" -#include "tao/x11/object_traits_t.h" +#include namespace TAOX11_NAMESPACE { diff --git a/tao/x11/bounded_vector_t.h b/tao/x11/base/bounded_vector_t.h similarity index 98% rename from tao/x11/bounded_vector_t.h rename to tao/x11/base/bounded_vector_t.h index 80c76287..6b4a9300 100644 --- a/tao/x11/bounded_vector_t.h +++ b/tao/x11/base/bounded_vector_t.h @@ -13,7 +13,7 @@ #include #include -#include "tao/x11/versioned_x11_namespace.h" +#include "tao/x11/base/versioned_x11_namespace.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/idl_traits_t.h b/tao/x11/base/idl_traits_t.h similarity index 99% rename from tao/x11/idl_traits_t.h rename to tao/x11/base/idl_traits_t.h index 250acbfe..3bea6fbf 100644 --- a/tao/x11/idl_traits_t.h +++ b/tao/x11/base/idl_traits_t.h @@ -10,9 +10,9 @@ #ifndef TAOX11_IDL_TRAITS_T_H_INCLUDED #define TAOX11_IDL_TRAITS_T_H_INCLUDED -#include "tao/x11/stddef.h" -#include "tao/x11/bounded_vector_t.h" -#include "tao/x11/bounded_map_t.h" +#include "tao/x11/base/stddef.h" +#include "tao/x11/base/bounded_vector_t.h" +#include "tao/x11/base/bounded_map_t.h" #include #include #include diff --git a/tao/x11/post.h b/tao/x11/base/post.h similarity index 100% rename from tao/x11/post.h rename to tao/x11/base/post.h diff --git a/tao/x11/pre.h b/tao/x11/base/pre.h similarity index 100% rename from tao/x11/pre.h rename to tao/x11/base/pre.h diff --git a/tao/x11/stddef.h b/tao/x11/base/stddef.h similarity index 85% rename from tao/x11/stddef.h rename to tao/x11/base/stddef.h index f9c6c57c..fea8ed3a 100644 --- a/tao/x11/stddef.h +++ b/tao/x11/base/stddef.h @@ -12,8 +12,6 @@ #pragma once -#include "ace/config-macros.h" - #include #include #include @@ -48,9 +46,11 @@ * as well as user code get build according to the * macros that get tested and defined inside this file. */ -#include "tao/orbconf.h" -#include "tao/x11/taox11_export.h" -#include "tao/x11/versioned_x11_namespace.h" +#if __has_include("tao/orbconf.h") +# include "tao/orbconf.h" +#endif +#include "tao/x11/base/taox11_export.h" +#include "tao/x11/base/versioned_x11_namespace.h" #define TAOX11_CORBA TAOX11_NAMESPACE::CORBA diff --git a/tao/x11/base/tao_corba.h b/tao/x11/base/tao_corba.h new file mode 100644 index 00000000..3262c5a7 --- /dev/null +++ b/tao/x11/base/tao_corba.h @@ -0,0 +1,30 @@ +/** + * @file tao_corba.h + * @author Martin Corino + * + * @brief include basic TAO CORBA definitions + * + * @copyright Copyright (c) Remedy IT Expertise BV + */ + +#ifndef TAOX11_TAO_CORBA_H_INCLUDED +#define TAOX11_TAO_CORBA_H_INCLUDED + +#pragma once + +#if __has_include("tao/corba.h") +# include "tao/corba.h" +#endif + +#if __has_include("tao/Versioned_Namespace.h") +# include /**/ "tao/Versioned_Namespace.h" +# define TAO_CORBA TAO_VERSIONED_NAMESPACE_NAME::CORBA +# define TAO_TAO TAO_VERSIONED_NAMESPACE_NAME::TAO +# define TAO_IOP TAO_VERSIONED_NAMESPACE_NAME::IOP +#else +# define TAO_CORBA +# define TAO_TAO +# define TAO_IOP +#endif + +#endif // TAOX11_TAO_CORBA_H_INCLUDED diff --git a/tao/x11/taox11_export.h b/tao/x11/base/taox11_export.h similarity index 96% rename from tao/x11/taox11_export.h rename to tao/x11/base/taox11_export.h index d445682e..8f56db8a 100644 --- a/tao/x11/taox11_export.h +++ b/tao/x11/base/taox11_export.h @@ -11,7 +11,7 @@ #ifndef TAOX11_EXPORT_H #define TAOX11_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_HAS_DLL) # define TAOX11_HAS_DLL 0 diff --git a/tao/x11/taox11_export_macros.h b/tao/x11/base/taox11_export_macros.h similarity index 100% rename from tao/x11/taox11_export_macros.h rename to tao/x11/base/taox11_export_macros.h diff --git a/tao/x11/versioned_x11_namespace.h b/tao/x11/base/versioned_x11_namespace.h similarity index 84% rename from tao/x11/versioned_x11_namespace.h rename to tao/x11/base/versioned_x11_namespace.h index 47190e09..d222a9c8 100644 --- a/tao/x11/versioned_x11_namespace.h +++ b/tao/x11/base/versioned_x11_namespace.h @@ -17,14 +17,14 @@ #if defined (TAOX11_HAS_VERSIONED_NAMESPACE) && TAOX11_HAS_VERSIONED_NAMESPACE == 1 # ifndef TAOX11_VERSIONED_NAMESPACE_NAME -# include "tao/x11/versionx11.h" +# include "tao/x11/base/versionx11.h" // Preprocessor symbols will not be expanded if they are // concatenated. Force the preprocessor to expand them during the // argument prescan by calling a macro that itself calls another that // performs the actual concatenation. -# define TAOX11_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) taox11_ ## MAJOR ## _ ## MINOR ## _ ## BETA -# define TAOX11_MAKE_VERSIONED_NAMESPACE_NAME(MAJOR,MINOR,BETA) TAOX11_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) +# define TAOX11_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,MICRO) taox11_ ## MAJOR ## _ ## MINOR ## _ ## MICRO +# define TAOX11_MAKE_VERSIONED_NAMESPACE_NAME(MAJOR,MINOR,MICRO) TAOX11_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,MICRO) # define TAOX11_VERSIONED_NAMESPACE_NAME TAOX11_MAKE_VERSIONED_NAMESPACE_NAME(TAOX11_MAJOR_VERSION,TAOX11_MINOR_VERSION,TAOX11_MICRO_VERSION) # endif /* !TAO_VERSIONED_NAMESPACE_NAME */ diff --git a/tao/x11/versionx11.h b/tao/x11/base/versionx11.h similarity index 100% rename from tao/x11/versionx11.h rename to tao/x11/base/versionx11.h diff --git a/tao/x11/wstringwchar_ostream.h b/tao/x11/base/wstringwchar_ostream.h similarity index 80% rename from tao/x11/wstringwchar_ostream.h rename to tao/x11/base/wstringwchar_ostream.h index 6db609e2..f85f2a53 100644 --- a/tao/x11/wstringwchar_ostream.h +++ b/tao/x11/base/wstringwchar_ostream.h @@ -25,6 +25,14 @@ namespace std return _os << "\"" << conv.to_bytes(_v) << "\""; } + /// std::wstring_view to ostream insertion + inline std::ostream& + operator<< (std::ostream& _os, const std::wstring_view& _v) + { + std::wstring_convert> conv; + return _os << "\"" << conv.to_bytes(_v.data()) << "\""; + } + /// wchar_t to ostream insertion inline std::ostream& operator<< (std::ostream& _os, const wchar_t& _v) diff --git a/tao/x11/basic_argument_t.h b/tao/x11/basic_argument_t.h index 73e8d00e..5723659e 100644 --- a/tao/x11/basic_argument_t.h +++ b/tao/x11/basic_argument_t.h @@ -14,8 +14,8 @@ #include "tao/Argument.h" -#include "tao/x11/stddef.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/stddef.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/arg_traits_t.h" namespace TAOX11_NAMESPACE diff --git a/tao/x11/bidir_giop/taox11_bidir_giop_export.h b/tao/x11/bidir_giop/taox11_bidir_giop_export.h index 1c5f3efb..6ade8ff2 100644 --- a/tao/x11/bidir_giop/taox11_bidir_giop_export.h +++ b/tao/x11/bidir_giop/taox11_bidir_giop_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_BIDIRGIOP_EXPORT_H #define TAOX11_BIDIRGIOP_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_BIDIRGIOP_HAS_DLL) # define TAOX11_BIDIRGIOP_HAS_DLL 0 diff --git a/tao/x11/cdr_long_double.h b/tao/x11/cdr_long_double.h index 3563cf58..954d5f79 100644 --- a/tao/x11/cdr_long_double.h +++ b/tao/x11/cdr_long_double.h @@ -21,8 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// CDR output operator for long double -inline CORBA::Boolean operator<< (TAO_OutputCDR& os, - long double x) +inline CORBA::Boolean operator<< (TAO_OutputCDR& os, long double x) { CORBA::LongDouble ld; return @@ -32,8 +31,7 @@ inline CORBA::Boolean operator<< (TAO_OutputCDR& os, } /// CDR input operators for long double -inline CORBA::Boolean operator>> (TAO_InputCDR &is, - long double &x) +inline CORBA::Boolean operator>> (TAO_InputCDR &is, long double &x) { CORBA::LongDouble ld; if (!(static_cast (is) >> ld)) diff --git a/tao/x11/codecfactory/codecfactory.cpp b/tao/x11/codecfactory/codecfactory.cpp index f2eb851a..add835c9 100644 --- a/tao/x11/codecfactory/codecfactory.cpp +++ b/tao/x11/codecfactory/codecfactory.cpp @@ -9,7 +9,7 @@ #include "tao/CodecFactory/CodecFactory.h" #include "tao/objectid.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/codecfactory/codecfactory.h" #include "tao/x11/orb_registry.h" diff --git a/tao/x11/codecfactory/codecfactory.h b/tao/x11/codecfactory/codecfactory.h index b4008228..7bf89d53 100644 --- a/tao/x11/codecfactory/codecfactory.h +++ b/tao/x11/codecfactory/codecfactory.h @@ -11,7 +11,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_loader.h" #include "tao/x11/codecfactory/taox11_codecfactory_export.h" diff --git a/tao/x11/codecfactory/tao_codecfactory.h b/tao/x11/codecfactory/tao_codecfactory.h index 4ddffdd9..83b1314d 100644 --- a/tao/x11/codecfactory/tao_codecfactory.h +++ b/tao/x11/codecfactory/tao_codecfactory.h @@ -9,7 +9,7 @@ #ifndef TAOX11_TAO_CODECFACTORY_H_INCLUDE #define TAOX11_TAO_CODECFACTORY_H_INCLUDE -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/CodecFactory/CodecFactory.h" #include "tao/OctetSeqC.h" diff --git a/tao/x11/codecfactory/taox11_codecfactory_export.h b/tao/x11/codecfactory/taox11_codecfactory_export.h index 5035db26..8f7405d3 100644 --- a/tao/x11/codecfactory/taox11_codecfactory_export.h +++ b/tao/x11/codecfactory/taox11_codecfactory_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_CODECFACTORY_EXPORT_H #define TAOX11_CODECFACTORY_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_CODECFACTORY_HAS_DLL) # define TAOX11_CODECFACTORY_HAS_DLL 0 diff --git a/tao/x11/dynamic_adapter.h b/tao/x11/dynamic_adapter.h index b9beb849..d9dc05a1 100644 --- a/tao/x11/dynamic_adapter.h +++ b/tao/x11/dynamic_adapter.h @@ -14,7 +14,7 @@ #include "ace/Service_Object.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_traits_t.h" #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/tao/x11/dynamic_any/dyn_common.h b/tao/x11/dynamic_any/dyn_common.h index d40b79a0..eb7ace85 100644 --- a/tao/x11/dynamic_any/dyn_common.h +++ b/tao/x11/dynamic_any/dyn_common.h @@ -16,7 +16,7 @@ #include "tao/x11/dynamic_any/taox11_dynamicany_export.h" #include "tao/x11/anytypecode/any.h" #include "tao/x11/anytypecode/typecode.h" -#include "tao/x11/versioned_x11_namespace.h" +#include "tao/x11/base/versioned_x11_namespace.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/dynamic_any/dynamicany.cpp b/tao/x11/dynamic_any/dynamicany.cpp index 289cb276..043968c1 100644 --- a/tao/x11/dynamic_any/dynamicany.cpp +++ b/tao/x11/dynamic_any/dynamicany.cpp @@ -8,7 +8,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "ace/Service_Config.h" #include "tao/x11/dynamic_any/dynanyfactory.h" #include "tao/x11/orb_registry.h" diff --git a/tao/x11/dynamic_any/dynamicany.h b/tao/x11/dynamic_any/dynamicany.h index 2fb31c4d..a65dea55 100644 --- a/tao/x11/dynamic_any/dynamicany.h +++ b/tao/x11/dynamic_any/dynamicany.h @@ -12,7 +12,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/tao/x11/dynamic_any/taox11_dynamicany_export.h b/tao/x11/dynamic_any/taox11_dynamicany_export.h index 4f2e2376..b02862b3 100644 --- a/tao/x11/dynamic_any/taox11_dynamicany_export.h +++ b/tao/x11/dynamic_any/taox11_dynamicany_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_DYNAMICANY_EXPORT_H #define TAOX11_DYNAMICANY_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) # if !defined (TAOX11_DYNAMICANY_HAS_DLL) diff --git a/tao/x11/exception.h b/tao/x11/exception.h index 9c3e250f..afcb902f 100644 --- a/tao/x11/exception.h +++ b/tao/x11/exception.h @@ -10,10 +10,10 @@ #ifndef TAOX11_EXCEPTION_H_INCLUDED #define TAOX11_EXCEPTION_H_INCLUDED -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include /**/ "tao/Versioned_Namespace.h" #include "tao/x11/anytypecode/taox11_anytypecode_export.h" -#include "tao/x11/idl_traits_t.h" +#include "tao/x11/base/idl_traits_t.h" #include diff --git a/tao/x11/fixed_t.h b/tao/x11/fixed_t.h index c3070b07..9d2ffbd8 100644 --- a/tao/x11/fixed_t.h +++ b/tao/x11/fixed_t.h @@ -12,7 +12,7 @@ #define __IDL_FIXED_T_H_INCLUDED__ #include -#include "tao/x11/versioned_x11_namespace.h" +#include "tao/x11/base/versioned_x11_namespace.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/ifr_client_adapter.h b/tao/x11/ifr_client_adapter.h index ae222d17..00a287ba 100644 --- a/tao/x11/ifr_client_adapter.h +++ b/tao/x11/ifr_client_adapter.h @@ -14,7 +14,7 @@ #include "ace/Service_Object.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_traits_t.h" #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/tao/x11/ifr_client_adapter_impl_base.h b/tao/x11/ifr_client_adapter_impl_base.h index 59a80c39..28d3e51c 100644 --- a/tao/x11/ifr_client_adapter_impl_base.h +++ b/tao/x11/ifr_client_adapter_impl_base.h @@ -12,7 +12,7 @@ #pragma once -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/ifr_client_adapter.h" #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/tao/x11/ior_interceptor/ior_info.cpp b/tao/x11/ior_interceptor/ior_info.cpp index 708da4e7..dbcf9fc2 100644 --- a/tao/x11/ior_interceptor/ior_info.cpp +++ b/tao/x11/ior_interceptor/ior_info.cpp @@ -8,7 +8,7 @@ */ // TAO namespace dependencies -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/ObjRefTemplate/Default_ORTC.h" #include "tao/ObjRefTemplate/ObjectReferenceTemplate.h" #include "tao/x11/objproxy.h" diff --git a/tao/x11/ior_interceptor/ior_interceptor.h b/tao/x11/ior_interceptor/ior_interceptor.h index 799d8cd8..ca53304e 100644 --- a/tao/x11/ior_interceptor/ior_interceptor.h +++ b/tao/x11/ior_interceptor/ior_interceptor.h @@ -11,7 +11,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/ior_interceptor/taox11_ior_interceptor_export.h" diff --git a/tao/x11/ior_interceptor/ior_interceptor_proxy.cpp b/tao/x11/ior_interceptor/ior_interceptor_proxy.cpp index 091d9bee..f9b3e4f9 100644 --- a/tao/x11/ior_interceptor/ior_interceptor_proxy.cpp +++ b/tao/x11/ior_interceptor/ior_interceptor_proxy.cpp @@ -8,7 +8,7 @@ */ // TAO dependencies -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/pi/tao_pi.h" #include "tao/x11/ior_interceptor/tao_ior_interceptor.h" #include "tao/x11/sequence_conversion_t.h" diff --git a/tao/x11/ior_interceptor/ior_interceptor_proxy_factory.cpp b/tao/x11/ior_interceptor/ior_interceptor_proxy_factory.cpp index 79e938ab..079614c4 100644 --- a/tao/x11/ior_interceptor/ior_interceptor_proxy_factory.cpp +++ b/tao/x11/ior_interceptor/ior_interceptor_proxy_factory.cpp @@ -8,7 +8,7 @@ */ // pull in TAO dependencies first -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/ior_interceptor/tao_ior_interceptor.h" // TAOX11 dependencies diff --git a/tao/x11/ior_interceptor/taox11_ior_interceptor_export.h b/tao/x11/ior_interceptor/taox11_ior_interceptor_export.h index 5b8ad918..514dc9ba 100644 --- a/tao/x11/ior_interceptor/taox11_ior_interceptor_export.h +++ b/tao/x11/ior_interceptor/taox11_ior_interceptor_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_IOR_INTERCEPTOR_EXPORT_H #define TAOX11_IOR_INTERCEPTOR_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_IOR_INTERCEPTOR_HAS_DLL) # define TAOX11_IOR_INTERCEPTOR_HAS_DLL 0 diff --git a/tao/x11/ior_table/ior_table.h b/tao/x11/ior_table/ior_table.h index 5a22593f..18fe62d2 100644 --- a/tao/x11/ior_table/ior_table.h +++ b/tao/x11/ior_table/ior_table.h @@ -11,7 +11,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "ace/Service_Object.h" #include "tao/x11/ior_table/taox11_ior_table_export.h" diff --git a/tao/x11/ior_table/locator_cb.h b/tao/x11/ior_table/locator_cb.h index 10094227..4ccfb372 100644 --- a/tao/x11/ior_table/locator_cb.h +++ b/tao/x11/ior_table/locator_cb.h @@ -13,7 +13,7 @@ #include "tao/x11/ior_table/tao_ior_table.h" #include "tao/x11/ior_table/taox11_ior_table_export.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/ior_table/ior_table.h" namespace TAOX11_NAMESPACE diff --git a/tao/x11/ior_table/taox11_ior_table_export.h b/tao/x11/ior_table/taox11_ior_table_export.h index 03f627fe..6c025a42 100644 --- a/tao/x11/ior_table/taox11_ior_table_export.h +++ b/tao/x11/ior_table/taox11_ior_table_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_IOR_TABLE_EXPORT_H #define TAOX11_IOR_TABLE_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_IOR_TABLE_HAS_DLL) # define TAOX11_IOR_TABLE_HAS_DLL 0 diff --git a/tao/x11/log.h b/tao/x11/log.h index 2acb0fa4..de335d1f 100644 --- a/tao/x11/log.h +++ b/tao/x11/log.h @@ -11,8 +11,8 @@ #define TAOX11_LOG_H #include "tao/x11/logger/log_base.h" -#include "tao/x11/versioned_x11_namespace.h" -#include "tao/x11/taox11_export.h" +#include "tao/x11/base/versioned_x11_namespace.h" +#include "tao/x11/base/taox11_export.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/logger/x11_logger_export.h b/tao/x11/logger/x11_logger_export.h index eb6f84b0..558300e7 100644 --- a/tao/x11/logger/x11_logger_export.h +++ b/tao/x11/logger/x11_logger_export.h @@ -9,7 +9,7 @@ #ifndef X11_LOGGER_EXPORT_H #define X11_LOGGER_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (X11_LOGGER_HAS_DLL) # define X11_LOGGER_HAS_DLL 0 diff --git a/tao/x11/long_double_argument_t.h b/tao/x11/long_double_argument_t.h index 2d015ea9..9c7e0ede 100644 --- a/tao/x11/long_double_argument_t.h +++ b/tao/x11/long_double_argument_t.h @@ -10,8 +10,8 @@ #ifndef TAOX11_LONG_DOUBLE_ARGUMENT_T_H_INCLUDED #define TAOX11_LONG_DOUBLE_ARGUMENT_T_H_INCLUDED -#include "tao/x11/tao_corba.h" -#include "tao/x11/taox11_export.h" +#include "tao/x11/base/tao_corba.h" +#include "tao/x11/base/taox11_export.h" // In cases where sizeof(long double) == 16 the 'long double' type // is identical to CORBA::LongDouble (old C++) and the arg traits diff --git a/tao/x11/map_cdr_t.h b/tao/x11/map_cdr_t.h index 0cccc09e..b1188170 100644 --- a/tao/x11/map_cdr_t.h +++ b/tao/x11/map_cdr_t.h @@ -10,10 +10,10 @@ #ifndef TAOX11_MAP_CDR_T_H_INCLUDED #define TAOX11_MAP_CDR_T_H_INCLUDED -#include "tao/x11/tao_corba.h" -#include "tao/x11/taox11_export.h" -#include "tao/x11/basic_traits.h" -#include "tao/x11/bounded_map_t.h" +#include "tao/x11/base/tao_corba.h" +#include "tao/x11/base/taox11_export.h" +#include "tao/x11/base/basic_traits.h" +#include "tao/x11/base/bounded_map_t.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/x11/messaging/exception_holder_i.cpp b/tao/x11/messaging/exception_holder_i.cpp index b5b5ab4b..3cbb7aae 100644 --- a/tao/x11/messaging/exception_holder_i.cpp +++ b/tao/x11/messaging/exception_holder_i.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/anytypecode/typecode.h" #include "tao/x11/objproxy.h" #include "tao/x11/messaging/exception_holder_i.h" diff --git a/tao/x11/messaging/taox11_messaging_export.h b/tao/x11/messaging/taox11_messaging_export.h index 2a40a753..b46865ea 100644 --- a/tao/x11/messaging/taox11_messaging_export.h +++ b/tao/x11/messaging/taox11_messaging_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_MESSAGING_EXPORT_H #define TAOX11_MESSAGING_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_MESSAGING_HAS_DLL) # define TAOX11_MESSAGING_HAS_DLL 0 diff --git a/tao/x11/nvlist_adapter.h b/tao/x11/nvlist_adapter.h index 763f45c2..d3ab6788 100644 --- a/tao/x11/nvlist_adapter.h +++ b/tao/x11/nvlist_adapter.h @@ -13,7 +13,7 @@ #pragma once #include "ace/Service_Object.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_traits_t.h" #if (TAO_HAS_MINIMUM_CORBA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) diff --git a/tao/x11/object_fwd.h b/tao/x11/object_fwd.h index f2cf3c0b..88a7cae1 100644 --- a/tao/x11/object_fwd.h +++ b/tao/x11/object_fwd.h @@ -12,9 +12,9 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_traits_t.h" -#include "tao/x11/idl_traits_t.h" +#include "tao/x11/base/idl_traits_t.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/object_loader.h b/tao/x11/object_loader.h index e88cb85b..5a43f2fb 100644 --- a/tao/x11/object_loader.h +++ b/tao/x11/object_loader.h @@ -12,7 +12,7 @@ #pragma once #include "ace/Service_Object.h" -#include "tao/x11/taox11_export.h" +#include "tao/x11/base/taox11_export.h" #include "tao/x11/orb.h" namespace TAOX11_NAMESPACE diff --git a/tao/x11/object_traits_t.h b/tao/x11/object_traits_t.h index 4c4a87f3..1894a354 100644 --- a/tao/x11/object_traits_t.h +++ b/tao/x11/object_traits_t.h @@ -13,7 +13,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/system_exception.h" namespace TAOX11_NAMESPACE diff --git a/tao/x11/objproxy.h b/tao/x11/objproxy.h index 1cbef80e..72aaef23 100644 --- a/tao/x11/objproxy.h +++ b/tao/x11/objproxy.h @@ -14,7 +14,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/ORB.h" #include "tao/SystemException.h" #include "tao/Basic_Types.h" @@ -23,7 +23,7 @@ #include "tao/Objref_VarOut_T.h" #include "tao/VarOut_T.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/optional_t.h b/tao/x11/optional_t.h index 4ca6c07a..aff68909 100644 --- a/tao/x11/optional_t.h +++ b/tao/x11/optional_t.h @@ -12,7 +12,7 @@ #define __IDL__OPTIONAL_T_H_INCLUDED__ #include -#include "tao/x11/versioned_x11_namespace.h" +#include "tao/x11/base/versioned_x11_namespace.h" #if defined (ACE_HAS_CPP17) diff --git a/tao/x11/orb.cpp b/tao/x11/orb.cpp index dff6ef0d..aad4a712 100644 --- a/tao/x11/orb.cpp +++ b/tao/x11/orb.cpp @@ -30,7 +30,7 @@ # endif #endif #include "tao/x11/log.h" -#include "tao/x11/versionx11.h" +#include "tao/x11/base/versionx11.h" #if !defined (TAOX11_RELEASE_BUILDSTAMP) # define TAOX11_RELEASE_BUILDSTAMP \ diff --git a/tao/x11/orb_registry.cpp b/tao/x11/orb_registry.cpp index 6d371eed..4d1e3aff 100644 --- a/tao/x11/orb_registry.cpp +++ b/tao/x11/orb_registry.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/objproxy.h" #include "tao/x11/orbproxy.h" #include "tao/objectid.h" diff --git a/tao/x11/orb_registry.h b/tao/x11/orb_registry.h index 156064b9..33207724 100644 --- a/tao/x11/orb_registry.h +++ b/tao/x11/orb_registry.h @@ -10,8 +10,8 @@ #ifndef TAOX11_ORB_REGISTRY_H_INCLUDED #define TAOX11_ORB_REGISTRY_H_INCLUDED -#include "tao/x11/stddef.h" -#include "tao/x11/taox11_export.h" +#include "tao/x11/base/stddef.h" +#include "tao/x11/base/taox11_export.h" #include "tao/x11/object.h" #include "tao/x11/orb.h" #include "tao/x11/anyinsert_adapter.h" diff --git a/tao/x11/orbproxy.h b/tao/x11/orbproxy.h index f1ab5ae7..782cc7e2 100644 --- a/tao/x11/orbproxy.h +++ b/tao/x11/orbproxy.h @@ -14,7 +14,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/ORB.h" #include "tao/ORB_Core.h" #include "tao/SystemException.h" @@ -24,7 +24,7 @@ #include "tao/Objref_VarOut_T.h" #include "tao/VarOut_T.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/ort/object_reference_template.h b/tao/x11/ort/object_reference_template.h index 29054f86..97e7d41a 100644 --- a/tao/x11/ort/object_reference_template.h +++ b/tao/x11/ort/object_reference_template.h @@ -11,7 +11,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/ort/taox11_ort_export.h" diff --git a/tao/x11/ort/taox11_ort_export.h b/tao/x11/ort/taox11_ort_export.h index 01c757c5..1147b808 100644 --- a/tao/x11/ort/taox11_ort_export.h +++ b/tao/x11/ort/taox11_ort_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_OBJREF_TEMPLATE_EXPORT_H #define TAOX11_OBJREF_TEMPLATE_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_OBJREF_TEMPLATE_HAS_DLL) # define TAOX11_OBJREF_TEMPLATE_HAS_DLL 0 diff --git a/tao/x11/pi/client_request_info.cpp b/tao/x11/pi/client_request_info.cpp index 3d184dde..adcf656a 100644 --- a/tao/x11/pi/client_request_info.cpp +++ b/tao/x11/pi/client_request_info.cpp @@ -8,7 +8,7 @@ */ // TAO namespace dependencies -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/objproxy.h" #include "tao/AnyTypeCode/DynamicC.h" diff --git a/tao/x11/pi/interceptor_proxy.h b/tao/x11/pi/interceptor_proxy.h index 32d60636..5e3aef13 100644 --- a/tao/x11/pi/interceptor_proxy.h +++ b/tao/x11/pi/interceptor_proxy.h @@ -10,7 +10,7 @@ #define TAOX11_PI_INTERCEPTOR_PROXY_H_INCLUDED #include "tao/x11/pi/taox11_pi_export.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/pi/tao_pi.h" #include "tao/x11/pi/pi.h" diff --git a/tao/x11/pi/orb_initializer_registry.cpp b/tao/x11/pi/orb_initializer_registry.cpp index f7833625..10ae198f 100644 --- a/tao/x11/pi/orb_initializer_registry.cpp +++ b/tao/x11/pi/orb_initializer_registry.cpp @@ -6,7 +6,7 @@ * * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/pi/tao_pi.h" #include "tao/ORBInitializer_Registry.h" diff --git a/tao/x11/pi/policyfactory_manager.h b/tao/x11/pi/policyfactory_manager.h index c78b24a9..b8979112 100644 --- a/tao/x11/pi/policyfactory_manager.h +++ b/tao/x11/pi/policyfactory_manager.h @@ -11,7 +11,7 @@ #pragma once -#include /**/ "tao/x11/pre.h" +#include /**/ "tao/x11/base/pre.h" #include "ace/Service_Config.h" #include "tao/x11/pi/taox11_pi_export.h" @@ -48,7 +48,7 @@ namespace TAOX11_NAMESPACE #endif -#include /**/ "tao/x11/post.h" +#include /**/ "tao/x11/base/post.h" #endif /* TAOX11_POLICYFACTORY_MANAGER_INCLUDED */ diff --git a/tao/x11/pi/request_info.cpp b/tao/x11/pi/request_info.cpp index 0cee8a30..3c45e70b 100644 --- a/tao/x11/pi/request_info.cpp +++ b/tao/x11/pi/request_info.cpp @@ -8,7 +8,7 @@ */ // TAO namespace dependencies -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/objproxy.h" #include "tao/x11/sequence_conversion_t.h" #include "tao/AnyTypeCode/DynamicC.h" diff --git a/tao/x11/pi/taox11_pi_export.h b/tao/x11/pi/taox11_pi_export.h index 41b65d7e..ba558a44 100644 --- a/tao/x11/pi/taox11_pi_export.h +++ b/tao/x11/pi/taox11_pi_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_PI_EXPORT_H #define TAOX11_PI_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_PI_HAS_DLL) # define TAOX11_PI_HAS_DLL 0 diff --git a/tao/x11/pi_server/pi_server.h b/tao/x11/pi_server/pi_server.h index cd334043..613ed2a3 100644 --- a/tao/x11/pi_server/pi_server.h +++ b/tao/x11/pi_server/pi_server.h @@ -11,7 +11,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/pi_server/taox11_pi_server_export.h" namespace TAOX11_NAMESPACE diff --git a/tao/x11/pi_server/server_request_info.cpp b/tao/x11/pi_server/server_request_info.cpp index ac9a753c..ad318e7c 100644 --- a/tao/x11/pi_server/server_request_info.cpp +++ b/tao/x11/pi_server/server_request_info.cpp @@ -8,7 +8,7 @@ */ // TAO namespace dependencies -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/objproxy.h" #include "tao/x11/sequence_conversion_t.h" diff --git a/tao/x11/pi_server/server_request_interceptor_proxy_factory.cpp b/tao/x11/pi_server/server_request_interceptor_proxy_factory.cpp index a75863a5..baa714a8 100644 --- a/tao/x11/pi_server/server_request_interceptor_proxy_factory.cpp +++ b/tao/x11/pi_server/server_request_interceptor_proxy_factory.cpp @@ -8,7 +8,7 @@ */ // pull in TAO dependencies first -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/pi_server/tao_pi_server.h" // TAOX11 dependencies diff --git a/tao/x11/pi_server/taox11_pi_server_export.h b/tao/x11/pi_server/taox11_pi_server_export.h index c52cf689..80782a57 100644 --- a/tao/x11/pi_server/taox11_pi_server_export.h +++ b/tao/x11/pi_server/taox11_pi_server_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_PI_SERVER_EXPORT_H #define TAOX11_PI_SERVER_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_PI_SERVER_HAS_DLL) # define TAOX11_PI_SERVER_HAS_DLL 0 diff --git a/tao/x11/portable_server/basic_sargument_t.h b/tao/x11/portable_server/basic_sargument_t.h index b9c648f0..dc462776 100644 --- a/tao/x11/portable_server/basic_sargument_t.h +++ b/tao/x11/portable_server/basic_sargument_t.h @@ -13,8 +13,8 @@ #pragma once #include "tao/Argument.h" -#include "tao/x11/stddef.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/stddef.h" +#include "tao/x11/base/tao_corba.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/portable_server/operation_table_std_map.h b/tao/x11/portable_server/operation_table_std_map.h index a6acd383..1d804abb 100644 --- a/tao/x11/portable_server/operation_table_std_map.h +++ b/tao/x11/portable_server/operation_table_std_map.h @@ -13,7 +13,7 @@ #pragma once #include "tao/PortableServer/Operation_Table.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/portable_server/taox11_portableserver_export.h" #include diff --git a/tao/x11/portable_server/portableserver_proxies.h b/tao/x11/portable_server/portableserver_proxies.h index 513eeaf3..cb4a9804 100644 --- a/tao/x11/portable_server/portableserver_proxies.h +++ b/tao/x11/portable_server/portableserver_proxies.h @@ -17,12 +17,12 @@ #include "tao/PortableServer/ServantActivatorC.h" #include "tao/PortableServer/Non_Servant_Upcall.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #define TAO_PORTABLE_SERVER \ TAO_VERSIONED_NAMESPACE_NAME::PortableServer -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/portable_server/sarg_traits_t.h b/tao/x11/portable_server/sarg_traits_t.h index 1a6c92e4..a1cfb1a2 100644 --- a/tao/x11/portable_server/sarg_traits_t.h +++ b/tao/x11/portable_server/sarg_traits_t.h @@ -12,7 +12,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" namespace TAOX11_NAMESPACE::PS { diff --git a/tao/x11/portable_server/servant_proxy.h b/tao/x11/portable_server/servant_proxy.h index ac846ccc..91d1fc6a 100644 --- a/tao/x11/portable_server/servant_proxy.h +++ b/tao/x11/portable_server/servant_proxy.h @@ -12,7 +12,7 @@ #pragma once -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/PortableServer/PortableServer.h" #include "tao/PortableServer/Servant_Base.h" #include "tao/operation_details.h" diff --git a/tao/x11/portable_server/servant_traits_t.h b/tao/x11/portable_server/servant_traits_t.h index a7311640..51b1cfad 100644 --- a/tao/x11/portable_server/servant_traits_t.h +++ b/tao/x11/portable_server/servant_traits_t.h @@ -13,7 +13,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/system_exception.h" namespace TAOX11_NAMESPACE diff --git a/tao/x11/portable_server/servantbase.cpp b/tao/x11/portable_server/servantbase.cpp index 507b64d6..88df8fe7 100644 --- a/tao/x11/portable_server/servantbase.cpp +++ b/tao/x11/portable_server/servantbase.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/ORB_Core.h" #include "tao/x11/portable_server/portableserver_proxies.h" diff --git a/tao/x11/portable_server/servantbase.h b/tao/x11/portable_server/servantbase.h index ff8667c7..610fd838 100644 --- a/tao/x11/portable_server/servantbase.h +++ b/tao/x11/portable_server/servantbase.h @@ -14,7 +14,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/portable_server/servant_traits_t.h" #include "tao/x11/portable_server/portableserver.h" #include "tao/x11/portable_server/servant_forward.h" diff --git a/tao/x11/portable_server/special_basic_sargument_t.h b/tao/x11/portable_server/special_basic_sargument_t.h index 1489e6dd..8269ad4a 100644 --- a/tao/x11/portable_server/special_basic_sargument_t.h +++ b/tao/x11/portable_server/special_basic_sargument_t.h @@ -13,8 +13,8 @@ #pragma once #include "tao/Argument.h" -#include "tao/x11/stddef.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/stddef.h" +#include "tao/x11/base/tao_corba.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/portable_server/taox11_portableserver.mpc b/tao/x11/portable_server/taox11_portableserver.mpc index 1d13aa19..03497b45 100644 --- a/tao/x11/portable_server/taox11_portableserver.mpc +++ b/tao/x11/portable_server/taox11_portableserver.mpc @@ -53,7 +53,7 @@ project(taox11_portableserver_idl) : ridl_core_defaults, install, pidl_install { $(TAO_ROOT)/tao/PortableServer/PortableServer.pidl } IDL_Files { - idlflags += -Scp -Sna + idlflags += -Scph -Sna idlflags += -Wb,add_post_include=tao/x11/portable_server/servant_forward.h idlflags -= -Sa -St gendir = . diff --git a/tao/x11/portable_server/taox11_portableserver_export.h b/tao/x11/portable_server/taox11_portableserver_export.h index bff9f20a..6201afc5 100644 --- a/tao/x11/portable_server/taox11_portableserver_export.h +++ b/tao/x11/portable_server/taox11_portableserver_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_PORTABLESERVER_EXPORT_H #define TAOX11_PORTABLESERVER_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_PORTABLESERVER_HAS_DLL) # define TAOX11_PORTABLESERVER_HAS_DLL 0 diff --git a/tao/x11/portable_server/upcall_command.h b/tao/x11/portable_server/upcall_command.h index ceb15342..cb8d837f 100644 --- a/tao/x11/portable_server/upcall_command.h +++ b/tao/x11/portable_server/upcall_command.h @@ -12,8 +12,8 @@ #pragma once -#include "tao/x11/tao_corba.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/tao_corba.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/portable_server/taox11_portableserver_export.h" #include "tao/PortableServer/Upcall_Command.h" diff --git a/tao/x11/sequence_cdr_t.h b/tao/x11/sequence_cdr_t.h index 5453bffd..ebdcf8da 100644 --- a/tao/x11/sequence_cdr_t.h +++ b/tao/x11/sequence_cdr_t.h @@ -10,10 +10,10 @@ #ifndef TAOX11_SEQUENCE_CDR_T_H_INCLUDED #define TAOX11_SEQUENCE_CDR_T_H_INCLUDED -#include "tao/x11/tao_corba.h" -#include "tao/x11/taox11_export.h" -#include "tao/x11/basic_traits.h" -#include "tao/x11/bounded_vector_t.h" +#include "tao/x11/base/tao_corba.h" +#include "tao/x11/base/taox11_export.h" +#include "tao/x11/base/basic_traits.h" +#include "tao/x11/base/bounded_vector_t.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/tao/x11/sequence_conversion_t.h b/tao/x11/sequence_conversion_t.h index 5c12bff3..0cdd8563 100644 --- a/tao/x11/sequence_conversion_t.h +++ b/tao/x11/sequence_conversion_t.h @@ -12,7 +12,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "ace/Truncate.h" namespace TAOX11_NAMESPACE { diff --git a/tao/x11/special_basic_argument_t.h b/tao/x11/special_basic_argument_t.h index e5bbab8f..223496ba 100644 --- a/tao/x11/special_basic_argument_t.h +++ b/tao/x11/special_basic_argument_t.h @@ -13,8 +13,8 @@ #pragma once #include "tao/Argument.h" -#include "tao/x11/stddef.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/stddef.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/arg_traits_t.h" namespace TAOX11_NAMESPACE diff --git a/tao/x11/stub_arg_traits.h b/tao/x11/stub_arg_traits.h index 6303b667..3d752b74 100644 --- a/tao/x11/stub_arg_traits.h +++ b/tao/x11/stub_arg_traits.h @@ -13,7 +13,7 @@ #pragma once #include "tao/CORBA_methods.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/arg_traits_t.h" #include "tao/x11/basic_argument_t.h" #include "tao/x11/anyinsert_policy_t.h" @@ -37,10 +37,8 @@ namespace TAOX11_NAMESPACE TAO_BEGIN_VERSIONED_NAMESPACE_DECL // CDR streaming operator specializations -TAOX11_Export TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, - TAOX11_CORBA::object_traits::ref_type); -TAOX11_Export TAO_CORBA::Boolean operator>> (TAO_InputCDR &, - TAOX11_CORBA::object_traits::ref_type&); +TAOX11_Export TAO_CORBA::Boolean operator<< (TAO_OutputCDR &, TAOX11_CORBA::object_traits::ref_type); +TAOX11_Export TAO_CORBA::Boolean operator>> (TAO_InputCDR &, TAOX11_CORBA::object_traits::ref_type&); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/tao/x11/system_exception.cpp b/tao/x11/system_exception.cpp index 36926866..6cc792fa 100644 --- a/tao/x11/system_exception.cpp +++ b/tao/x11/system_exception.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/SystemException.h" #include "tao/x11/system_exception.h" diff --git a/tao/x11/tao_corba.h b/tao/x11/tao_corba.h deleted file mode 100644 index b269e76c..00000000 --- a/tao/x11/tao_corba.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @file tao_corba.h - * @author Martin Corino - * - * @brief include basic TAO CORBA definitions - * - * @copyright Copyright (c) Remedy IT Expertise BV - */ - -#ifndef TAOX11_TAO_CORBA_H_INCLUDED -#define TAOX11_TAO_CORBA_H_INCLUDED - -#pragma once - -#include /**/ "ace/config-all.h" - -#include "tao/corba.h" -#include /**/ "tao/Versioned_Namespace.h" - -#define TAO_CORBA TAO_VERSIONED_NAMESPACE_NAME::CORBA - -#define TAO_TAO TAO_VERSIONED_NAMESPACE_NAME::TAO - -#define TAO_IOP TAO_VERSIONED_NAMESPACE_NAME::IOP - -#include "tao/x11/cdr_long_double.h" - -#endif // TAOX11_TAO_CORBA_H_INCLUDED diff --git a/tao/x11/taox11.mpc b/tao/x11/taox11.mpc index d8a538e1..b29487de 100644 --- a/tao/x11/taox11.mpc +++ b/tao/x11/taox11.mpc @@ -13,7 +13,7 @@ project(taox11_core_idl) : ridl_core_defaults, install, pidl_install { idlflags += -SS -Sorb -Gp -Gd -Gatc -o . \ -I $(TAO_ROOT) \ -Wb,export_macro=TAOX11_Export \ - -Wb,export_include=tao/x11/taox11_export.h \ + -Wb,export_include=tao/x11/base/taox11_export.h \ -Wb,anytypecode_export_macro=TAOX11_AnyTypeCode_Export \ -Wb,anytypecode_export_include=tao/x11/anytypecode/taox11_anytypecode_export.h @@ -49,7 +49,7 @@ project(taox11_core_idl) : ridl_core_defaults, install, pidl_install { IDL_Files { idlflags -= -Wb,export_macro=TAOX11_Export \ - -Wb,export_include=tao/x11/taox11_export.h + -Wb,export_include=tao/x11/base/taox11_export.h idlflags += -Sots \ -Wb,export_macro=TAOX11_AnyTypeCode_Export \ -Wb,export_include=tao/x11/anytypecode/taox11_anytypecode_export.h @@ -288,18 +288,18 @@ project(taox11) : taox11_defaults, taolib { array_cdr_t.h basic_argument_t.h basic_arguments.h - basic_traits.h - bounded_map_t.h - bounded_string_t.h - bounded_type_traits_t.h - bounded_vector_t.h + base/basic_traits.h + base/bounded_map_t.h + base/bounded_string_t.h + base/bounded_type_traits_t.h + base/bounded_vector_t.h cdr_long_double.h corba.h dynamic_adapter.h exception.h exception_macros.h fixed_t.h - idl_traits_t.h + base/idl_traits_t.h ifr_client_adapter.h ifr_client_adapter_impl_base.h log.h @@ -325,21 +325,21 @@ project(taox11) : taox11_defaults, taolib { sequence_conversion_t.h special_basic_argument_t.h special_basic_arguments.h - stddef.h + base/stddef.h stub_arg_traits.h system_exception.h system_exception_x11.h - tao_corba.h - taox11_export.h + base/tao_corba.h + base/taox11_export.h typecode_factory_adapter.h user_exception.h user_exception_proxy_in_t.h user_exception_proxy_out.h valuefactory_manager_adapter.h valuetype_adapter.h - versioned_x11_namespace.h - versionx11.h - wstringwchar_ostream.h + base/versioned_x11_namespace.h + base/versionx11.h + base/wstringwchar_ostream.h } Header_Files { diff --git a/tao/x11/typecode_factory_adapter.h b/tao/x11/typecode_factory_adapter.h index 0a070aea..9a55c108 100644 --- a/tao/x11/typecode_factory_adapter.h +++ b/tao/x11/typecode_factory_adapter.h @@ -13,7 +13,7 @@ #pragma once #include "ace/Service_Object.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_traits_t.h" #include "tao/x11/orb_typesC.h" diff --git a/tao/x11/typecodefactory/taox11_typecodefactory_export.h b/tao/x11/typecodefactory/taox11_typecodefactory_export.h index 9fbb6b5f..805f3567 100644 --- a/tao/x11/typecodefactory/taox11_typecodefactory_export.h +++ b/tao/x11/typecodefactory/taox11_typecodefactory_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_TYPECODEFACTORY_EXPORT_H #define TAOX11_TYPECODEFACTORY_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_TYPECODEFACTORY_HAS_DLL) # define TAOX11_TYPECODEFACTORY_HAS_DLL 0 diff --git a/tao/x11/typecodefactory/typecodefactory.cpp b/tao/x11/typecodefactory/typecodefactory.cpp index bf05ea7e..42236edf 100644 --- a/tao/x11/typecodefactory/typecodefactory.cpp +++ b/tao/x11/typecodefactory/typecodefactory.cpp @@ -8,7 +8,7 @@ */ #include "tao/objectid.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "ace/Service_Config.h" #include "tao/x11/typecodefactory/typecodefactory.h" diff --git a/tao/x11/typecodefactory/typecodefactory.h b/tao/x11/typecodefactory/typecodefactory.h index ba75b5ed..db0047df 100644 --- a/tao/x11/typecodefactory/typecodefactory.h +++ b/tao/x11/typecodefactory/typecodefactory.h @@ -11,7 +11,7 @@ #pragma once -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_loader.h" #include "tao/x11/typecodefactory/taox11_typecodefactory_export.h" diff --git a/tao/x11/typecodefactory/typecodefactory_i.cpp b/tao/x11/typecodefactory/typecodefactory_i.cpp index cc106561..3d496026 100644 --- a/tao/x11/typecodefactory/typecodefactory_i.cpp +++ b/tao/x11/typecodefactory/typecodefactory_i.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/ORB_Core.h" #include "tao/TypeCodeFactory_Adapter.h" #include "tao/IFR_Client/IFR_BasicC.h" diff --git a/tao/x11/user_exception_proxy_in_t.h b/tao/x11/user_exception_proxy_in_t.h index 559a5cdf..c543debc 100644 --- a/tao/x11/user_exception_proxy_in_t.h +++ b/tao/x11/user_exception_proxy_in_t.h @@ -13,7 +13,7 @@ #pragma once #include "tao/x11/user_exception.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/UserException.h" // -------------------------------------------------------------- diff --git a/tao/x11/user_exception_proxy_out.h b/tao/x11/user_exception_proxy_out.h index abf90ae9..d4688803 100644 --- a/tao/x11/user_exception_proxy_out.h +++ b/tao/x11/user_exception_proxy_out.h @@ -13,7 +13,7 @@ #pragma once #include "tao/x11/user_exception.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/UserException.h" // -------------------------------------------------------------- diff --git a/tao/x11/valuefactory_manager_adapter.h b/tao/x11/valuefactory_manager_adapter.h index 3192719d..81d60932 100644 --- a/tao/x11/valuefactory_manager_adapter.h +++ b/tao/x11/valuefactory_manager_adapter.h @@ -13,7 +13,7 @@ #pragma once #include "ace/Service_Object.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/object_traits_t.h" namespace TAOX11_NAMESPACE diff --git a/tao/x11/valuetype/abstract_base.cpp b/tao/x11/valuetype/abstract_base.cpp index 768feb70..86842e35 100644 --- a/tao/x11/valuetype/abstract_base.cpp +++ b/tao/x11/valuetype/abstract_base.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/Stub.h" #include "tao/ORB_Core.h" #include "tao/CDR.h" diff --git a/tao/x11/valuetype/abstractbase_proxy.cpp b/tao/x11/valuetype/abstractbase_proxy.cpp index 3391f8a1..60750409 100644 --- a/tao/x11/valuetype/abstractbase_proxy.cpp +++ b/tao/x11/valuetype/abstractbase_proxy.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/anytypecode/typecode.h" #include "tao/x11/valuetype/abstractbase_proxy.h" diff --git a/tao/x11/valuetype/abstractbase_proxy.h b/tao/x11/valuetype/abstractbase_proxy.h index c26d8351..b0113c35 100644 --- a/tao/x11/valuetype/abstractbase_proxy.h +++ b/tao/x11/valuetype/abstractbase_proxy.h @@ -14,7 +14,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/Valuetype/AbstractBase.h" #include "tao/x11/valuetype/taox11_valuetype_export.h" #include "tao/x11/valuetype/abstract_base.h" diff --git a/tao/x11/valuetype/abstractbase_traits_t.h b/tao/x11/valuetype/abstractbase_traits_t.h index 069c7ee7..9d4e479d 100644 --- a/tao/x11/valuetype/abstractbase_traits_t.h +++ b/tao/x11/valuetype/abstractbase_traits_t.h @@ -13,7 +13,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/system_exception.h" #include "tao/x11/object_traits_t.h" #include "tao/x11/valuetype/valuetype_traits_t.h" diff --git a/tao/x11/valuetype/taox11_valuetype_export.h b/tao/x11/valuetype/taox11_valuetype_export.h index dc5d95d9..b9eb6f5d 100644 --- a/tao/x11/valuetype/taox11_valuetype_export.h +++ b/tao/x11/valuetype/taox11_valuetype_export.h @@ -9,7 +9,7 @@ #ifndef TAOX11_VALUETYPE_EXPORT_H #define TAOX11_VALUETYPE_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_VALUETYPE_HAS_DLL) # define TAOX11_VALUETYPE_HAS_DLL 0 diff --git a/tao/x11/valuetype/value_base.cpp b/tao/x11/valuetype/value_base.cpp index 2b551d54..f8ad42e8 100644 --- a/tao/x11/valuetype/value_base.cpp +++ b/tao/x11/valuetype/value_base.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/CDR.h" #include "tao/x11/anytypecode/typecode.h" diff --git a/tao/x11/valuetype/valuefactory_manager.cpp b/tao/x11/valuetype/valuefactory_manager.cpp index a41f4b32..65a38709 100644 --- a/tao/x11/valuetype/valuefactory_manager.cpp +++ b/tao/x11/valuetype/valuefactory_manager.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/orbproxy.h" #include "tao/x11/anytypecode/typecode.h" diff --git a/tao/x11/valuetype/valuetype_adapter_impl.cpp b/tao/x11/valuetype/valuetype_adapter_impl.cpp index c3fb5dbf..297241e9 100644 --- a/tao/x11/valuetype/valuetype_adapter_impl.cpp +++ b/tao/x11/valuetype/valuetype_adapter_impl.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/anytypecode/typecode.h" #include "tao/x11/valuetype/valuetype_adapter_impl.h" #include "tao/x11/valuetype/valuetype_proxies.h" diff --git a/tao/x11/valuetype/valuetype_proxies.cpp b/tao/x11/valuetype/valuetype_proxies.cpp index 9ebce3b7..bd28f7d1 100644 --- a/tao/x11/valuetype/valuetype_proxies.cpp +++ b/tao/x11/valuetype/valuetype_proxies.cpp @@ -7,7 +7,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/x11/anytypecode/typecode.h" #include "tao/x11/valuetype/valuetype_proxies.h" diff --git a/tao/x11/valuetype/valuetype_proxies.h b/tao/x11/valuetype/valuetype_proxies.h index 0875dff0..f51157e2 100644 --- a/tao/x11/valuetype/valuetype_proxies.h +++ b/tao/x11/valuetype/valuetype_proxies.h @@ -14,7 +14,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/tao_corba.h" +#include "tao/x11/base/tao_corba.h" #include "tao/Valuetype/AbstractBase.h" #include "tao/Valuetype/ValueBase.h" #include "tao/Valuetype/ValueFactory.h" diff --git a/tao/x11/valuetype/valuetype_traits_t.h b/tao/x11/valuetype/valuetype_traits_t.h index 42cf9679..ea5e0baa 100644 --- a/tao/x11/valuetype/valuetype_traits_t.h +++ b/tao/x11/valuetype/valuetype_traits_t.h @@ -13,7 +13,7 @@ #include /**/ "ace/config-all.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/system_exception.h" #include "tao/x11/valuetype/taox11_valuetype_export.h" diff --git a/tao/x11/valuetype_adapter.h b/tao/x11/valuetype_adapter.h index 985135a9..7b6f820d 100644 --- a/tao/x11/valuetype_adapter.h +++ b/tao/x11/valuetype_adapter.h @@ -14,7 +14,7 @@ #include "ace/Service_Object.h" -#include "tao/x11/stddef.h" +#include "tao/x11/base/stddef.h" #include "tao/x11/valuetype/abstractbase_traits_t.h" #include "tao/x11/valuetype/valuetype_traits_t.h" diff --git a/tests/ami_test/attr_raises/ami_test_ami_stub_export.h b/tests/ami_test/attr_raises/ami_test_ami_stub_export.h index 70aca21b..d8c6a222 100644 --- a/tests/ami_test/attr_raises/ami_test_ami_stub_export.h +++ b/tests/ami_test/attr_raises/ami_test_ami_stub_export.h @@ -9,7 +9,7 @@ #ifndef __RIDL_AMI_TEST_AMI_STUB_EXPORT_H_EXPORT_INCLUDED__ #define __RIDL_AMI_TEST_AMI_STUB_EXPORT_H_EXPORT_INCLUDED__ -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) && !defined (AMI_TEST_AMI_STUB_HAS_DLL) # define AMI_TEST_AMI_STUB_HAS_DLL 0 diff --git a/tests/custom_format/client.cpp b/tests/custom_format/client.cpp index 6068f6d1..664fcbeb 100644 --- a/tests/custom_format/client.cpp +++ b/tests/custom_format/client.cpp @@ -8,7 +8,7 @@ * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/idl_traits_t.h" +#include "tao/x11/base/idl_traits_t.h" // X11_FUZZ: disable check_taox11_namespaces namespace TAOX11_NAMESPACE diff --git a/tests/dynany/data.h b/tests/dynany/data.h index f2867d05..782bffcf 100644 --- a/tests/dynany/data.h +++ b/tests/dynany/data.h @@ -6,7 +6,7 @@ * * @copyright Copyright (c) Remedy IT Expertise BV */ -#include "tao/x11/basic_traits.h" +#include "tao/x11/base/basic_traits.h" #include "tao/x11/orb.h" #include "tao/x11/object.h" diff --git a/tests/include_chain/include_chain.mpc b/tests/include_chain/include_chain.mpc index 38340afb..631ac2ac 100644 --- a/tests/include_chain/include_chain.mpc +++ b/tests/include_chain/include_chain.mpc @@ -5,7 +5,7 @@ project(*x11_Idl): ridl_ostream_defaults, taox11_anytypecode { a.idl } IDL_Files { - idlflags += -Scp + idlflags += -Scph b.idl } IDL_Files { diff --git a/tests/obv/factory/client.cpp b/tests/obv/factory/client.cpp index 61ac56d8..c21440ae 100644 --- a/tests/obv/factory/client.cpp +++ b/tests/obv/factory/client.cpp @@ -12,7 +12,7 @@ #include "ace/Get_Opt.h" #include "testlib/taox11_testlog.h" -#include "tao/x11/basic_traits.h" +#include "tao/x11/base/basic_traits.h" #include "tao/x11/corba.h" #include "tao/x11/orb.h" #include "tao/x11/object.h" diff --git a/tests/poa/generic_servant/generic_servant_export.h b/tests/poa/generic_servant/generic_servant_export.h index c7b0bbfc..939d69cc 100644 --- a/tests/poa/generic_servant/generic_servant_export.h +++ b/tests/poa/generic_servant/generic_servant_export.h @@ -7,7 +7,7 @@ #ifndef GENERIC_SERVANT_EXPORT_H #define GENERIC_SERVANT_EXPORT_H -#include "tao/x11/taox11_export_macros.h" +#include "tao/x11/base/taox11_export_macros.h" #if defined (TAOX11_AS_STATIC_LIBS) # if !defined (GENERIC_SERVANT_HAS_DLL) diff --git a/tests/typelib/nocpp/client.cpp b/tests/typelib/nocpp/client.cpp new file mode 100644 index 00000000..92368158 --- /dev/null +++ b/tests/typelib/nocpp/client.cpp @@ -0,0 +1,30 @@ +/** + * @file client.cpp + * @author Johnny Willemsen + * + * @brief C++11 client application which uses IDL defines types + * without the full TAOX11 support + * + * @copyright Copyright (c) Remedy IT Expertise BV + */ + +#include "testC.h" + +// Check for ACE define + +int +main(int, char* []) +{ + int result {}; + + Test::Bar mybar; + + try + { + } + catch (const std::exception& e) + { + return 1; + } + return result; +} diff --git a/tests/typelib/nocpp/nocpp.mpc b/tests/typelib/nocpp/nocpp.mpc new file mode 100644 index 00000000..b2e66fb0 --- /dev/null +++ b/tests/typelib/nocpp/nocpp.mpc @@ -0,0 +1,19 @@ +// -*- MPC -*- + +project(*nocpp_gen_Idl): ridl_ostream_defaults { + idlflags += -Gcpc -Scc + IDL_Files { + ../test.idl + } + custom_only = 1 +} + +project(*nocpp_gen_Client) { + after += *nocpp_gen_Idl + Source_Files { + client.cpp + } + includes += $(TAOX11_ROOT) + macros += TAOX11_DISABLE_INCLUDE_ANYTYPECODE TAOX11_DISABLE_INCLUDE_STUB_PROXY_HDR +} + diff --git a/tests/typelib/nocpp/run_test.pl b/tests/typelib/nocpp/run_test.pl new file mode 100755 index 00000000..1a1bcc10 --- /dev/null +++ b/tests/typelib/nocpp/run_test.pl @@ -0,0 +1,31 @@ +#--------------------------------------------------------------------- +# @file run_test.pl +# @author Marcel Smit +# +# @copyright Copyright (c) Remedy IT Expertise BV +#--------------------------------------------------------------------- +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +my $target = PerlACE::TestTarget::create_target(2) || die "Create target 2 failed\n"; + +$status = 0; + +$SV = $target->CreateProcess ("client"); + +$server = $SV->SpawnWaitKill ($target->ProcessStartWaitInterval()); + +if ($server != 0) { + print STDERR "ERROR: client returned $server\n"; + $status = 1; +} + +$target->GetStderrLog(); + +exit $status; diff --git a/tests/typelib/shared/client.cpp b/tests/typelib/shared/client.cpp new file mode 100644 index 00000000..2b7d0f46 --- /dev/null +++ b/tests/typelib/shared/client.cpp @@ -0,0 +1,32 @@ +/** + * @file client.cpp + * @author Johnny Willemsen + * + * @brief C++11 client application which uses IDL defines types + * and TAOX11 + * + * @copyright Copyright (c) Remedy IT Expertise BV + */ + +#include "testC.h" + +// Check for ACE define + +int +main(int, char* []) +{ + int result {}; + + Test::Bar mybar; + CORBA::Any a; + a <<= mybar; + + try + { + } + catch (const std::exception& e) + { + return 1; + } + return result; +} diff --git a/tests/typelib/shared/run_test.pl b/tests/typelib/shared/run_test.pl new file mode 100755 index 00000000..1a1bcc10 --- /dev/null +++ b/tests/typelib/shared/run_test.pl @@ -0,0 +1,31 @@ +#--------------------------------------------------------------------- +# @file run_test.pl +# @author Marcel Smit +# +# @copyright Copyright (c) Remedy IT Expertise BV +#--------------------------------------------------------------------- +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +my $target = PerlACE::TestTarget::create_target(2) || die "Create target 2 failed\n"; + +$status = 0; + +$SV = $target->CreateProcess ("client"); + +$server = $SV->SpawnWaitKill ($target->ProcessStartWaitInterval()); + +if ($server != 0) { + print STDERR "ERROR: client returned $server\n"; + $status = 1; +} + +$target->GetStderrLog(); + +exit $status; diff --git a/tests/typelib/shared/typelibshared.mpc b/tests/typelib/shared/typelibshared.mpc new file mode 100644 index 00000000..956335b1 --- /dev/null +++ b/tests/typelib/shared/typelibshared.mpc @@ -0,0 +1,43 @@ +// -*- MPC -*- + +project(*typelibshared_gen_idl): ridl_ostream_defaults { + idlflags += -Gcpc -Gatc -Gath -Wb,base_export_macro=TYPELIB -Wb,base_export_include=TYPELIB -Gxhat -Gxhcp + idlflags -= -Sa -St + IDL_Files { + ../test.idl + } + custom_only = 1 +} + +project(*typelibshared_clientproxy): taox11_lib { + after += *typelibshared_gen_idl + sharedname = typelibshared_clientproxy + dynamicflags += TYPELIB_CLIENT_PROXY_BUILD_DLL + Source_Files { + testCP.cpp + } +} + +project(*typelibshared_anytypecode): taox11_lib, taox11_anytypecode { + after += *typelibshared_gen_idl *typelibshared_clientproxy + sharedname = typelibshared_anytypecode + dynamicflags += TYPELIB_ANYTYPECODE_BUILD_DLL + libs += typelibshared_clientproxy + Source_Files { + testA.cpp + } +} + +project(*typelibshared_client): taox11_client, taox11_anytypecode { + after += *typelibshared_gen_idl *typelibshared_clientproxy *typelibshared_anytypecode + libs += typelibshared_anytypecode typelibshared_clientproxy + Source_Files { + client.cpp + } + Source_Files { + testC.cpp + } +} + + + diff --git a/tests/typelib/stdlib/client.cpp b/tests/typelib/stdlib/client.cpp new file mode 100644 index 00000000..92368158 --- /dev/null +++ b/tests/typelib/stdlib/client.cpp @@ -0,0 +1,30 @@ +/** + * @file client.cpp + * @author Johnny Willemsen + * + * @brief C++11 client application which uses IDL defines types + * without the full TAOX11 support + * + * @copyright Copyright (c) Remedy IT Expertise BV + */ + +#include "testC.h" + +// Check for ACE define + +int +main(int, char* []) +{ + int result {}; + + Test::Bar mybar; + + try + { + } + catch (const std::exception& e) + { + return 1; + } + return result; +} diff --git a/tests/typelib/stdlib/run_test.pl b/tests/typelib/stdlib/run_test.pl new file mode 100755 index 00000000..1a1bcc10 --- /dev/null +++ b/tests/typelib/stdlib/run_test.pl @@ -0,0 +1,31 @@ +#--------------------------------------------------------------------- +# @file run_test.pl +# @author Marcel Smit +# +# @copyright Copyright (c) Remedy IT Expertise BV +#--------------------------------------------------------------------- +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +my $target = PerlACE::TestTarget::create_target(2) || die "Create target 2 failed\n"; + +$status = 0; + +$SV = $target->CreateProcess ("client"); + +$server = $SV->SpawnWaitKill ($target->ProcessStartWaitInterval()); + +if ($server != 0) { + print STDERR "ERROR: client returned $server\n"; + $status = 1; +} + +$target->GetStderrLog(); + +exit $status; diff --git a/tests/typelib/stdlib/typelibstdlib.mpc b/tests/typelib/stdlib/typelibstdlib.mpc new file mode 100644 index 00000000..305e4724 --- /dev/null +++ b/tests/typelib/stdlib/typelibstdlib.mpc @@ -0,0 +1,23 @@ +// -*- MPC -*- + +project(*stdlib_gen_Idl): ridl_ostream_defaults { + idlflags += -Gcpc -Gatc -Gath + idlflags -= -Sa -St + IDL_Files { + ../test.idl + } + custom_only = 1 +} + +project(*stdlib_gen_Client) { + after += *stdlib_gen_Idl + Source_Files { + client.cpp + } + Source_Files { + testC.cpp + } + includes += $(TAOX11_ROOT) + macros += TAOX11_DISABLE_INCLUDE_ANYTYPECODE TAOX11_DISABLE_INCLUDE_STUB_PROXY_HDR +} + diff --git a/tests/typelib/taox11/client.cpp b/tests/typelib/taox11/client.cpp new file mode 100644 index 00000000..aeeca818 --- /dev/null +++ b/tests/typelib/taox11/client.cpp @@ -0,0 +1,30 @@ +/** + * @file client.cpp + * @author Johnny Willemsen + * + * @brief C++11 client application which uses IDL defines types + * and TAOX11 + * + * @copyright Copyright (c) Remedy IT Expertise BV + */ + +#include "testC.h" + +// Check for ACE define + +int +main(int, char* []) +{ + int result {}; + + Test::Bar mybar; + + try + { + } + catch (const std::exception& e) + { + return 1; + } + return result; +} diff --git a/tests/typelib/taox11/run_test.pl b/tests/typelib/taox11/run_test.pl new file mode 100755 index 00000000..1a1bcc10 --- /dev/null +++ b/tests/typelib/taox11/run_test.pl @@ -0,0 +1,31 @@ +#--------------------------------------------------------------------- +# @file run_test.pl +# @author Marcel Smit +# +# @copyright Copyright (c) Remedy IT Expertise BV +#--------------------------------------------------------------------- +eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' + & eval 'exec perl -S $0 $argv:q' + if 0; + +# -*- perl -*- + +use lib "$ENV{ACE_ROOT}/bin"; +use PerlACE::TestTarget; + +my $target = PerlACE::TestTarget::create_target(2) || die "Create target 2 failed\n"; + +$status = 0; + +$SV = $target->CreateProcess ("client"); + +$server = $SV->SpawnWaitKill ($target->ProcessStartWaitInterval()); + +if ($server != 0) { + print STDERR "ERROR: client returned $server\n"; + $status = 1; +} + +$target->GetStderrLog(); + +exit $status; diff --git a/tests/typelib/taox11/typelibtaox11.mpc b/tests/typelib/taox11/typelibtaox11.mpc new file mode 100644 index 00000000..77ecab89 --- /dev/null +++ b/tests/typelib/taox11/typelibtaox11.mpc @@ -0,0 +1,24 @@ +// -*- MPC -*- + +project(*proxysource_gen_Idl): ridl_ostream_defaults { + idlflags += -Gcpc -Gatc -Gath + idlflags -= -Sa -St + IDL_Files { + ../test.idl + } + custom_only = 1 +} + +project(*proxysource_taox11_Client): taox11_client, taox11_anytypecode { + after += *proxysource_gen_Idl + Source_Files { + client.cpp + } + Source_Files { + testC.cpp + testA.cpp + testCP.cpp + } +} + + diff --git a/tests/typelib/test.idl b/tests/typelib/test.idl new file mode 100644 index 00000000..6a9ce5f6 --- /dev/null +++ b/tests/typelib/test.idl @@ -0,0 +1,36 @@ +/** + * @file test.idl + * @author Johnny Willemsen + * + * Only use types that should be usable with the CORBA support in the proxy source + * - basic types + * - struct + * - union (be aware of the exception + * - (bounded) (w)string + * - (bounded) sequences + * + * @copyright Copyright (c) Remedy IT Expertise BV + */ + +module Test +{ + typedef short myshort; + struct Bar + { + short my1; + }; + typedef string<6> b_string; + typedef wstring<6> b_wstring; + + enum Color { + COLOR_RED, + COLOR_BLUE + }; + union TestUnion_U3 switch(Color) + { + case COLOR_BLUE: + short myshort; + case COLOR_RED: + long mylong; + }; +};