From d9bfb8dd3ae3e4eed8ee7d22660ed2c6da109e7b Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 18 Dec 2024 09:36:06 +0100 Subject: [PATCH] Regenerated after https://github.com/DOCGroup/ACE_TAO/pull/2309 --- tests/AMH_Exceptions/TestC.h | 4 +- tests/AMH_Exceptions/TestS.cpp | 30 +- tests/AMH_Exceptions/TestS.h | 6 +- tests/AMI/ami_testC.h | 4 +- tests/AMI/ami_testS.cpp | 68 +- tests/AMI/ami_testS.h | 12 +- tests/Hello/TestC.h | 4 +- tests/Hello/TestS.cpp | 19 +- tests/Hello/TestS.h | 6 +- tests/IDL_Test/Bug_2350_RegressionC.h | 4 +- tests/IDL_Test/Bug_2350_RegressionS.cpp | 46 +- tests/IDL_Test/Bug_2350_RegressionS.h | 8 +- tests/IDL_Test/Bug_2577_RegressionC.h | 4 +- tests/IDL_Test/Bug_2577_RegressionS.cpp | 46 +- tests/IDL_Test/Bug_2577_RegressionS.h | 8 +- tests/IDL_Test/Bug_2582_RegressionC.h | 4 +- tests/IDL_Test/Bug_2582_RegressionS.cpp | 46 +- tests/IDL_Test/Bug_2582_RegressionS.h | 8 +- tests/IDL_Test/Bug_2583_RegressionC.h | 4 +- tests/IDL_Test/Bug_2583_RegressionS.cpp | 4 +- tests/IDL_Test/Bug_2583_RegressionS.h | 4 +- tests/IDL_Test/Bug_2616_RegressionC.h | 4 +- tests/IDL_Test/Bug_2616_RegressionS.cpp | 88 +- tests/IDL_Test/Bug_2616_RegressionS.h | 12 +- tests/IDL_Test/Bug_2619_RegressionC.h | 4 +- tests/IDL_Test/Bug_2619_RegressionS.cpp | 46 +- tests/IDL_Test/Bug_2619_RegressionS.h | 8 +- tests/IDL_Test/Bug_3243_RegressionC.h | 4 +- tests/IDL_Test/Bug_3243_RegressionS.cpp | 4 +- tests/IDL_Test/Bug_3243_RegressionS.h | 4 +- tests/IDL_Test/Bug_3312_RegressionC.h | 4 +- tests/IDL_Test/Bug_3312_RegressionS.cpp | 4 +- tests/IDL_Test/Bug_3312_RegressionS.h | 4 +- tests/IDL_Test/Bug_3819_RegressionC.h | 4 +- tests/IDL_Test/Bug_3819_RegressionS.cpp | 4 +- tests/IDL_Test/Bug_3819_RegressionS.h | 4 +- tests/IDL_Test/Bug_3821_RegressionC.h | 4 +- tests/IDL_Test/Bug_3821_RegressionS.cpp | 4 +- tests/IDL_Test/Bug_3821_RegressionS.h | 4 +- tests/IDL_Test/PEMNamingC.h | 4 +- tests/IDL_Test/PEMNamingS.cpp | 46 +- tests/IDL_Test/PEMNamingS.h | 8 +- tests/IDL_Test/TestVersionedNamespace2C.h | 4 +- tests/IDL_Test/TestVersionedNamespace2S.cpp | 108 +- tests/IDL_Test/TestVersionedNamespace2S.h | 12 +- tests/IDL_Test/TestVersionedNamespaceC.h | 4 +- tests/IDL_Test/TestVersionedNamespaceS.cpp | 4 +- tests/IDL_Test/TestVersionedNamespaceS.h | 4 +- tests/IDL_Test/anonymousA.h | 4 +- tests/IDL_Test/anonymousC.h | 4 +- tests/IDL_Test/anonymousS.cpp | 46 +- tests/IDL_Test/anonymousS.h | 8 +- tests/IDL_Test/anyunionC.h | 4 +- tests/IDL_Test/anyunionS.cpp | 4 +- tests/IDL_Test/anyunionS.h | 4 +- tests/IDL_Test/arrayC.h | 4 +- tests/IDL_Test/arrayS.cpp | 129 +-- tests/IDL_Test/arrayS.h | 16 +- tests/IDL_Test/array_anon_nestedC.h | 4 +- tests/IDL_Test/array_anon_nestedS.cpp | 4 +- tests/IDL_Test/array_anon_nestedS.h | 4 +- tests/IDL_Test/array_anonymousC.h | 4 +- tests/IDL_Test/array_anonymousS.cpp | 45 +- tests/IDL_Test/array_anonymousS.h | 8 +- tests/IDL_Test/array_onlyA.h | 4 +- tests/IDL_Test/array_onlyC.h | 4 +- tests/IDL_Test/array_onlyS.cpp | 4 +- tests/IDL_Test/array_onlyS.h | 4 +- tests/IDL_Test/attributeC.h | 4 +- tests/IDL_Test/attributeS.cpp | 46 +- tests/IDL_Test/attributeS.h | 8 +- tests/IDL_Test/constantsA.h | 4 +- tests/IDL_Test/constantsC.h | 4 +- tests/IDL_Test/constantsS.cpp | 45 +- tests/IDL_Test/constantsS.h | 8 +- tests/IDL_Test/dif2A.h | 4 +- tests/IDL_Test/dif2C.h | 4 +- tests/IDL_Test/dif2S.cpp | 187 +--- tests/IDL_Test/dif2S.h | 20 +- tests/IDL_Test/enum_in_structC.h | 4 +- tests/IDL_Test/enum_in_structS.cpp | 4 +- tests/IDL_Test/enum_in_structS.h | 4 +- tests/IDL_Test/expressionsC.h | 4 +- tests/IDL_Test/expressionsS.cpp | 4 +- tests/IDL_Test/expressionsS.h | 4 +- tests/IDL_Test/fullC.h | 4 +- tests/IDL_Test/fullS.cpp | 85 +- tests/IDL_Test/fullS.h | 12 +- tests/IDL_Test/fwdC.h | 4 +- tests/IDL_Test/fwdS.cpp | 147 +-- tests/IDL_Test/fwdS.h | 20 +- tests/IDL_Test/generic_objectA.h | 4 +- tests/IDL_Test/generic_objectC.h | 4 +- tests/IDL_Test/generic_objectS.cpp | 46 +- tests/IDL_Test/generic_objectS.h | 8 +- tests/IDL_Test/gperfC.h | 4 +- tests/IDL_Test/gperfS.cpp | 129 +-- tests/IDL_Test/gperfS.h | 16 +- tests/IDL_Test/includedC.h | 4 +- tests/IDL_Test/includedS.cpp | 86 +- tests/IDL_Test/includedS.h | 12 +- tests/IDL_Test/includingC.h | 4 +- tests/IDL_Test/includingS.cpp | 172 +-- tests/IDL_Test/includingS.h | 20 +- tests/IDL_Test/inheritA.h | 4 +- tests/IDL_Test/inheritC.h | 4 +- tests/IDL_Test/inheritS.cpp | 241 +--- tests/IDL_Test/inheritS.h | 24 +- tests/IDL_Test/interfaceC.h | 4 +- tests/IDL_Test/interfaceS.cpp | 1101 +++++-------------- tests/IDL_Test/interfaceS.h | 108 +- tests/IDL_Test/keywordsC.h | 4 +- tests/IDL_Test/keywordsS.cpp | 46 +- tests/IDL_Test/keywordsS.h | 8 +- tests/IDL_Test/loader_constC.h | 4 +- tests/IDL_Test/loader_constS.cpp | 4 +- tests/IDL_Test/loader_constS.h | 4 +- tests/IDL_Test/moduleA.h | 4 +- tests/IDL_Test/moduleC.h | 4 +- tests/IDL_Test/moduleS.cpp | 91 +- tests/IDL_Test/moduleS.h | 12 +- tests/IDL_Test/nested_scopeC.h | 4 +- tests/IDL_Test/nested_scopeS.cpp | 289 ++--- tests/IDL_Test/nested_scopeS.h | 32 +- tests/IDL_Test/old_arrayC.h | 4 +- tests/IDL_Test/old_arrayS.cpp | 46 +- tests/IDL_Test/old_arrayS.h | 8 +- tests/IDL_Test/old_constantsC.h | 4 +- tests/IDL_Test/old_constantsS.cpp | 46 +- tests/IDL_Test/old_constantsS.h | 8 +- tests/IDL_Test/old_sequenceC.h | 4 +- tests/IDL_Test/old_sequenceS.cpp | 46 +- tests/IDL_Test/old_sequenceS.h | 8 +- tests/IDL_Test/old_structC.h | 4 +- tests/IDL_Test/old_structS.cpp | 91 +- tests/IDL_Test/old_structS.h | 12 +- tests/IDL_Test/old_union2C.h | 4 +- tests/IDL_Test/old_union2S.cpp | 4 +- tests/IDL_Test/old_union2S.h | 4 +- tests/IDL_Test/old_unionC.h | 4 +- tests/IDL_Test/old_unionS.cpp | 46 +- tests/IDL_Test/old_unionS.h | 8 +- tests/IDL_Test/paramsC.h | 4 +- tests/IDL_Test/paramsS.cpp | 46 +- tests/IDL_Test/paramsS.h | 8 +- tests/IDL_Test/pragmaA.h | 4 +- tests/IDL_Test/pragmaC.h | 4 +- tests/IDL_Test/pragmaS.cpp | 199 +--- tests/IDL_Test/pragmaS.h | 24 +- tests/IDL_Test/primtypesA.h | 4 +- tests/IDL_Test/primtypesC.h | 4 +- tests/IDL_Test/primtypesS.cpp | 91 +- tests/IDL_Test/primtypesS.h | 12 +- tests/IDL_Test/reopen_include1C.h | 4 +- tests/IDL_Test/reopen_include1S.cpp | 46 +- tests/IDL_Test/reopen_include1S.h | 8 +- tests/IDL_Test/reopen_include2C.h | 4 +- tests/IDL_Test/reopen_include2S.cpp | 46 +- tests/IDL_Test/reopen_include2S.h | 8 +- tests/IDL_Test/reopened_modulesC.h | 4 +- tests/IDL_Test/reopened_modulesS.cpp | 888 ++++----------- tests/IDL_Test/reopened_modulesS.h | 88 +- tests/IDL_Test/repo_id_modA.h | 4 +- tests/IDL_Test/repo_id_modC.h | 4 +- tests/IDL_Test/repo_id_modS.cpp | 4 +- tests/IDL_Test/repo_id_modS.h | 4 +- tests/IDL_Test/sequenceC.h | 4 +- tests/IDL_Test/sequenceS.cpp | 4 +- tests/IDL_Test/sequenceS.h | 4 +- tests/IDL_Test/sequence_anonymousC.h | 4 +- tests/IDL_Test/sequence_anonymousS.cpp | 46 +- tests/IDL_Test/sequence_anonymousS.h | 8 +- tests/IDL_Test/simple2C.h | 4 +- tests/IDL_Test/simple2S.cpp | 52 +- tests/IDL_Test/simple2S.h | 8 +- tests/IDL_Test/simpleC.h | 4 +- tests/IDL_Test/simpleS.cpp | 91 +- tests/IDL_Test/simpleS.h | 12 +- tests/IDL_Test/string_valueC.h | 4 +- tests/IDL_Test/string_valueS.cpp | 4 +- tests/IDL_Test/string_valueS.h | 4 +- tests/IDL_Test/structC.h | 4 +- tests/IDL_Test/structS.cpp | 4 +- tests/IDL_Test/structS.h | 4 +- tests/IDL_Test/typecodeA.h | 4 +- tests/IDL_Test/typecodeC.h | 4 +- tests/IDL_Test/typecodeS.cpp | 4 +- tests/IDL_Test/typecodeS.h | 4 +- tests/IDL_Test/typedefA.h | 4 +- tests/IDL_Test/typedefC.h | 4 +- tests/IDL_Test/typedefS.cpp | 214 +--- tests/IDL_Test/typedefS.h | 24 +- tests/IDL_Test/typeprefixC.h | 4 +- tests/IDL_Test/typeprefixS.cpp | 85 +- tests/IDL_Test/typeprefixS.h | 12 +- tests/IDL_Test/unionC.h | 4 +- tests/IDL_Test/unionS.cpp | 4 +- tests/IDL_Test/unionS.h | 4 +- tests/IDL_Test/union_anonymousC.h | 4 +- tests/IDL_Test/union_anonymousS.cpp | 4 +- tests/IDL_Test/union_anonymousS.h | 4 +- tests/IDL_Test/valuetypeC.h | 4 +- tests/IDL_Test/valuetypeS.cpp | 4 +- tests/IDL_Test/valuetypeS.h | 4 +- tests/Strategies/simple_testC.h | 4 +- tests/Strategies/simple_testS.cpp | 19 +- tests/Strategies/simple_testS.h | 6 +- 207 files changed, 1951 insertions(+), 4787 deletions(-) diff --git a/tests/AMH_Exceptions/TestC.h b/tests/AMH_Exceptions/TestC.h index 2bfc245..fc570e6 100644 --- a/tests/AMH_Exceptions/TestC.h +++ b/tests/AMH_Exceptions/TestC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_TESTC_GZ7QDK_H_ -#define _TAO_IDL_TESTC_GZ7QDK_H_ +#ifndef _TAO_IDL_TESTC_JSUCIW_H_ +#define _TAO_IDL_TESTC_JSUCIW_H_ #include /**/ "ace/pre.h" diff --git a/tests/AMH_Exceptions/TestS.cpp b/tests/AMH_Exceptions/TestS.cpp index 5522964..2999e80 100644 --- a/tests/AMH_Exceptions/TestS.cpp +++ b/tests/AMH_Exceptions/TestS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_TESTS_GZ7QDK_CPP_ -#define _TAO_IDL_TESTS_GZ7QDK_CPP_ +#ifndef _TAO_IDL_TESTS_JSUCIW_CPP_ +#define _TAO_IDL_TESTS_JSUCIW_CPP_ #include "TestS.h" @@ -143,15 +143,8 @@ static TAO_Test_AMH_Roundtrip_Perfect_Hash_OpTable tao_Test_AMH_Roundtrip_optabl POA_Test::AMH_Roundtrip::AMH_Roundtrip () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Test_AMH_Roundtrip_optable); -} - -POA_Test::AMH_Roundtrip::AMH_Roundtrip (const AMH_Roundtrip& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Test_AMH_Roundtrip_optable); } @@ -245,7 +238,7 @@ POA_Test::AMH_Roundtrip::shutdown_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -383,15 +376,8 @@ static TAO_Test_Roundtrip_Perfect_Hash_OpTable tao_Test_Roundtrip_optable; POA_Test::Roundtrip::Roundtrip () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Test_Roundtrip_optable); -} - -POA_Test::Roundtrip::Roundtrip (const Roundtrip& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Test_Roundtrip_optable); } @@ -559,7 +545,7 @@ void POA_Test::Roundtrip::shutdown_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -581,7 +567,7 @@ const char* POA_Test::Roundtrip::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -594,7 +580,7 @@ void POA_Test::Roundtrip::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/AMH_Exceptions/TestS.h b/tests/AMH_Exceptions/TestS.h index f2af0cb..ebc8146 100644 --- a/tests/AMH_Exceptions/TestS.h +++ b/tests/AMH_Exceptions/TestS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_TESTS_GZ7QDK_H_ -#define _TAO_IDL_TESTS_GZ7QDK_H_ +#ifndef _TAO_IDL_TESTS_JSUCIW_H_ +#define _TAO_IDL_TESTS_JSUCIW_H_ #include /**/ "ace/pre.h" @@ -206,7 +206,7 @@ class Roundtrip typedef ::Test::Roundtrip_ptr _stub_ptr_type; typedef ::Test::Roundtrip_var _stub_var_type; - Roundtrip (const Roundtrip& rhs); + Roundtrip (const Roundtrip& rhs) = default; virtual ~Roundtrip () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/AMI/ami_testC.h b/tests/AMI/ami_testC.h index 1e7923e..2bb00cb 100644 --- a/tests/AMI/ami_testC.h +++ b/tests/AMI/ami_testC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_AMI_TESTC_ARLYJR_H_ -#define _TAO_IDL_AMI_TESTC_ARLYJR_H_ +#ifndef _TAO_IDL_AMI_TESTC_A71B7N_H_ +#define _TAO_IDL_AMI_TESTC_A71B7N_H_ #include /**/ "ace/pre.h" diff --git a/tests/AMI/ami_testS.cpp b/tests/AMI/ami_testS.cpp index b0e76fc..742c60a 100644 --- a/tests/AMI/ami_testS.cpp +++ b/tests/AMI/ami_testS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_AMI_TESTS_YBOHFQ_CPP_ -#define _TAO_IDL_AMI_TESTS_YBOHFQ_CPP_ +#ifndef _TAO_IDL_AMI_TESTS_DTYKC7_CPP_ +#define _TAO_IDL_AMI_TESTS_DTYKC7_CPP_ #include "ami_testS.h" @@ -164,15 +164,8 @@ static TAO_A_AMI_Test_Perfect_Hash_OpTable tao_A_AMI_Test_optable; POA_A::AMI_Test::AMI_Test () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_AMI_Test_optable); -} - -POA_A::AMI_Test::AMI_Test (const AMI_Test& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_A_AMI_Test_optable); } @@ -597,7 +590,7 @@ void POA_A::AMI_Test::inout_arg_test_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -619,7 +612,7 @@ const char* POA_A::AMI_Test::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -632,7 +625,7 @@ void POA_A::AMI_Test::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -749,16 +742,8 @@ static TAO_A_AMI_AMI_TestHandler_Perfect_Hash_OpTable tao_A_AMI_AMI_TestHandler_ POA_A::AMI_AMI_TestHandler::AMI_AMI_TestHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_AMI_AMI_TestHandler_optable); -} - -POA_A::AMI_AMI_TestHandler::AMI_AMI_TestHandler (const AMI_AMI_TestHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_A_AMI_AMI_TestHandler_optable); } @@ -1442,7 +1427,7 @@ void POA_A::AMI_AMI_TestHandler::inout_arg_test_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1465,7 +1450,7 @@ const char* POA_A::AMI_AMI_TestHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1478,7 +1463,7 @@ void POA_A::AMI_AMI_TestHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1611,16 +1596,8 @@ static TAO_A_Test_Child_Perfect_Hash_OpTable tao_A_Test_Child_optable; POA_A::Test_Child::Test_Child () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_Test_Child_optable); -} - -POA_A::Test_Child::Test_Child (const Test_Child& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_A::AMI_Test (rhs) { + this->optable_ = std::addressof (tao_A_Test_Child_optable); } @@ -1691,7 +1668,7 @@ void POA_A::Test_Child::child_op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1714,7 +1691,7 @@ const char* POA_A::Test_Child::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1727,7 +1704,7 @@ void POA_A::Test_Child::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1846,17 +1823,8 @@ static TAO_A_AMI_Test_ChildHandler_Perfect_Hash_OpTable tao_A_AMI_Test_ChildHand POA_A::AMI_Test_ChildHandler::AMI_Test_ChildHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_AMI_Test_ChildHandler_optable); -} - -POA_A::AMI_Test_ChildHandler::AMI_Test_ChildHandler (const AMI_Test_ChildHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_A::AMI_AMI_TestHandler (rhs) { + this->optable_ = std::addressof (tao_A_AMI_Test_ChildHandler_optable); } @@ -2008,7 +1976,7 @@ void POA_A::AMI_Test_ChildHandler::child_op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2032,7 +2000,7 @@ const char* POA_A::AMI_Test_ChildHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2045,7 +2013,7 @@ void POA_A::AMI_Test_ChildHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/AMI/ami_testS.h b/tests/AMI/ami_testS.h index 2491750..404b550 100644 --- a/tests/AMI/ami_testS.h +++ b/tests/AMI/ami_testS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_AMI_TESTS_YBOHFQ_H_ -#define _TAO_IDL_AMI_TESTS_YBOHFQ_H_ +#ifndef _TAO_IDL_AMI_TESTS_DTYKC7_H_ +#define _TAO_IDL_AMI_TESTS_DTYKC7_H_ #include /**/ "ace/pre.h" @@ -190,7 +190,7 @@ namespace POA_A typedef ::A::AMI_Test_ptr _stub_ptr_type; typedef ::A::AMI_Test_var _stub_var_type; - AMI_Test (const AMI_Test& rhs); + AMI_Test (const AMI_Test& rhs) = default; virtual ~AMI_Test () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -275,7 +275,7 @@ namespace POA_A typedef ::A::AMI_AMI_TestHandler_ptr _stub_ptr_type; typedef ::A::AMI_AMI_TestHandler_var _stub_var_type; - AMI_AMI_TestHandler (const AMI_AMI_TestHandler& rhs); + AMI_AMI_TestHandler (const AMI_AMI_TestHandler& rhs) = default; virtual ~AMI_AMI_TestHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -390,7 +390,7 @@ namespace POA_A typedef ::A::Test_Child_ptr _stub_ptr_type; typedef ::A::Test_Child_var _stub_var_type; - Test_Child (const Test_Child& rhs); + Test_Child (const Test_Child& rhs) = default; virtual ~Test_Child () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -434,7 +434,7 @@ namespace POA_A typedef ::A::AMI_Test_ChildHandler_ptr _stub_ptr_type; typedef ::A::AMI_Test_ChildHandler_var _stub_var_type; - AMI_Test_ChildHandler (const AMI_Test_ChildHandler& rhs); + AMI_Test_ChildHandler (const AMI_Test_ChildHandler& rhs) = default; virtual ~AMI_Test_ChildHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/Hello/TestC.h b/tests/Hello/TestC.h index e23759d..db609a0 100644 --- a/tests/Hello/TestC.h +++ b/tests/Hello/TestC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_TESTC_JEBU0I_H_ -#define _TAO_IDL_TESTC_JEBU0I_H_ +#ifndef _TAO_IDL_TESTC_3BYG5H_H_ +#define _TAO_IDL_TESTC_3BYG5H_H_ #include /**/ "ace/pre.h" diff --git a/tests/Hello/TestS.cpp b/tests/Hello/TestS.cpp index 68100e4..75be8df 100644 --- a/tests/Hello/TestS.cpp +++ b/tests/Hello/TestS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_TESTS_JEBU0I_CPP_ -#define _TAO_IDL_TESTS_JEBU0I_CPP_ +#ifndef _TAO_IDL_TESTS_DUKXKD_CPP_ +#define _TAO_IDL_TESTS_DUKXKD_CPP_ #include "TestS.h" @@ -140,15 +140,8 @@ static TAO_Test_Hello_Perfect_Hash_OpTable tao_Test_Hello_optable; POA_Test::Hello::Hello () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Test_Hello_optable); -} - -POA_Test::Hello::Hello (const Hello& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Test_Hello_optable); } @@ -291,7 +284,7 @@ void POA_Test::Hello::shutdown_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -313,7 +306,7 @@ const char* POA_Test::Hello::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -326,7 +319,7 @@ void POA_Test::Hello::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/Hello/TestS.h b/tests/Hello/TestS.h index 975d27e..af0decb 100644 --- a/tests/Hello/TestS.h +++ b/tests/Hello/TestS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_TESTS_JEBU0I_H_ -#define _TAO_IDL_TESTS_JEBU0I_H_ +#ifndef _TAO_IDL_TESTS_3BYG5H_H_ +#define _TAO_IDL_TESTS_3BYG5H_H_ #include /**/ "ace/pre.h" @@ -107,7 +107,7 @@ namespace POA_Test typedef ::Test::Hello_ptr _stub_ptr_type; typedef ::Test::Hello_var _stub_var_type; - Hello (const Hello& rhs); + Hello (const Hello& rhs) = default; virtual ~Hello () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/Bug_2350_RegressionC.h b/tests/IDL_Test/Bug_2350_RegressionC.h index e9297c2..30cb1d2 100644 --- a/tests/IDL_Test/Bug_2350_RegressionC.h +++ b/tests/IDL_Test/Bug_2350_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_2350_REGRESSIONC_YPATHP_H_ -#define _TAO_IDL_BUG_2350_REGRESSIONC_YPATHP_H_ +#ifndef _TAO_IDL_BUG_2350_REGRESSIONC_NLVIPS_H_ +#define _TAO_IDL_BUG_2350_REGRESSIONC_NLVIPS_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_2350_RegressionS.cpp b/tests/IDL_Test/Bug_2350_RegressionS.cpp index 3c8f20f..da04eeb 100644 --- a/tests/IDL_Test/Bug_2350_RegressionS.cpp +++ b/tests/IDL_Test/Bug_2350_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_2350_REGRESSIONS_YPATHP_CPP_ -#define _TAO_IDL_BUG_2350_REGRESSIONS_YPATHP_CPP_ +#ifndef _TAO_IDL_BUG_2350_REGRESSIONS_AX18YX_CPP_ +#define _TAO_IDL_BUG_2350_REGRESSIONS_AX18YX_CPP_ #include "Bug_2350_RegressionS.h" @@ -145,15 +145,8 @@ static TAO_AMH_Bug_2350_Regression_Perfect_Hash_OpTable tao_AMH_Bug_2350_Regress POA_AMH_Bug_2350_Regression::POA_AMH_Bug_2350_Regression () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_Bug_2350_Regression_optable); -} - -POA_AMH_Bug_2350_Regression::POA_AMH_Bug_2350_Regression (const POA_AMH_Bug_2350_Regression& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_Bug_2350_Regression_optable); } @@ -208,7 +201,7 @@ POA_AMH_Bug_2350_Regression::Bug_2350_Regression_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -381,15 +374,8 @@ _TAO_Bug_2350_Regression_Direct_Proxy_Impl::Bug_2350_Regression_excep ( POA_Bug_2350_Regression::POA_Bug_2350_Regression () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Bug_2350_Regression_optable); -} - -POA_Bug_2350_Regression::POA_Bug_2350_Regression (const POA_Bug_2350_Regression& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Bug_2350_Regression_optable); } @@ -482,7 +468,7 @@ void POA_Bug_2350_Regression::Bug_2350_Regression_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -504,7 +490,7 @@ const char* POA_Bug_2350_Regression::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -517,7 +503,7 @@ void POA_Bug_2350_Regression::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -715,16 +701,8 @@ _TAO_AMI_Bug_2350_RegressionHandler_Direct_Proxy_Impl::Bug_2350_Regression_excep POA_AMI_Bug_2350_RegressionHandler::POA_AMI_Bug_2350_RegressionHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_Bug_2350_RegressionHandler_optable); -} - -POA_AMI_Bug_2350_RegressionHandler::POA_AMI_Bug_2350_RegressionHandler (const POA_AMI_Bug_2350_RegressionHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_Bug_2350_RegressionHandler_optable); } @@ -886,7 +864,7 @@ void POA_AMI_Bug_2350_RegressionHandler::Bug_2350_Regression_excep_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -909,7 +887,7 @@ const char* POA_AMI_Bug_2350_RegressionHandler::_interface_repository_id () cons // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -922,7 +900,7 @@ void POA_AMI_Bug_2350_RegressionHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/Bug_2350_RegressionS.h b/tests/IDL_Test/Bug_2350_RegressionS.h index b943cd9..af2268c 100644 --- a/tests/IDL_Test/Bug_2350_RegressionS.h +++ b/tests/IDL_Test/Bug_2350_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_2350_REGRESSIONS_YPATHP_H_ -#define _TAO_IDL_BUG_2350_REGRESSIONS_YPATHP_H_ +#ifndef _TAO_IDL_BUG_2350_REGRESSIONS_AX18YX_H_ +#define _TAO_IDL_BUG_2350_REGRESSIONS_AX18YX_H_ #include /**/ "ace/pre.h" @@ -226,7 +226,7 @@ class TAO_IDL_TEST_STUB_Export POA_Bug_2350_Regression typedef ::Bug_2350_Regression_ptr _stub_ptr_type; typedef ::Bug_2350_Regression_var _stub_var_type; - POA_Bug_2350_Regression (const POA_Bug_2350_Regression& rhs); + POA_Bug_2350_Regression (const POA_Bug_2350_Regression& rhs) = default; virtual ~POA_Bug_2350_Regression () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -323,7 +323,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_Bug_2350_RegressionHandler typedef ::AMI_Bug_2350_RegressionHandler_ptr _stub_ptr_type; typedef ::AMI_Bug_2350_RegressionHandler_var _stub_var_type; - POA_AMI_Bug_2350_RegressionHandler (const POA_AMI_Bug_2350_RegressionHandler& rhs); + POA_AMI_Bug_2350_RegressionHandler (const POA_AMI_Bug_2350_RegressionHandler& rhs) = default; virtual ~POA_AMI_Bug_2350_RegressionHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/Bug_2577_RegressionC.h b/tests/IDL_Test/Bug_2577_RegressionC.h index dbe34c2..1f98062 100644 --- a/tests/IDL_Test/Bug_2577_RegressionC.h +++ b/tests/IDL_Test/Bug_2577_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_2577_REGRESSIONC_GNFMK3_H_ -#define _TAO_IDL_BUG_2577_REGRESSIONC_GNFMK3_H_ +#ifndef _TAO_IDL_BUG_2577_REGRESSIONC_6BSMTA_H_ +#define _TAO_IDL_BUG_2577_REGRESSIONC_6BSMTA_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_2577_RegressionS.cpp b/tests/IDL_Test/Bug_2577_RegressionS.cpp index ee8d3cd..42bc819 100644 --- a/tests/IDL_Test/Bug_2577_RegressionS.cpp +++ b/tests/IDL_Test/Bug_2577_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_2577_REGRESSIONS_CQP3AR_CPP_ -#define _TAO_IDL_BUG_2577_REGRESSIONS_CQP3AR_CPP_ +#ifndef _TAO_IDL_BUG_2577_REGRESSIONS_RB6ADE_CPP_ +#define _TAO_IDL_BUG_2577_REGRESSIONS_RB6ADE_CPP_ #include "Bug_2577_RegressionS.h" @@ -145,15 +145,8 @@ static TAO_AMH_User_T_Perfect_Hash_OpTable tao_AMH_User_T_optable; POA_AMH_User_T::POA_AMH_User_T () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_User_T_optable); -} - -POA_AMH_User_T::POA_AMH_User_T (const POA_AMH_User_T& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_User_T_optable); } @@ -199,7 +192,7 @@ POA_AMH_User_T::getLoginTime_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -372,15 +365,8 @@ _TAO_User_T_Direct_Proxy_Impl::getLoginTime ( POA_User_T::POA_User_T () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_User_T_optable); -} - -POA_User_T::POA_User_T (const POA_User_T& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_User_T_optable); } @@ -461,7 +447,7 @@ void POA_User_T::getLoginTime_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -483,7 +469,7 @@ const char* POA_User_T::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -496,7 +482,7 @@ void POA_User_T::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -701,16 +687,8 @@ _TAO_AMI_User_THandler_Direct_Proxy_Impl::getLoginTime_excep ( POA_AMI_User_THandler::POA_AMI_User_THandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_User_THandler_optable); -} - -POA_AMI_User_THandler::POA_AMI_User_THandler (const POA_AMI_User_THandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_User_THandler_optable); } @@ -871,7 +849,7 @@ void POA_AMI_User_THandler::getLoginTime_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -894,7 +872,7 @@ const char* POA_AMI_User_THandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -907,7 +885,7 @@ void POA_AMI_User_THandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/Bug_2577_RegressionS.h b/tests/IDL_Test/Bug_2577_RegressionS.h index e0fb995..249a764 100644 --- a/tests/IDL_Test/Bug_2577_RegressionS.h +++ b/tests/IDL_Test/Bug_2577_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_2577_REGRESSIONS_GNFMK3_H_ -#define _TAO_IDL_BUG_2577_REGRESSIONS_GNFMK3_H_ +#ifndef _TAO_IDL_BUG_2577_REGRESSIONS_RB6ADE_H_ +#define _TAO_IDL_BUG_2577_REGRESSIONS_RB6ADE_H_ #include /**/ "ace/pre.h" @@ -246,7 +246,7 @@ class TAO_IDL_TEST_STUB_Export POA_User_T typedef ::User_T_ptr _stub_ptr_type; typedef ::User_T_var _stub_var_type; - POA_User_T (const POA_User_T& rhs); + POA_User_T (const POA_User_T& rhs) = default; virtual ~POA_User_T () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -343,7 +343,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_User_THandler typedef ::AMI_User_THandler_ptr _stub_ptr_type; typedef ::AMI_User_THandler_var _stub_var_type; - POA_AMI_User_THandler (const POA_AMI_User_THandler& rhs); + POA_AMI_User_THandler (const POA_AMI_User_THandler& rhs) = default; virtual ~POA_AMI_User_THandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/Bug_2582_RegressionC.h b/tests/IDL_Test/Bug_2582_RegressionC.h index fca626d..3f9d5f1 100644 --- a/tests/IDL_Test/Bug_2582_RegressionC.h +++ b/tests/IDL_Test/Bug_2582_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_2582_REGRESSIONC_5W4Z1K_H_ -#define _TAO_IDL_BUG_2582_REGRESSIONC_5W4Z1K_H_ +#ifndef _TAO_IDL_BUG_2582_REGRESSIONC_QDFMIO_H_ +#define _TAO_IDL_BUG_2582_REGRESSIONC_QDFMIO_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_2582_RegressionS.cpp b/tests/IDL_Test/Bug_2582_RegressionS.cpp index db1237b..b396de6 100644 --- a/tests/IDL_Test/Bug_2582_RegressionS.cpp +++ b/tests/IDL_Test/Bug_2582_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_2582_REGRESSIONS_2HN2TC_CPP_ -#define _TAO_IDL_BUG_2582_REGRESSIONS_2HN2TC_CPP_ +#ifndef _TAO_IDL_BUG_2582_REGRESSIONS_5Z6G43_CPP_ +#define _TAO_IDL_BUG_2582_REGRESSIONS_5Z6G43_CPP_ #include "Bug_2582_RegressionS.h" @@ -146,15 +146,8 @@ static TAO_AMH_FieldDevice_T_Perfect_Hash_OpTable tao_AMH_FieldDevice_T_optable; POA_AMH_FieldDevice_T::POA_AMH_FieldDevice_T () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_FieldDevice_T_optable); -} - -POA_AMH_FieldDevice_T::POA_AMH_FieldDevice_T (const POA_AMH_FieldDevice_T& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_FieldDevice_T_optable); } @@ -239,7 +232,7 @@ POA_AMH_FieldDevice_T::getEncoding_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -435,15 +428,8 @@ _TAO_FieldDevice_T_Direct_Proxy_Impl::getEncoding ( POA_FieldDevice_T::POA_FieldDevice_T () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_FieldDevice_T_optable); -} - -POA_FieldDevice_T::POA_FieldDevice_T (const POA_FieldDevice_T& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_FieldDevice_T_optable); } @@ -598,7 +584,7 @@ void POA_FieldDevice_T::getEncoding_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -620,7 +606,7 @@ const char* POA_FieldDevice_T::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -633,7 +619,7 @@ void POA_FieldDevice_T::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -918,16 +904,8 @@ _TAO_AMI_FieldDevice_THandler_Direct_Proxy_Impl::getEncoding_excep ( POA_AMI_FieldDevice_THandler::POA_AMI_FieldDevice_THandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_FieldDevice_THandler_optable); -} - -POA_AMI_FieldDevice_THandler::POA_AMI_FieldDevice_THandler (const POA_AMI_FieldDevice_THandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_FieldDevice_THandler_optable); } @@ -1242,7 +1220,7 @@ void POA_AMI_FieldDevice_THandler::getEncoding_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1265,7 +1243,7 @@ const char* POA_AMI_FieldDevice_THandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1278,7 +1256,7 @@ void POA_AMI_FieldDevice_THandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/Bug_2582_RegressionS.h b/tests/IDL_Test/Bug_2582_RegressionS.h index 5e6a518..de4e4f5 100644 --- a/tests/IDL_Test/Bug_2582_RegressionS.h +++ b/tests/IDL_Test/Bug_2582_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_2582_REGRESSIONS_2HN2TC_H_ -#define _TAO_IDL_BUG_2582_REGRESSIONS_2HN2TC_H_ +#ifndef _TAO_IDL_BUG_2582_REGRESSIONS_5Z6G43_H_ +#define _TAO_IDL_BUG_2582_REGRESSIONS_5Z6G43_H_ #include /**/ "ace/pre.h" @@ -251,7 +251,7 @@ class TAO_IDL_TEST_STUB_Export POA_FieldDevice_T typedef ::FieldDevice_T_ptr _stub_ptr_type; typedef ::FieldDevice_T_var _stub_var_type; - POA_FieldDevice_T (const POA_FieldDevice_T& rhs); + POA_FieldDevice_T (const POA_FieldDevice_T& rhs) = default; virtual ~POA_FieldDevice_T () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -374,7 +374,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_FieldDevice_THandler typedef ::AMI_FieldDevice_THandler_ptr _stub_ptr_type; typedef ::AMI_FieldDevice_THandler_var _stub_var_type; - POA_AMI_FieldDevice_THandler (const POA_AMI_FieldDevice_THandler& rhs); + POA_AMI_FieldDevice_THandler (const POA_AMI_FieldDevice_THandler& rhs) = default; virtual ~POA_AMI_FieldDevice_THandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/Bug_2583_RegressionC.h b/tests/IDL_Test/Bug_2583_RegressionC.h index d0208ab..a7aed98 100644 --- a/tests/IDL_Test/Bug_2583_RegressionC.h +++ b/tests/IDL_Test/Bug_2583_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_2583_REGRESSIONC_C2KSHO_H_ -#define _TAO_IDL_BUG_2583_REGRESSIONC_C2KSHO_H_ +#ifndef _TAO_IDL_BUG_2583_REGRESSIONC_ROWGS5_H_ +#define _TAO_IDL_BUG_2583_REGRESSIONC_ROWGS5_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_2583_RegressionS.cpp b/tests/IDL_Test/Bug_2583_RegressionS.cpp index e82fcf5..a8661ae 100644 --- a/tests/IDL_Test/Bug_2583_RegressionS.cpp +++ b/tests/IDL_Test/Bug_2583_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_2583_REGRESSIONS_C2KSHO_CPP_ -#define _TAO_IDL_BUG_2583_REGRESSIONS_C2KSHO_CPP_ +#ifndef _TAO_IDL_BUG_2583_REGRESSIONS_WXYIIB_CPP_ +#define _TAO_IDL_BUG_2583_REGRESSIONS_WXYIIB_CPP_ #include "Bug_2583_RegressionS.h" diff --git a/tests/IDL_Test/Bug_2583_RegressionS.h b/tests/IDL_Test/Bug_2583_RegressionS.h index 0cbb8d1..00235ab 100644 --- a/tests/IDL_Test/Bug_2583_RegressionS.h +++ b/tests/IDL_Test/Bug_2583_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_2583_REGRESSIONS_C2KSHO_H_ -#define _TAO_IDL_BUG_2583_REGRESSIONS_C2KSHO_H_ +#ifndef _TAO_IDL_BUG_2583_REGRESSIONS_WXYIIB_H_ +#define _TAO_IDL_BUG_2583_REGRESSIONS_WXYIIB_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_2616_RegressionC.h b/tests/IDL_Test/Bug_2616_RegressionC.h index 9a95513..1b19dc5 100644 --- a/tests/IDL_Test/Bug_2616_RegressionC.h +++ b/tests/IDL_Test/Bug_2616_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_2616_REGRESSIONC_PHA2FX_H_ -#define _TAO_IDL_BUG_2616_REGRESSIONC_PHA2FX_H_ +#ifndef _TAO_IDL_BUG_2616_REGRESSIONC_HGMNCX_H_ +#define _TAO_IDL_BUG_2616_REGRESSIONC_HGMNCX_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_2616_RegressionS.cpp b/tests/IDL_Test/Bug_2616_RegressionS.cpp index b0cab9e..04269d7 100644 --- a/tests/IDL_Test/Bug_2616_RegressionS.cpp +++ b/tests/IDL_Test/Bug_2616_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_2616_REGRESSIONS_ITHLRL_CPP_ -#define _TAO_IDL_BUG_2616_REGRESSIONS_ITHLRL_CPP_ +#ifndef _TAO_IDL_BUG_2616_REGRESSIONS_KBJGRY_CPP_ +#define _TAO_IDL_BUG_2616_REGRESSIONS_KBJGRY_CPP_ #include "Bug_2616_RegressionS.h" @@ -145,15 +145,8 @@ static TAO_AMH_Interface1_Perfect_Hash_OpTable tao_AMH_Interface1_optable; POA_AMH_Interface1::POA_AMH_Interface1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_Interface1_optable); -} - -POA_AMH_Interface1::POA_AMH_Interface1 (const POA_AMH_Interface1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_Interface1_optable); } @@ -208,7 +201,7 @@ POA_AMH_Interface1::do_it_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -381,15 +374,8 @@ _TAO_Interface1_Direct_Proxy_Impl::do_it ( POA_Interface1::POA_Interface1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Interface1_optable); -} - -POA_Interface1::POA_Interface1 (const POA_Interface1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Interface1_optable); } @@ -473,7 +459,7 @@ void POA_Interface1::do_it_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -495,7 +481,7 @@ const char* POA_Interface1::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -508,7 +494,7 @@ void POA_Interface1::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -705,16 +691,8 @@ _TAO_AMI_Interface1Handler_Direct_Proxy_Impl::do_it_excep ( POA_AMI_Interface1Handler::POA_AMI_Interface1Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_Interface1Handler_optable); -} - -POA_AMI_Interface1Handler::POA_AMI_Interface1Handler (const POA_AMI_Interface1Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_Interface1Handler_optable); } @@ -858,7 +836,7 @@ void POA_AMI_Interface1Handler::do_it_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -881,7 +859,7 @@ const char* POA_AMI_Interface1Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -894,7 +872,7 @@ void POA_AMI_Interface1Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1002,15 +980,8 @@ static TAO_AMH_Interface2_Perfect_Hash_OpTable tao_AMH_Interface2_optable; POA_AMH_Interface2::POA_AMH_Interface2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_Interface2_optable); -} - -POA_AMH_Interface2::POA_AMH_Interface2 (const POA_AMH_Interface2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_Interface2_optable); } @@ -1065,7 +1036,7 @@ POA_AMH_Interface2::do_it_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1238,15 +1209,8 @@ _TAO_Interface2_Direct_Proxy_Impl::do_it ( POA_Interface2::POA_Interface2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Interface2_optable); -} - -POA_Interface2::POA_Interface2 (const POA_Interface2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Interface2_optable); } @@ -1330,7 +1294,7 @@ void POA_Interface2::do_it_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1352,7 +1316,7 @@ const char* POA_Interface2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1365,7 +1329,7 @@ void POA_Interface2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1562,16 +1526,8 @@ _TAO_AMI_Interface2Handler_Direct_Proxy_Impl::do_it_excep ( POA_AMI_Interface2Handler::POA_AMI_Interface2Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_Interface2Handler_optable); -} - -POA_AMI_Interface2Handler::POA_AMI_Interface2Handler (const POA_AMI_Interface2Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_Interface2Handler_optable); } @@ -1715,7 +1671,7 @@ void POA_AMI_Interface2Handler::do_it_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1738,7 +1694,7 @@ const char* POA_AMI_Interface2Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1751,7 +1707,7 @@ void POA_AMI_Interface2Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/Bug_2616_RegressionS.h b/tests/IDL_Test/Bug_2616_RegressionS.h index 7ac5f53..12ca50c 100644 --- a/tests/IDL_Test/Bug_2616_RegressionS.h +++ b/tests/IDL_Test/Bug_2616_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_2616_REGRESSIONS_ITHLRL_H_ -#define _TAO_IDL_BUG_2616_REGRESSIONS_ITHLRL_H_ +#ifndef _TAO_IDL_BUG_2616_REGRESSIONS_DXGDZH_H_ +#define _TAO_IDL_BUG_2616_REGRESSIONS_DXGDZH_H_ #include /**/ "ace/pre.h" @@ -299,7 +299,7 @@ class TAO_IDL_TEST_STUB_Export POA_Interface1 typedef ::Interface1_ptr _stub_ptr_type; typedef ::Interface1_var _stub_var_type; - POA_Interface1 (const POA_Interface1& rhs); + POA_Interface1 (const POA_Interface1& rhs) = default; virtual ~POA_Interface1 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -396,7 +396,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_Interface1Handler typedef ::AMI_Interface1Handler_ptr _stub_ptr_type; typedef ::AMI_Interface1Handler_var _stub_var_type; - POA_AMI_Interface1Handler (const POA_AMI_Interface1Handler& rhs); + POA_AMI_Interface1Handler (const POA_AMI_Interface1Handler& rhs) = default; virtual ~POA_AMI_Interface1Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -527,7 +527,7 @@ class TAO_IDL_TEST_STUB_Export POA_Interface2 typedef ::Interface2_ptr _stub_ptr_type; typedef ::Interface2_var _stub_var_type; - POA_Interface2 (const POA_Interface2& rhs); + POA_Interface2 (const POA_Interface2& rhs) = default; virtual ~POA_Interface2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -624,7 +624,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_Interface2Handler typedef ::AMI_Interface2Handler_ptr _stub_ptr_type; typedef ::AMI_Interface2Handler_var _stub_var_type; - POA_AMI_Interface2Handler (const POA_AMI_Interface2Handler& rhs); + POA_AMI_Interface2Handler (const POA_AMI_Interface2Handler& rhs) = default; virtual ~POA_AMI_Interface2Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/Bug_2619_RegressionC.h b/tests/IDL_Test/Bug_2619_RegressionC.h index 348f322..22ca7db 100644 --- a/tests/IDL_Test/Bug_2619_RegressionC.h +++ b/tests/IDL_Test/Bug_2619_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_2619_REGRESSIONC_14JKAU_H_ -#define _TAO_IDL_BUG_2619_REGRESSIONC_14JKAU_H_ +#ifndef _TAO_IDL_BUG_2619_REGRESSIONC_9PJNED_H_ +#define _TAO_IDL_BUG_2619_REGRESSIONC_9PJNED_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_2619_RegressionS.cpp b/tests/IDL_Test/Bug_2619_RegressionS.cpp index eb0f2cd..ad7a7c9 100644 --- a/tests/IDL_Test/Bug_2619_RegressionS.cpp +++ b/tests/IDL_Test/Bug_2619_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_2619_REGRESSIONS_MGX5TN_CPP_ -#define _TAO_IDL_BUG_2619_REGRESSIONS_MGX5TN_CPP_ +#ifndef _TAO_IDL_BUG_2619_REGRESSIONS_VQYBU5_CPP_ +#define _TAO_IDL_BUG_2619_REGRESSIONS_VQYBU5_CPP_ #include "Bug_2619_RegressionS.h" @@ -145,15 +145,8 @@ static TAO_AMH_Test_Perfect_Hash_OpTable tao_AMH_Test_optable; POA_AMH_Test::POA_AMH_Test () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_Test_optable); -} - -POA_AMH_Test::POA_AMH_Test (const POA_AMH_Test& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_Test_optable); } @@ -199,7 +192,7 @@ POA_AMH_Test::getGroup_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -372,15 +365,8 @@ _TAO_Test_Direct_Proxy_Impl::getGroup ( POA_Test::POA_Test () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Test_optable); -} - -POA_Test::POA_Test (const POA_Test& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Test_optable); } @@ -461,7 +447,7 @@ void POA_Test::getGroup_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -483,7 +469,7 @@ const char* POA_Test::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -496,7 +482,7 @@ void POA_Test::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -702,16 +688,8 @@ _TAO_AMI_TestHandler_Direct_Proxy_Impl::getGroup_excep ( POA_AMI_TestHandler::POA_AMI_TestHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_TestHandler_optable); -} - -POA_AMI_TestHandler::POA_AMI_TestHandler (const POA_AMI_TestHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_TestHandler_optable); } @@ -872,7 +850,7 @@ void POA_AMI_TestHandler::getGroup_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -895,7 +873,7 @@ const char* POA_AMI_TestHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -908,7 +886,7 @@ void POA_AMI_TestHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/Bug_2619_RegressionS.h b/tests/IDL_Test/Bug_2619_RegressionS.h index c5abc06..3a42c57 100644 --- a/tests/IDL_Test/Bug_2619_RegressionS.h +++ b/tests/IDL_Test/Bug_2619_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_2619_REGRESSIONS_MGX5TN_H_ -#define _TAO_IDL_BUG_2619_REGRESSIONS_MGX5TN_H_ +#ifndef _TAO_IDL_BUG_2619_REGRESSIONS_VQYBU5_H_ +#define _TAO_IDL_BUG_2619_REGRESSIONS_VQYBU5_H_ #include /**/ "ace/pre.h" @@ -246,7 +246,7 @@ class TAO_IDL_TEST_STUB_Export POA_Test typedef ::Test_ptr _stub_ptr_type; typedef ::Test_var _stub_var_type; - POA_Test (const POA_Test& rhs); + POA_Test (const POA_Test& rhs) = default; virtual ~POA_Test () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -343,7 +343,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_TestHandler typedef ::AMI_TestHandler_ptr _stub_ptr_type; typedef ::AMI_TestHandler_var _stub_var_type; - POA_AMI_TestHandler (const POA_AMI_TestHandler& rhs); + POA_AMI_TestHandler (const POA_AMI_TestHandler& rhs) = default; virtual ~POA_AMI_TestHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/Bug_3243_RegressionC.h b/tests/IDL_Test/Bug_3243_RegressionC.h index c01f152..6b6a3a0 100644 --- a/tests/IDL_Test/Bug_3243_RegressionC.h +++ b/tests/IDL_Test/Bug_3243_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_3243_REGRESSIONC_K4CNRG_H_ -#define _TAO_IDL_BUG_3243_REGRESSIONC_K4CNRG_H_ +#ifndef _TAO_IDL_BUG_3243_REGRESSIONC_YK5PMH_H_ +#define _TAO_IDL_BUG_3243_REGRESSIONC_YK5PMH_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_3243_RegressionS.cpp b/tests/IDL_Test/Bug_3243_RegressionS.cpp index bd1b691..e558da3 100644 --- a/tests/IDL_Test/Bug_3243_RegressionS.cpp +++ b/tests/IDL_Test/Bug_3243_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_3243_REGRESSIONS_RZZOBY_CPP_ -#define _TAO_IDL_BUG_3243_REGRESSIONS_RZZOBY_CPP_ +#ifndef _TAO_IDL_BUG_3243_REGRESSIONS_Q6UX5C_CPP_ +#define _TAO_IDL_BUG_3243_REGRESSIONS_Q6UX5C_CPP_ #include "Bug_3243_RegressionS.h" diff --git a/tests/IDL_Test/Bug_3243_RegressionS.h b/tests/IDL_Test/Bug_3243_RegressionS.h index 77dc1a8..abba31f 100644 --- a/tests/IDL_Test/Bug_3243_RegressionS.h +++ b/tests/IDL_Test/Bug_3243_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_3243_REGRESSIONS_RZZOBY_H_ -#define _TAO_IDL_BUG_3243_REGRESSIONS_RZZOBY_H_ +#ifndef _TAO_IDL_BUG_3243_REGRESSIONS_Q6UX5C_H_ +#define _TAO_IDL_BUG_3243_REGRESSIONS_Q6UX5C_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_3312_RegressionC.h b/tests/IDL_Test/Bug_3312_RegressionC.h index b4abe54..353feaf 100644 --- a/tests/IDL_Test/Bug_3312_RegressionC.h +++ b/tests/IDL_Test/Bug_3312_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_3312_REGRESSIONC_A0ILUW_H_ -#define _TAO_IDL_BUG_3312_REGRESSIONC_A0ILUW_H_ +#ifndef _TAO_IDL_BUG_3312_REGRESSIONC_OI1RFD_H_ +#define _TAO_IDL_BUG_3312_REGRESSIONC_OI1RFD_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_3312_RegressionS.cpp b/tests/IDL_Test/Bug_3312_RegressionS.cpp index 3b079ea..6e18acd 100644 --- a/tests/IDL_Test/Bug_3312_RegressionS.cpp +++ b/tests/IDL_Test/Bug_3312_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_3312_REGRESSIONS_A0ILUW_CPP_ -#define _TAO_IDL_BUG_3312_REGRESSIONS_A0ILUW_CPP_ +#ifndef _TAO_IDL_BUG_3312_REGRESSIONS_OI1RFD_CPP_ +#define _TAO_IDL_BUG_3312_REGRESSIONS_OI1RFD_CPP_ #include "Bug_3312_RegressionS.h" diff --git a/tests/IDL_Test/Bug_3312_RegressionS.h b/tests/IDL_Test/Bug_3312_RegressionS.h index 3105872..7567352 100644 --- a/tests/IDL_Test/Bug_3312_RegressionS.h +++ b/tests/IDL_Test/Bug_3312_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_3312_REGRESSIONS_A0ILUW_H_ -#define _TAO_IDL_BUG_3312_REGRESSIONS_A0ILUW_H_ +#ifndef _TAO_IDL_BUG_3312_REGRESSIONS_OI1RFD_H_ +#define _TAO_IDL_BUG_3312_REGRESSIONS_OI1RFD_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_3819_RegressionC.h b/tests/IDL_Test/Bug_3819_RegressionC.h index 4480cca..42c154c 100644 --- a/tests/IDL_Test/Bug_3819_RegressionC.h +++ b/tests/IDL_Test/Bug_3819_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_3819_REGRESSIONC_YIIMGR_H_ -#define _TAO_IDL_BUG_3819_REGRESSIONC_YIIMGR_H_ +#ifndef _TAO_IDL_BUG_3819_REGRESSIONC_MYTMWP_H_ +#define _TAO_IDL_BUG_3819_REGRESSIONC_MYTMWP_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_3819_RegressionS.cpp b/tests/IDL_Test/Bug_3819_RegressionS.cpp index 18adae4..a090844 100644 --- a/tests/IDL_Test/Bug_3819_RegressionS.cpp +++ b/tests/IDL_Test/Bug_3819_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_3819_REGRESSIONS_YZUUGP_CPP_ -#define _TAO_IDL_BUG_3819_REGRESSIONS_YZUUGP_CPP_ +#ifndef _TAO_IDL_BUG_3819_REGRESSIONS_MYTMWP_CPP_ +#define _TAO_IDL_BUG_3819_REGRESSIONS_MYTMWP_CPP_ #include "Bug_3819_RegressionS.h" diff --git a/tests/IDL_Test/Bug_3819_RegressionS.h b/tests/IDL_Test/Bug_3819_RegressionS.h index b6627e9..94534ab 100644 --- a/tests/IDL_Test/Bug_3819_RegressionS.h +++ b/tests/IDL_Test/Bug_3819_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_3819_REGRESSIONS_YZUUGP_H_ -#define _TAO_IDL_BUG_3819_REGRESSIONS_YZUUGP_H_ +#ifndef _TAO_IDL_BUG_3819_REGRESSIONS_MYTMWP_H_ +#define _TAO_IDL_BUG_3819_REGRESSIONS_MYTMWP_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_3821_RegressionC.h b/tests/IDL_Test/Bug_3821_RegressionC.h index a1a5438..b4c98b1 100644 --- a/tests/IDL_Test/Bug_3821_RegressionC.h +++ b/tests/IDL_Test/Bug_3821_RegressionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_BUG_3821_REGRESSIONC_QBVPA0_H_ -#define _TAO_IDL_BUG_3821_REGRESSIONC_QBVPA0_H_ +#ifndef _TAO_IDL_BUG_3821_REGRESSIONC_8TYKOG_H_ +#define _TAO_IDL_BUG_3821_REGRESSIONC_8TYKOG_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/Bug_3821_RegressionS.cpp b/tests/IDL_Test/Bug_3821_RegressionS.cpp index a106c31..68a0585 100644 --- a/tests/IDL_Test/Bug_3821_RegressionS.cpp +++ b/tests/IDL_Test/Bug_3821_RegressionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_BUG_3821_REGRESSIONS_R1VFJN_CPP_ -#define _TAO_IDL_BUG_3821_REGRESSIONS_R1VFJN_CPP_ +#ifndef _TAO_IDL_BUG_3821_REGRESSIONS_SFL0VW_CPP_ +#define _TAO_IDL_BUG_3821_REGRESSIONS_SFL0VW_CPP_ #include "Bug_3821_RegressionS.h" diff --git a/tests/IDL_Test/Bug_3821_RegressionS.h b/tests/IDL_Test/Bug_3821_RegressionS.h index 587e913..e5090b7 100644 --- a/tests/IDL_Test/Bug_3821_RegressionS.h +++ b/tests/IDL_Test/Bug_3821_RegressionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_BUG_3821_REGRESSIONS_R1VFJN_H_ -#define _TAO_IDL_BUG_3821_REGRESSIONS_R1VFJN_H_ +#ifndef _TAO_IDL_BUG_3821_REGRESSIONS_SFL0VW_H_ +#define _TAO_IDL_BUG_3821_REGRESSIONS_SFL0VW_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/PEMNamingC.h b/tests/IDL_Test/PEMNamingC.h index adb6f1f..97e66aa 100644 --- a/tests/IDL_Test/PEMNamingC.h +++ b/tests/IDL_Test/PEMNamingC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_PEMNAMINGC_KLWRV4_H_ -#define _TAO_IDL_PEMNAMINGC_KLWRV4_H_ +#ifndef _TAO_IDL_PEMNAMINGC_JJUJGV_H_ +#define _TAO_IDL_PEMNAMINGC_JJUJGV_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/PEMNamingS.cpp b/tests/IDL_Test/PEMNamingS.cpp index e8e1e2c..0b6cf51 100644 --- a/tests/IDL_Test/PEMNamingS.cpp +++ b/tests/IDL_Test/PEMNamingS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_PEMNAMINGS_3TX3PT_CPP_ -#define _TAO_IDL_PEMNAMINGS_3TX3PT_CPP_ +#ifndef _TAO_IDL_PEMNAMINGS_J6B3KM_CPP_ +#define _TAO_IDL_PEMNAMINGS_J6B3KM_CPP_ #include "PEMNamingS.h" @@ -146,15 +146,8 @@ static TAO_Plesk_Naming_AMH_ObjectResolver_Perfect_Hash_OpTable tao_Plesk_Naming POA_Plesk::Naming::AMH_ObjectResolver::AMH_ObjectResolver () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Plesk_Naming_AMH_ObjectResolver_optable); -} - -POA_Plesk::Naming::AMH_ObjectResolver::AMH_ObjectResolver (const AMH_ObjectResolver& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Plesk_Naming_AMH_ObjectResolver_optable); } @@ -266,7 +259,7 @@ POA_Plesk::Naming::AMH_ObjectResolver::resolve_sc_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -467,15 +460,8 @@ POA_Plesk::Naming::_TAO_ObjectResolver_Direct_Proxy_Impl::resolve_sc ( POA_Plesk::Naming::ObjectResolver::ObjectResolver () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Plesk_Naming_ObjectResolver_optable); -} - -POA_Plesk::Naming::ObjectResolver::ObjectResolver (const ObjectResolver& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Plesk_Naming_ObjectResolver_optable); } @@ -709,7 +695,7 @@ void POA_Plesk::Naming::ObjectResolver::resolve_sc_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -731,7 +717,7 @@ const char* POA_Plesk::Naming::ObjectResolver::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -744,7 +730,7 @@ void POA_Plesk::Naming::ObjectResolver::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1036,16 +1022,8 @@ POA_Plesk::Naming::_TAO_AMI_ObjectResolverHandler_Direct_Proxy_Impl::resolve_sc_ POA_Plesk::Naming::AMI_ObjectResolverHandler::AMI_ObjectResolverHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Plesk_Naming_AMI_ObjectResolverHandler_optable); -} - -POA_Plesk::Naming::AMI_ObjectResolverHandler::AMI_ObjectResolverHandler (const AMI_ObjectResolverHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_Plesk_Naming_AMI_ObjectResolverHandler_optable); } @@ -1484,7 +1462,7 @@ void POA_Plesk::Naming::AMI_ObjectResolverHandler::resolve_sc_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1507,7 +1485,7 @@ const char* POA_Plesk::Naming::AMI_ObjectResolverHandler::_interface_repository_ // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1520,7 +1498,7 @@ void POA_Plesk::Naming::AMI_ObjectResolverHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/PEMNamingS.h b/tests/IDL_Test/PEMNamingS.h index 90673f3..c9159e4 100644 --- a/tests/IDL_Test/PEMNamingS.h +++ b/tests/IDL_Test/PEMNamingS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_PEMNAMINGS_3TX3PT_H_ -#define _TAO_IDL_PEMNAMINGS_3TX3PT_H_ +#ifndef _TAO_IDL_PEMNAMINGS_J6B3KM_H_ +#define _TAO_IDL_PEMNAMINGS_J6B3KM_H_ #include /**/ "ace/pre.h" @@ -275,7 +275,7 @@ namespace POA_Plesk typedef ::Plesk::Naming::ObjectResolver_ptr _stub_ptr_type; typedef ::Plesk::Naming::ObjectResolver_var _stub_var_type; - ObjectResolver (const ObjectResolver& rhs); + ObjectResolver (const ObjectResolver& rhs) = default; virtual ~ObjectResolver () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -405,7 +405,7 @@ namespace POA_Plesk typedef ::Plesk::Naming::AMI_ObjectResolverHandler_ptr _stub_ptr_type; typedef ::Plesk::Naming::AMI_ObjectResolverHandler_var _stub_var_type; - AMI_ObjectResolverHandler (const AMI_ObjectResolverHandler& rhs); + AMI_ObjectResolverHandler (const AMI_ObjectResolverHandler& rhs) = default; virtual ~AMI_ObjectResolverHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/TestVersionedNamespace2C.h b/tests/IDL_Test/TestVersionedNamespace2C.h index 973ef9c..8dff1e8 100644 --- a/tests/IDL_Test/TestVersionedNamespace2C.h +++ b/tests/IDL_Test/TestVersionedNamespace2C.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACE2C_MG0U8S_H_ -#define _TAO_IDL_TESTVERSIONEDNAMESPACE2C_MG0U8S_H_ +#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACE2C_ZPDKWN_H_ +#define _TAO_IDL_TESTVERSIONEDNAMESPACE2C_ZPDKWN_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/TestVersionedNamespace2S.cpp b/tests/IDL_Test/TestVersionedNamespace2S.cpp index 2766b28..7572c44 100644 --- a/tests/IDL_Test/TestVersionedNamespace2S.cpp +++ b/tests/IDL_Test/TestVersionedNamespace2S.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACE2S_5K3RBW_CPP_ -#define _TAO_IDL_TESTVERSIONEDNAMESPACE2S_5K3RBW_CPP_ +#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACE2S_U6FFDD_CPP_ +#define _TAO_IDL_TESTVERSIONEDNAMESPACE2S_U6FFDD_CPP_ #include "TestVersionedNamespace2S.h" @@ -146,15 +146,8 @@ static TAO_M1_AMH_LI_Perfect_Hash_OpTable tao_M1_AMH_LI_optable; POA_M1::AMH_LI::AMH_LI () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_M1_AMH_LI_optable); -} - -POA_M1::AMH_LI::AMH_LI (const AMH_LI& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_M1_AMH_LI_optable); } @@ -209,7 +202,7 @@ POA_M1::AMH_LI::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -346,15 +339,8 @@ static TAO_M1_LI_Perfect_Hash_OpTable tao_M1_LI_optable; POA_M1::LI::LI () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_M1_LI_optable); -} - -POA_M1::LI::LI (const LI& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_M1_LI_optable); } @@ -442,7 +428,7 @@ void POA_M1::LI::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -464,7 +450,7 @@ const char* POA_M1::LI::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -477,7 +463,7 @@ void POA_M1::LI::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -616,15 +602,8 @@ static TAO_M1_AMH_L2_Perfect_Hash_OpTable tao_M1_AMH_L2_optable; POA_M1::AMH_L2::AMH_L2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_M1_AMH_L2_optable); -} - -POA_M1::AMH_L2::AMH_L2 (const AMH_L2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_M1_AMH_L2_optable); } @@ -679,7 +658,7 @@ POA_M1::AMH_L2::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -816,15 +795,8 @@ static TAO_M1_L2_Perfect_Hash_OpTable tao_M1_L2_optable; POA_M1::L2::L2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_M1_L2_optable); -} - -POA_M1::L2::L2 (const L2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_M1_L2_optable); } @@ -912,7 +884,7 @@ void POA_M1::L2::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -934,7 +906,7 @@ const char* POA_M1::L2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -947,7 +919,7 @@ void POA_M1::L2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1086,15 +1058,8 @@ static TAO_M2_M3_AMH_L3_Perfect_Hash_OpTable tao_M2_M3_AMH_L3_optable; POA_M2::M3::AMH_L3::AMH_L3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_M2_M3_AMH_L3_optable); -} - -POA_M2::M3::AMH_L3::AMH_L3 (const AMH_L3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_M2_M3_AMH_L3_optable); } @@ -1149,7 +1114,7 @@ POA_M2::M3::AMH_L3::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1286,15 +1251,8 @@ static TAO_M2_M3_L3_Perfect_Hash_OpTable tao_M2_M3_L3_optable; POA_M2::M3::L3::L3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_M2_M3_L3_optable); -} - -POA_M2::M3::L3::L3 (const L3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_M2_M3_L3_optable); } @@ -1386,7 +1344,7 @@ void POA_M2::M3::L3::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1408,7 +1366,7 @@ const char* POA_M2::M3::L3::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1421,7 +1379,7 @@ void POA_M2::M3::L3::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1560,15 +1518,8 @@ static TAO_M2_M3_AMH_L4_Perfect_Hash_OpTable tao_M2_M3_AMH_L4_optable; POA_M2::M3::AMH_L4::AMH_L4 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_M2_M3_AMH_L4_optable); -} - -POA_M2::M3::AMH_L4::AMH_L4 (const AMH_L4& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_M2_M3_AMH_L4_optable); } @@ -1623,7 +1574,7 @@ POA_M2::M3::AMH_L4::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1760,15 +1711,8 @@ static TAO_M2_M3_L4_Perfect_Hash_OpTable tao_M2_M3_L4_optable; POA_M2::M3::L4::L4 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_M2_M3_L4_optable); -} - -POA_M2::M3::L4::L4 (const L4& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_M2_M3_L4_optable); } @@ -1869,7 +1813,7 @@ void POA_M2::M3::L4::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1891,7 +1835,7 @@ const char* POA_M2::M3::L4::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1904,7 +1848,7 @@ void POA_M2::M3::L4::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/TestVersionedNamespace2S.h b/tests/IDL_Test/TestVersionedNamespace2S.h index 1d1abb1..c2fab41 100644 --- a/tests/IDL_Test/TestVersionedNamespace2S.h +++ b/tests/IDL_Test/TestVersionedNamespace2S.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACE2S_5K3RBW_H_ -#define _TAO_IDL_TESTVERSIONEDNAMESPACE2S_5K3RBW_H_ +#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACE2S_8TMWZU_H_ +#define _TAO_IDL_TESTVERSIONEDNAMESPACE2S_8TMWZU_H_ #include /**/ "ace/pre.h" @@ -438,7 +438,7 @@ class LI typedef ::M1::LI_ptr _stub_ptr_type; typedef ::M1::LI_var _stub_var_type; - LI (const LI& rhs); + LI (const LI& rhs) = default; virtual ~LI () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -546,7 +546,7 @@ class L2 typedef ::M1::L2_ptr _stub_ptr_type; typedef ::M1::L2_var _stub_var_type; - L2 (const L2& rhs); + L2 (const L2& rhs) = default; virtual ~L2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -672,7 +672,7 @@ namespace POA_M2 typedef ::M2::M3::L3_ptr _stub_ptr_type; typedef ::M2::M3::L3_var _stub_var_type; - L3 (const L3& rhs); + L3 (const L3& rhs) = default; virtual ~L3 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -780,7 +780,7 @@ class L4 typedef ::M2::M3::L4_ptr _stub_ptr_type; typedef ::M2::M3::L4_var _stub_var_type; - L4 (const L4& rhs); + L4 (const L4& rhs) = default; virtual ~L4 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/TestVersionedNamespaceC.h b/tests/IDL_Test/TestVersionedNamespaceC.h index 6dab37d..c5d4c31 100644 --- a/tests/IDL_Test/TestVersionedNamespaceC.h +++ b/tests/IDL_Test/TestVersionedNamespaceC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACEC_LTVK3D_H_ -#define _TAO_IDL_TESTVERSIONEDNAMESPACEC_LTVK3D_H_ +#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACEC_4HQJ13_H_ +#define _TAO_IDL_TESTVERSIONEDNAMESPACEC_4HQJ13_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/TestVersionedNamespaceS.cpp b/tests/IDL_Test/TestVersionedNamespaceS.cpp index 4ed45fe..6f33076 100644 --- a/tests/IDL_Test/TestVersionedNamespaceS.cpp +++ b/tests/IDL_Test/TestVersionedNamespaceS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACES_JNKN7D_CPP_ -#define _TAO_IDL_TESTVERSIONEDNAMESPACES_JNKN7D_CPP_ +#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACES_4HQJ13_CPP_ +#define _TAO_IDL_TESTVERSIONEDNAMESPACES_4HQJ13_CPP_ #include "TestVersionedNamespaceS.h" diff --git a/tests/IDL_Test/TestVersionedNamespaceS.h b/tests/IDL_Test/TestVersionedNamespaceS.h index 119338e..1553ce4 100644 --- a/tests/IDL_Test/TestVersionedNamespaceS.h +++ b/tests/IDL_Test/TestVersionedNamespaceS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACES_LTVK3D_H_ -#define _TAO_IDL_TESTVERSIONEDNAMESPACES_LTVK3D_H_ +#ifndef _TAO_IDL_TESTVERSIONEDNAMESPACES_4HQJ13_H_ +#define _TAO_IDL_TESTVERSIONEDNAMESPACES_4HQJ13_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/anonymousA.h b/tests/IDL_Test/anonymousA.h index ea613f0..e4b6c83 100644 --- a/tests/IDL_Test/anonymousA.h +++ b/tests/IDL_Test/anonymousA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_ANONYMOUSA_NZVJPT_H_ -#define _TAO_IDL_ANONYMOUSA_NZVJPT_H_ +#ifndef _TAO_IDL_ANONYMOUSA_MOJFAK_H_ +#define _TAO_IDL_ANONYMOUSA_MOJFAK_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/anonymousC.h b/tests/IDL_Test/anonymousC.h index 8dda879..4b55a72 100644 --- a/tests/IDL_Test/anonymousC.h +++ b/tests/IDL_Test/anonymousC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_ANONYMOUSC_NZVJPT_H_ -#define _TAO_IDL_ANONYMOUSC_NZVJPT_H_ +#ifndef _TAO_IDL_ANONYMOUSC_MOJFAK_H_ +#define _TAO_IDL_ANONYMOUSC_MOJFAK_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/anonymousS.cpp b/tests/IDL_Test/anonymousS.cpp index de943bc..dda9b26 100644 --- a/tests/IDL_Test/anonymousS.cpp +++ b/tests/IDL_Test/anonymousS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_ANONYMOUSS_UBANTV_CPP_ -#define _TAO_IDL_ANONYMOUSS_UBANTV_CPP_ +#ifndef _TAO_IDL_ANONYMOUSS_GM0QKU_CPP_ +#define _TAO_IDL_ANONYMOUSS_GM0QKU_CPP_ #include "anonymousS.h" @@ -173,15 +173,8 @@ static TAO_All_Anon_AMH_anon_bd_string_test_Perfect_Hash_OpTable tao_All_Anon_AM POA_All_Anon::AMH_anon_bd_string_test::AMH_anon_bd_string_test () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_All_Anon_AMH_anon_bd_string_test_optable); -} - -POA_All_Anon::AMH_anon_bd_string_test::AMH_anon_bd_string_test (const AMH_anon_bd_string_test& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_All_Anon_AMH_anon_bd_string_test_optable); } @@ -536,7 +529,7 @@ POA_All_Anon::AMH_anon_bd_string_test::TestFunc43_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -891,15 +884,8 @@ POA_All_Anon::_TAO_anon_bd_string_test_Direct_Proxy_Impl::TestFunc43 ( POA_All_Anon::anon_bd_string_test::anon_bd_string_test () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_All_Anon_anon_bd_string_test_optable); -} - -POA_All_Anon::anon_bd_string_test::anon_bd_string_test (const anon_bd_string_test& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_All_Anon_anon_bd_string_test_optable); } @@ -1542,7 +1528,7 @@ void POA_All_Anon::anon_bd_string_test::TestFunc43_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1564,7 +1550,7 @@ const char* POA_All_Anon::anon_bd_string_test::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1577,7 +1563,7 @@ void POA_All_Anon::anon_bd_string_test::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2331,16 +2317,8 @@ POA_All_Anon::_TAO_AMI_anon_bd_string_testHandler_Direct_Proxy_Impl::TestFunc43_ POA_All_Anon::AMI_anon_bd_string_testHandler::AMI_anon_bd_string_testHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_All_Anon_AMI_anon_bd_string_testHandler_optable); -} - -POA_All_Anon::AMI_anon_bd_string_testHandler::AMI_anon_bd_string_testHandler (const AMI_anon_bd_string_testHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_All_Anon_AMI_anon_bd_string_testHandler_optable); } @@ -3575,7 +3553,7 @@ void POA_All_Anon::AMI_anon_bd_string_testHandler::TestFunc43_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3598,7 +3576,7 @@ const char* POA_All_Anon::AMI_anon_bd_string_testHandler::_interface_repository_ // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3611,7 +3589,7 @@ void POA_All_Anon::AMI_anon_bd_string_testHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/anonymousS.h b/tests/IDL_Test/anonymousS.h index 47f49da..76ae2ea 100644 --- a/tests/IDL_Test/anonymousS.h +++ b/tests/IDL_Test/anonymousS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_ANONYMOUSS_GQCXJO_H_ -#define _TAO_IDL_ANONYMOUSS_GQCXJO_H_ +#ifndef _TAO_IDL_ANONYMOUSS_GM0QKU_H_ +#define _TAO_IDL_ANONYMOUSS_GM0QKU_H_ #include /**/ "ace/pre.h" @@ -723,7 +723,7 @@ class TAO_IDL_TEST_STUB_Export anon_bd_string_test typedef ::All_Anon::anon_bd_string_test_ptr _stub_ptr_type; typedef ::All_Anon::anon_bd_string_test_var _stub_var_type; - anon_bd_string_test (const anon_bd_string_test& rhs); + anon_bd_string_test (const anon_bd_string_test& rhs) = default; virtual ~anon_bd_string_test () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1002,7 +1002,7 @@ class TAO_IDL_TEST_STUB_Export AMI_anon_bd_string_testHandler typedef ::All_Anon::AMI_anon_bd_string_testHandler_ptr _stub_ptr_type; typedef ::All_Anon::AMI_anon_bd_string_testHandler_var _stub_var_type; - AMI_anon_bd_string_testHandler (const AMI_anon_bd_string_testHandler& rhs); + AMI_anon_bd_string_testHandler (const AMI_anon_bd_string_testHandler& rhs) = default; virtual ~AMI_anon_bd_string_testHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/anyunionC.h b/tests/IDL_Test/anyunionC.h index 888f3b3..f6db3a7 100644 --- a/tests/IDL_Test/anyunionC.h +++ b/tests/IDL_Test/anyunionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_ANYUNIONC_PHNWEY_H_ -#define _TAO_IDL_ANYUNIONC_PHNWEY_H_ +#ifndef _TAO_IDL_ANYUNIONC_07VZV9_H_ +#define _TAO_IDL_ANYUNIONC_07VZV9_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/anyunionS.cpp b/tests/IDL_Test/anyunionS.cpp index ae630b9..f89fe8e 100644 --- a/tests/IDL_Test/anyunionS.cpp +++ b/tests/IDL_Test/anyunionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_ANYUNIONS_PHNWEY_CPP_ -#define _TAO_IDL_ANYUNIONS_PHNWEY_CPP_ +#ifndef _TAO_IDL_ANYUNIONS_07VZV9_CPP_ +#define _TAO_IDL_ANYUNIONS_07VZV9_CPP_ #include "anyunionS.h" diff --git a/tests/IDL_Test/anyunionS.h b/tests/IDL_Test/anyunionS.h index 3e9ecd4..f2b410a 100644 --- a/tests/IDL_Test/anyunionS.h +++ b/tests/IDL_Test/anyunionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_ANYUNIONS_PHNWEY_H_ -#define _TAO_IDL_ANYUNIONS_PHNWEY_H_ +#ifndef _TAO_IDL_ANYUNIONS_07VZV9_H_ +#define _TAO_IDL_ANYUNIONS_07VZV9_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/arrayC.h b/tests/IDL_Test/arrayC.h index aba0f84..ce48cea 100644 --- a/tests/IDL_Test/arrayC.h +++ b/tests/IDL_Test/arrayC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_ARRAYC_B1LJIO_H_ -#define _TAO_IDL_ARRAYC_B1LJIO_H_ +#ifndef _TAO_IDL_ARRAYC_AXTL7Y_H_ +#define _TAO_IDL_ARRAYC_AXTL7Y_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/arrayS.cpp b/tests/IDL_Test/arrayS.cpp index 6c7f265..2d10bc9 100644 --- a/tests/IDL_Test/arrayS.cpp +++ b/tests/IDL_Test/arrayS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_ARRAYS_DUMV8E_CPP_ -#define _TAO_IDL_ARRAYS_DUMV8E_CPP_ +#ifndef _TAO_IDL_ARRAYS_GWCI5O_CPP_ +#define _TAO_IDL_ARRAYS_GWCI5O_CPP_ #include "arrayS.h" @@ -144,15 +144,8 @@ static TAO_AMH_array_args_Perfect_Hash_OpTable tao_AMH_array_args_optable; POA_AMH_array_args::POA_AMH_array_args () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_array_args_optable); -} - -POA_AMH_array_args::POA_AMH_array_args (const POA_AMH_array_args& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_array_args_optable); } @@ -216,7 +209,7 @@ POA_AMH_array_args::all_arrays_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -389,15 +382,8 @@ _TAO_array_args_Direct_Proxy_Impl::all_arrays ( POA_array_args::POA_array_args () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_array_args_optable); -} - -POA_array_args::POA_array_args (const POA_array_args& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_array_args_optable); } @@ -490,7 +476,7 @@ void POA_array_args::all_arrays_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -512,7 +498,7 @@ const char* POA_array_args::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -525,7 +511,7 @@ void POA_array_args::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -721,16 +707,8 @@ _TAO_AMI_array_argsHandler_Direct_Proxy_Impl::all_arrays_excep ( POA_AMI_array_argsHandler::POA_AMI_array_argsHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_array_argsHandler_optable); -} - -POA_AMI_array_argsHandler::POA_AMI_array_argsHandler (const POA_AMI_array_argsHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_array_argsHandler_optable); } @@ -874,7 +852,7 @@ void POA_AMI_array_argsHandler::all_arrays_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -897,7 +875,7 @@ const char* POA_AMI_array_argsHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -910,7 +888,7 @@ void POA_AMI_array_argsHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1016,22 +994,15 @@ static TAO_AMH_testdata_Perfect_Hash_OpTable tao_AMH_testdata_optable; POA_AMH_testdata::POA_AMH_testdata () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_testdata_optable); -} - -POA_AMH_testdata::POA_AMH_testdata (const POA_AMH_testdata& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_testdata_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1180,22 +1151,15 @@ _TAO_testdata_Direct_Proxy_Impl::~_TAO_testdata_Direct_Proxy_Impl () POA_testdata::POA_testdata () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_testdata_optable); -} - -POA_testdata::POA_testdata (const POA_testdata& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_testdata_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1217,7 +1181,7 @@ const char* POA_testdata::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1230,7 +1194,7 @@ void POA_testdata::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1356,21 +1320,14 @@ _TAO_AMI_testdataHandler_Direct_Proxy_Impl::~_TAO_AMI_testdataHandler_Direct_Pro POA_AMI_testdataHandler::POA_AMI_testdataHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_testdataHandler_optable); -} - -POA_AMI_testdataHandler::POA_AMI_testdataHandler (const POA_AMI_testdataHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_testdataHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1393,7 +1350,7 @@ const char* POA_AMI_testdataHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1406,7 +1363,7 @@ void POA_AMI_testdataHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1513,15 +1470,8 @@ static TAO_arraytest_AMH_MyTest_Perfect_Hash_OpTable tao_arraytest_AMH_MyTest_op POA_arraytest::AMH_MyTest::AMH_MyTest () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_arraytest_AMH_MyTest_optable); -} - -POA_arraytest::AMH_MyTest::AMH_MyTest (const AMH_MyTest& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_arraytest_AMH_MyTest_optable); } @@ -1567,7 +1517,7 @@ POA_arraytest::AMH_MyTest::test_method_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1739,15 +1689,8 @@ POA_arraytest::_TAO_MyTest_Direct_Proxy_Impl::test_method ( POA_arraytest::MyTest::MyTest () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_arraytest_MyTest_optable); -} - -POA_arraytest::MyTest::MyTest (const MyTest& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_arraytest_MyTest_optable); } @@ -1835,7 +1778,7 @@ void POA_arraytest::MyTest::test_method_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1857,7 +1800,7 @@ const char* POA_arraytest::MyTest::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1870,7 +1813,7 @@ void POA_arraytest::MyTest::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2075,16 +2018,8 @@ POA_arraytest::_TAO_AMI_MyTestHandler_Direct_Proxy_Impl::test_method_excep ( POA_arraytest::AMI_MyTestHandler::AMI_MyTestHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_arraytest_AMI_MyTestHandler_optable); -} - -POA_arraytest::AMI_MyTestHandler::AMI_MyTestHandler (const AMI_MyTestHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_arraytest_AMI_MyTestHandler_optable); } @@ -2253,7 +2188,7 @@ void POA_arraytest::AMI_MyTestHandler::test_method_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2276,7 +2211,7 @@ const char* POA_arraytest::AMI_MyTestHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2289,7 +2224,7 @@ void POA_arraytest::AMI_MyTestHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/arrayS.h b/tests/IDL_Test/arrayS.h index 29b31d0..540736a 100644 --- a/tests/IDL_Test/arrayS.h +++ b/tests/IDL_Test/arrayS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_ARRAYS_DUMV8E_H_ -#define _TAO_IDL_ARRAYS_DUMV8E_H_ +#ifndef _TAO_IDL_ARRAYS_GWCI5O_H_ +#define _TAO_IDL_ARRAYS_GWCI5O_H_ #include /**/ "ace/pre.h" @@ -688,7 +688,7 @@ class TAO_IDL_TEST_STUB_Export POA_array_args typedef ::array_args_ptr _stub_ptr_type; typedef ::array_args_var _stub_var_type; - POA_array_args (const POA_array_args& rhs); + POA_array_args (const POA_array_args& rhs) = default; virtual ~POA_array_args () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -786,7 +786,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_array_argsHandler typedef ::AMI_array_argsHandler_ptr _stub_ptr_type; typedef ::AMI_array_argsHandler_var _stub_var_type; - POA_AMI_array_argsHandler (const POA_AMI_array_argsHandler& rhs); + POA_AMI_array_argsHandler (const POA_AMI_array_argsHandler& rhs) = default; virtual ~POA_AMI_array_argsHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -916,7 +916,7 @@ class TAO_IDL_TEST_STUB_Export POA_testdata typedef ::testdata_ptr _stub_ptr_type; typedef ::testdata_var _stub_var_type; - POA_testdata (const POA_testdata& rhs); + POA_testdata (const POA_testdata& rhs) = default; virtual ~POA_testdata () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -987,7 +987,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_testdataHandler typedef ::AMI_testdataHandler_ptr _stub_ptr_type; typedef ::AMI_testdataHandler_var _stub_var_type; - POA_AMI_testdataHandler (const POA_AMI_testdataHandler& rhs); + POA_AMI_testdataHandler (const POA_AMI_testdataHandler& rhs) = default; virtual ~POA_AMI_testdataHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1090,7 +1090,7 @@ class TAO_IDL_TEST_STUB_Export MyTest typedef ::arraytest::MyTest_ptr _stub_ptr_type; typedef ::arraytest::MyTest_var _stub_var_type; - MyTest (const MyTest& rhs); + MyTest (const MyTest& rhs) = default; virtual ~MyTest () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1188,7 +1188,7 @@ class TAO_IDL_TEST_STUB_Export AMI_MyTestHandler typedef ::arraytest::AMI_MyTestHandler_ptr _stub_ptr_type; typedef ::arraytest::AMI_MyTestHandler_var _stub_var_type; - AMI_MyTestHandler (const AMI_MyTestHandler& rhs); + AMI_MyTestHandler (const AMI_MyTestHandler& rhs) = default; virtual ~AMI_MyTestHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/array_anon_nestedC.h b/tests/IDL_Test/array_anon_nestedC.h index 94d536d..bf9014a 100644 --- a/tests/IDL_Test/array_anon_nestedC.h +++ b/tests/IDL_Test/array_anon_nestedC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_ARRAY_ANON_NESTEDC_SQFE8E_H_ -#define _TAO_IDL_ARRAY_ANON_NESTEDC_SQFE8E_H_ +#ifndef _TAO_IDL_ARRAY_ANON_NESTEDC_NDJW58_H_ +#define _TAO_IDL_ARRAY_ANON_NESTEDC_NDJW58_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/array_anon_nestedS.cpp b/tests/IDL_Test/array_anon_nestedS.cpp index bfa52af..d5366e3 100644 --- a/tests/IDL_Test/array_anon_nestedS.cpp +++ b/tests/IDL_Test/array_anon_nestedS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_ARRAY_ANON_NESTEDS_SQFE8E_CPP_ -#define _TAO_IDL_ARRAY_ANON_NESTEDS_SQFE8E_CPP_ +#ifndef _TAO_IDL_ARRAY_ANON_NESTEDS_NDJW58_CPP_ +#define _TAO_IDL_ARRAY_ANON_NESTEDS_NDJW58_CPP_ #include "array_anon_nestedS.h" diff --git a/tests/IDL_Test/array_anon_nestedS.h b/tests/IDL_Test/array_anon_nestedS.h index 95f683c..edd4474 100644 --- a/tests/IDL_Test/array_anon_nestedS.h +++ b/tests/IDL_Test/array_anon_nestedS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_ARRAY_ANON_NESTEDS_SQFE8E_H_ -#define _TAO_IDL_ARRAY_ANON_NESTEDS_SQFE8E_H_ +#ifndef _TAO_IDL_ARRAY_ANON_NESTEDS_NDJW58_H_ +#define _TAO_IDL_ARRAY_ANON_NESTEDS_NDJW58_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/array_anonymousC.h b/tests/IDL_Test/array_anonymousC.h index 5377712..cbeda65 100644 --- a/tests/IDL_Test/array_anonymousC.h +++ b/tests/IDL_Test/array_anonymousC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_ARRAY_ANONYMOUSC_WEDTFX_H_ -#define _TAO_IDL_ARRAY_ANONYMOUSC_WEDTFX_H_ +#ifndef _TAO_IDL_ARRAY_ANONYMOUSC_ZDCCU3_H_ +#define _TAO_IDL_ARRAY_ANONYMOUSC_ZDCCU3_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/array_anonymousS.cpp b/tests/IDL_Test/array_anonymousS.cpp index 2b7c83d..07d842a 100644 --- a/tests/IDL_Test/array_anonymousS.cpp +++ b/tests/IDL_Test/array_anonymousS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_ARRAY_ANONYMOUSS_SIWABV_CPP_ -#define _TAO_IDL_ARRAY_ANONYMOUSS_SIWABV_CPP_ +#ifndef _TAO_IDL_ARRAY_ANONYMOUSS_KPVZPL_CPP_ +#define _TAO_IDL_ARRAY_ANONYMOUSS_KPVZPL_CPP_ #include "array_anonymousS.h" @@ -143,22 +143,15 @@ static TAO_AMH_tdef_Perfect_Hash_OpTable tao_AMH_tdef_optable; POA_AMH_tdef::POA_AMH_tdef () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_tdef_optable); -} - -POA_AMH_tdef::POA_AMH_tdef (const POA_AMH_tdef& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_tdef_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -307,22 +300,15 @@ _TAO_tdef_Direct_Proxy_Impl::~_TAO_tdef_Direct_Proxy_Impl () POA_tdef::POA_tdef () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_tdef_optable); -} - -POA_tdef::POA_tdef (const POA_tdef& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_tdef_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -344,7 +330,7 @@ const char* POA_tdef::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -357,7 +343,7 @@ void POA_tdef::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -483,21 +469,14 @@ _TAO_AMI_tdefHandler_Direct_Proxy_Impl::~_TAO_AMI_tdefHandler_Direct_Proxy_Impl POA_AMI_tdefHandler::POA_AMI_tdefHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_tdefHandler_optable); -} - -POA_AMI_tdefHandler::POA_AMI_tdefHandler (const POA_AMI_tdefHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_tdefHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -520,7 +499,7 @@ const char* POA_AMI_tdefHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -533,7 +512,7 @@ void POA_AMI_tdefHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/array_anonymousS.h b/tests/IDL_Test/array_anonymousS.h index 4508777..89b2bcf 100644 --- a/tests/IDL_Test/array_anonymousS.h +++ b/tests/IDL_Test/array_anonymousS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_ARRAY_ANONYMOUSS_SIWABV_H_ -#define _TAO_IDL_ARRAY_ANONYMOUSS_SIWABV_H_ +#ifndef _TAO_IDL_ARRAY_ANONYMOUSS_KPVZPL_H_ +#define _TAO_IDL_ARRAY_ANONYMOUSS_KPVZPL_H_ #include /**/ "ace/pre.h" @@ -253,7 +253,7 @@ class TAO_IDL_TEST_STUB_Export POA_tdef typedef ::tdef_ptr _stub_ptr_type; typedef ::tdef_var _stub_var_type; - POA_tdef (const POA_tdef& rhs); + POA_tdef (const POA_tdef& rhs) = default; virtual ~POA_tdef () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -324,7 +324,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_tdefHandler typedef ::AMI_tdefHandler_ptr _stub_ptr_type; typedef ::AMI_tdefHandler_var _stub_var_type; - POA_AMI_tdefHandler (const POA_AMI_tdefHandler& rhs); + POA_AMI_tdefHandler (const POA_AMI_tdefHandler& rhs) = default; virtual ~POA_AMI_tdefHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/array_onlyA.h b/tests/IDL_Test/array_onlyA.h index 0bc7e05..9ae3ec2 100644 --- a/tests/IDL_Test/array_onlyA.h +++ b/tests/IDL_Test/array_onlyA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_ARRAY_ONLYA_OMRIPB_H_ -#define _TAO_IDL_ARRAY_ONLYA_OMRIPB_H_ +#ifndef _TAO_IDL_ARRAY_ONLYA_2PIQL5_H_ +#define _TAO_IDL_ARRAY_ONLYA_2PIQL5_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/array_onlyC.h b/tests/IDL_Test/array_onlyC.h index 5581ea4..23d9965 100644 --- a/tests/IDL_Test/array_onlyC.h +++ b/tests/IDL_Test/array_onlyC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_ARRAY_ONLYC_OMRIPB_H_ -#define _TAO_IDL_ARRAY_ONLYC_OMRIPB_H_ +#ifndef _TAO_IDL_ARRAY_ONLYC_2PIQL5_H_ +#define _TAO_IDL_ARRAY_ONLYC_2PIQL5_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/array_onlyS.cpp b/tests/IDL_Test/array_onlyS.cpp index 5693153..635b4ba 100644 --- a/tests/IDL_Test/array_onlyS.cpp +++ b/tests/IDL_Test/array_onlyS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_ARRAY_ONLYS_OMRIPB_CPP_ -#define _TAO_IDL_ARRAY_ONLYS_OMRIPB_CPP_ +#ifndef _TAO_IDL_ARRAY_ONLYS_2PIQL5_CPP_ +#define _TAO_IDL_ARRAY_ONLYS_2PIQL5_CPP_ #include "array_onlyS.h" diff --git a/tests/IDL_Test/array_onlyS.h b/tests/IDL_Test/array_onlyS.h index 0e581a4..8c43bbe 100644 --- a/tests/IDL_Test/array_onlyS.h +++ b/tests/IDL_Test/array_onlyS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_ARRAY_ONLYS_OMRIPB_H_ -#define _TAO_IDL_ARRAY_ONLYS_OMRIPB_H_ +#ifndef _TAO_IDL_ARRAY_ONLYS_2PIQL5_H_ +#define _TAO_IDL_ARRAY_ONLYS_2PIQL5_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/attributeC.h b/tests/IDL_Test/attributeC.h index 6a577d7..bbb4f81 100644 --- a/tests/IDL_Test/attributeC.h +++ b/tests/IDL_Test/attributeC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_ATTRIBUTEC_ZO8SCN_H_ -#define _TAO_IDL_ATTRIBUTEC_ZO8SCN_H_ +#ifndef _TAO_IDL_ATTRIBUTEC_IKZNTI_H_ +#define _TAO_IDL_ATTRIBUTEC_IKZNTI_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/attributeS.cpp b/tests/IDL_Test/attributeS.cpp index 478186b..092bd9a 100644 --- a/tests/IDL_Test/attributeS.cpp +++ b/tests/IDL_Test/attributeS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_ATTRIBUTES_UABKX5_CPP_ -#define _TAO_IDL_ATTRIBUTES_UABKX5_CPP_ +#ifndef _TAO_IDL_ATTRIBUTES_DWICJH_CPP_ +#define _TAO_IDL_ATTRIBUTES_DWICJH_CPP_ #include "attributeS.h" @@ -173,15 +173,8 @@ static TAO_Hello_AMH_MyFoo_Perfect_Hash_OpTable tao_Hello_AMH_MyFoo_optable; POA_Hello::AMH_MyFoo::AMH_MyFoo () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Hello_AMH_MyFoo_optable); -} - -POA_Hello::AMH_MyFoo::AMH_MyFoo (const AMH_MyFoo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Hello_AMH_MyFoo_optable); } @@ -583,7 +576,7 @@ POA_Hello::AMH_MyFoo::_get_ro_attrib_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -960,15 +953,8 @@ POA_Hello::_TAO_MyFoo_Direct_Proxy_Impl::_get_ro_attrib ( POA_Hello::MyFoo::MyFoo () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Hello_MyFoo_optable); -} - -POA_Hello::MyFoo::MyFoo (const MyFoo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Hello_MyFoo_optable); } @@ -1761,7 +1747,7 @@ void POA_Hello::MyFoo::_get_ro_attrib_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1783,7 +1769,7 @@ const char* POA_Hello::MyFoo::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1796,7 +1782,7 @@ void POA_Hello::MyFoo::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2631,16 +2617,8 @@ POA_Hello::_TAO_AMI_MyFooHandler_Direct_Proxy_Impl::get_ro_attrib_excep ( POA_Hello::AMI_MyFooHandler::AMI_MyFooHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Hello_AMI_MyFooHandler_optable); -} - -POA_Hello::AMI_MyFooHandler::AMI_MyFooHandler (const AMI_MyFooHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_Hello_AMI_MyFooHandler_optable); } @@ -4333,7 +4311,7 @@ void POA_Hello::AMI_MyFooHandler::get_ro_attrib_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4356,7 +4334,7 @@ const char* POA_Hello::AMI_MyFooHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4369,7 +4347,7 @@ void POA_Hello::AMI_MyFooHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/attributeS.h b/tests/IDL_Test/attributeS.h index db2d58e..40af279 100644 --- a/tests/IDL_Test/attributeS.h +++ b/tests/IDL_Test/attributeS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_ATTRIBUTES_VGTMAA_H_ -#define _TAO_IDL_ATTRIBUTES_VGTMAA_H_ +#ifndef _TAO_IDL_ATTRIBUTES_DWICJH_H_ +#define _TAO_IDL_ATTRIBUTES_DWICJH_H_ #include /**/ "ace/pre.h" @@ -317,7 +317,7 @@ class TAO_IDL_TEST_STUB_Export MyFoo typedef ::Hello::MyFoo_ptr _stub_ptr_type; typedef ::Hello::MyFoo_var _stub_var_type; - MyFoo (const MyFoo& rhs); + MyFoo (const MyFoo& rhs) = default; virtual ~MyFoo () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -622,7 +622,7 @@ class TAO_IDL_TEST_STUB_Export AMI_MyFooHandler typedef ::Hello::AMI_MyFooHandler_ptr _stub_ptr_type; typedef ::Hello::AMI_MyFooHandler_var _stub_var_type; - AMI_MyFooHandler (const AMI_MyFooHandler& rhs); + AMI_MyFooHandler (const AMI_MyFooHandler& rhs) = default; virtual ~AMI_MyFooHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/constantsA.h b/tests/IDL_Test/constantsA.h index b368dd6..a01a4f5 100644 --- a/tests/IDL_Test/constantsA.h +++ b/tests/IDL_Test/constantsA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_CONSTANTSA_EDFB13_H_ -#define _TAO_IDL_CONSTANTSA_EDFB13_H_ +#ifndef _TAO_IDL_CONSTANTSA_CZSEQD_H_ +#define _TAO_IDL_CONSTANTSA_CZSEQD_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/constantsC.h b/tests/IDL_Test/constantsC.h index 4c44fbd..fcdcc74 100644 --- a/tests/IDL_Test/constantsC.h +++ b/tests/IDL_Test/constantsC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_CONSTANTSC_EDFB13_H_ -#define _TAO_IDL_CONSTANTSC_EDFB13_H_ +#ifndef _TAO_IDL_CONSTANTSC_CZSEQD_H_ +#define _TAO_IDL_CONSTANTSC_CZSEQD_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/constantsS.cpp b/tests/IDL_Test/constantsS.cpp index ebc7baa..cd48c90 100644 --- a/tests/IDL_Test/constantsS.cpp +++ b/tests/IDL_Test/constantsS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_CONSTANTSS_AEMP9C_CPP_ -#define _TAO_IDL_CONSTANTSS_AEMP9C_CPP_ +#ifndef _TAO_IDL_CONSTANTSS_8LQJZA_CPP_ +#define _TAO_IDL_CONSTANTSS_8LQJZA_CPP_ #include "constantsS.h" @@ -143,22 +143,15 @@ static TAO_ClassConstants_AMH_Iface_Perfect_Hash_OpTable tao_ClassConstants_AMH_ POA_ClassConstants::AMH_Iface::AMH_Iface () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_ClassConstants_AMH_Iface_optable); -} - -POA_ClassConstants::AMH_Iface::AMH_Iface (const AMH_Iface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_ClassConstants_AMH_Iface_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -307,22 +300,15 @@ POA_ClassConstants::_TAO_Iface_Direct_Proxy_Impl::~_TAO_Iface_Direct_Proxy_Impl POA_ClassConstants::Iface::Iface () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_ClassConstants_Iface_optable); -} - -POA_ClassConstants::Iface::Iface (const Iface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_ClassConstants_Iface_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -344,7 +330,7 @@ const char* POA_ClassConstants::Iface::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -357,7 +343,7 @@ void POA_ClassConstants::Iface::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -483,21 +469,14 @@ POA_ClassConstants::_TAO_AMI_IfaceHandler_Direct_Proxy_Impl::~_TAO_AMI_IfaceHand POA_ClassConstants::AMI_IfaceHandler::AMI_IfaceHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_ClassConstants_AMI_IfaceHandler_optable); -} - -POA_ClassConstants::AMI_IfaceHandler::AMI_IfaceHandler (const AMI_IfaceHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_ClassConstants_AMI_IfaceHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -520,7 +499,7 @@ const char* POA_ClassConstants::AMI_IfaceHandler::_interface_repository_id () co // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -533,7 +512,7 @@ void POA_ClassConstants::AMI_IfaceHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/constantsS.h b/tests/IDL_Test/constantsS.h index ac30d81..8c42b51 100644 --- a/tests/IDL_Test/constantsS.h +++ b/tests/IDL_Test/constantsS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_CONSTANTSS_EDFB13_H_ -#define _TAO_IDL_CONSTANTSS_EDFB13_H_ +#ifndef _TAO_IDL_CONSTANTSS_8LQJZA_H_ +#define _TAO_IDL_CONSTANTSS_8LQJZA_H_ #include /**/ "ace/pre.h" @@ -275,7 +275,7 @@ class TAO_IDL_TEST_STUB_Export Iface typedef ::ClassConstants::Iface_ptr _stub_ptr_type; typedef ::ClassConstants::Iface_var _stub_var_type; - Iface (const Iface& rhs); + Iface (const Iface& rhs) = default; virtual ~Iface () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -346,7 +346,7 @@ class TAO_IDL_TEST_STUB_Export AMI_IfaceHandler typedef ::ClassConstants::AMI_IfaceHandler_ptr _stub_ptr_type; typedef ::ClassConstants::AMI_IfaceHandler_var _stub_var_type; - AMI_IfaceHandler (const AMI_IfaceHandler& rhs); + AMI_IfaceHandler (const AMI_IfaceHandler& rhs) = default; virtual ~AMI_IfaceHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/dif2A.h b/tests/IDL_Test/dif2A.h index 66b6d29..6d065b0 100644 --- a/tests/IDL_Test/dif2A.h +++ b/tests/IDL_Test/dif2A.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_DIF2A_LZDTHM_H_ -#define _TAO_IDL_DIF2A_LZDTHM_H_ +#ifndef _TAO_IDL_DIF2A_2MO5AY_H_ +#define _TAO_IDL_DIF2A_2MO5AY_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/dif2C.h b/tests/IDL_Test/dif2C.h index 6ef983e..b82790c 100644 --- a/tests/IDL_Test/dif2C.h +++ b/tests/IDL_Test/dif2C.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_DIF2C_LZDTHM_H_ -#define _TAO_IDL_DIF2C_LZDTHM_H_ +#ifndef _TAO_IDL_DIF2C_2MO5AY_H_ +#define _TAO_IDL_DIF2C_2MO5AY_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/dif2S.cpp b/tests/IDL_Test/dif2S.cpp index 28c6d15..dd8cf98 100644 --- a/tests/IDL_Test/dif2S.cpp +++ b/tests/IDL_Test/dif2S.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_DIF2S_XAV75Q_CPP_ -#define _TAO_IDL_DIF2S_XAV75Q_CPP_ +#ifndef _TAO_IDL_DIF2S_3VHKEA_CPP_ +#define _TAO_IDL_DIF2S_3VHKEA_CPP_ #include "dif2S.h" @@ -152,15 +152,8 @@ static TAO_OldDif2_AMH_ex1_Perfect_Hash_OpTable tao_OldDif2_AMH_ex1_optable; POA_OldDif2::AMH_ex1::AMH_ex1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_AMH_ex1_optable); -} - -POA_OldDif2::AMH_ex1::AMH_ex1 (const AMH_ex1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldDif2_AMH_ex1_optable); } @@ -512,7 +505,7 @@ POA_OldDif2::AMH_ex1::op6_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -841,15 +834,8 @@ POA_OldDif2::_TAO_ex1_Direct_Proxy_Impl::op6 ( POA_OldDif2::ex1::ex1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_ex1_optable); -} - -POA_OldDif2::ex1::ex1 (const ex1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldDif2_ex1_optable); } @@ -1550,7 +1536,7 @@ void POA_OldDif2::ex1::op6_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1572,7 +1558,7 @@ const char* POA_OldDif2::ex1::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1585,7 +1571,7 @@ void POA_OldDif2::ex1::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2318,16 +2304,8 @@ POA_OldDif2::_TAO_AMI_ex1Handler_Direct_Proxy_Impl::op6_excep ( POA_OldDif2::AMI_ex1Handler::AMI_ex1Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_AMI_ex1Handler_optable); -} - -POA_OldDif2::AMI_ex1Handler::AMI_ex1Handler (const AMI_ex1Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_OldDif2_AMI_ex1Handler_optable); } @@ -3559,7 +3537,7 @@ void POA_OldDif2::AMI_ex1Handler::op6_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3582,7 +3560,7 @@ const char* POA_OldDif2::AMI_ex1Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3595,7 +3573,7 @@ void POA_OldDif2::AMI_ex1Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3718,16 +3696,8 @@ static TAO_OldDif2_AMH_ex2_Perfect_Hash_OpTable tao_OldDif2_AMH_ex2_optable; POA_OldDif2::AMH_ex2::AMH_ex2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_AMH_ex2_optable); -} - -POA_OldDif2::AMH_ex2::AMH_ex2 (const AMH_ex2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldDif2::AMH_ex1 (rhs) { + this->optable_ = std::addressof (tao_OldDif2_AMH_ex2_optable); } @@ -4031,7 +4001,7 @@ POA_OldDif2::AMH_ex2::op12_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4344,16 +4314,8 @@ POA_OldDif2::_TAO_ex2_Direct_Proxy_Impl::op12 ( POA_OldDif2::ex2::ex2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_ex2_optable); -} - -POA_OldDif2::ex2::ex2 (const ex2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldDif2::ex1 (rhs) { + this->optable_ = std::addressof (tao_OldDif2_ex2_optable); } @@ -4954,7 +4916,7 @@ void POA_OldDif2::ex2::op12_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4977,7 +4939,7 @@ const char* POA_OldDif2::ex2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4990,7 +4952,7 @@ void POA_OldDif2::ex2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -5657,17 +5619,8 @@ POA_OldDif2::_TAO_AMI_ex2Handler_Direct_Proxy_Impl::op12_excep ( POA_OldDif2::AMI_ex2Handler::AMI_ex2Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_AMI_ex2Handler_optable); -} - -POA_OldDif2::AMI_ex2Handler::AMI_ex2Handler (const AMI_ex2Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_OldDif2::AMI_ex1Handler (rhs) { + this->optable_ = std::addressof (tao_OldDif2_AMI_ex2Handler_optable); } @@ -6727,7 +6680,7 @@ void POA_OldDif2::AMI_ex2Handler::op12_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6751,7 +6704,7 @@ const char* POA_OldDif2::AMI_ex2Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -6764,7 +6717,7 @@ void POA_OldDif2::AMI_ex2Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -6906,16 +6859,8 @@ static TAO_OldDif2_AMH_ex3_Perfect_Hash_OpTable tao_OldDif2_AMH_ex3_optable; POA_OldDif2::AMH_ex3::AMH_ex3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_AMH_ex3_optable); -} - -POA_OldDif2::AMH_ex3::AMH_ex3 (const AMH_ex3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldDif2::AMH_ex1 (rhs) { + this->optable_ = std::addressof (tao_OldDif2_AMH_ex3_optable); } @@ -7217,7 +7162,7 @@ POA_OldDif2::AMH_ex3::_get_unsigned_long_attribute_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7557,16 +7502,8 @@ POA_OldDif2::_TAO_ex3_Direct_Proxy_Impl::_get_unsigned_long_attribute ( POA_OldDif2::ex3::ex3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_ex3_optable); -} - -POA_OldDif2::ex3::ex3 (const ex3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldDif2::ex1 (rhs) { + this->optable_ = std::addressof (tao_OldDif2_ex3_optable); } @@ -8125,7 +8062,7 @@ void POA_OldDif2::ex3::_get_unsigned_long_attribute_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -8148,7 +8085,7 @@ const char* POA_OldDif2::ex3::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -8161,7 +8098,7 @@ void POA_OldDif2::ex3::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -8866,17 +8803,8 @@ POA_OldDif2::_TAO_AMI_ex3Handler_Direct_Proxy_Impl::get_unsigned_long_attribute_ POA_OldDif2::AMI_ex3Handler::AMI_ex3Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_AMI_ex3Handler_optable); -} - -POA_OldDif2::AMI_ex3Handler::AMI_ex3Handler (const AMI_ex3Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_OldDif2::AMI_ex1Handler (rhs) { + this->optable_ = std::addressof (tao_OldDif2_AMI_ex3Handler_optable); } @@ -9983,7 +9911,7 @@ void POA_OldDif2::AMI_ex3Handler::get_unsigned_long_attribute_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -10007,7 +9935,7 @@ const char* POA_OldDif2::AMI_ex3Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -10020,7 +9948,7 @@ void POA_OldDif2::AMI_ex3Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -10241,18 +10169,8 @@ static TAO_OldDif2_AMH_ex4_Perfect_Hash_OpTable tao_OldDif2_AMH_ex4_optable; POA_OldDif2::AMH_ex4::AMH_ex4 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_AMH_ex4_optable); -} - -POA_OldDif2::AMH_ex4::AMH_ex4 (const AMH_ex4& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldDif2::AMH_ex1 (rhs), - POA_OldDif2::AMH_ex2 (rhs), - POA_OldDif2::AMH_ex3 (rhs) { + this->optable_ = std::addressof (tao_OldDif2_AMH_ex4_optable); } @@ -10682,7 +10600,7 @@ POA_OldDif2::AMH_ex4::_get_an_object_attribute_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -11169,18 +11087,8 @@ POA_OldDif2::_TAO_ex4_Direct_Proxy_Impl::_get_an_object_attribute ( POA_OldDif2::ex4::ex4 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_ex4_optable); -} - -POA_OldDif2::ex4::ex4 (const ex4& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldDif2::ex1 (rhs), - POA_OldDif2::ex2 (rhs), - POA_OldDif2::ex3 (rhs) { + this->optable_ = std::addressof (tao_OldDif2_ex4_optable); } @@ -11976,7 +11884,7 @@ void POA_OldDif2::ex4::_get_an_object_attribute_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -12001,7 +11909,7 @@ const char* POA_OldDif2::ex4::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -12014,7 +11922,7 @@ void POA_OldDif2::ex4::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -13113,19 +13021,8 @@ POA_OldDif2::_TAO_AMI_ex4Handler_Direct_Proxy_Impl::get_an_object_attribute_exce POA_OldDif2::AMI_ex4Handler::AMI_ex4Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldDif2_AMI_ex4Handler_optable); -} - -POA_OldDif2::AMI_ex4Handler::AMI_ex4Handler (const AMI_ex4Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_OldDif2::AMI_ex1Handler (rhs), - POA_OldDif2::AMI_ex2Handler (rhs), - POA_OldDif2::AMI_ex3Handler (rhs) { + this->optable_ = std::addressof (tao_OldDif2_AMI_ex4Handler_optable); } @@ -14701,7 +14598,7 @@ void POA_OldDif2::AMI_ex4Handler::get_an_object_attribute_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -14727,7 +14624,7 @@ const char* POA_OldDif2::AMI_ex4Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -14740,7 +14637,7 @@ void POA_OldDif2::AMI_ex4Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/dif2S.h b/tests/IDL_Test/dif2S.h index dc472dd..9abd148 100644 --- a/tests/IDL_Test/dif2S.h +++ b/tests/IDL_Test/dif2S.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_DIF2S_47UQKC_H_ -#define _TAO_IDL_DIF2S_47UQKC_H_ +#ifndef _TAO_IDL_DIF2S_GSCRTY_H_ +#define _TAO_IDL_DIF2S_GSCRTY_H_ #include /**/ "ace/pre.h" @@ -698,7 +698,7 @@ class TAO_IDL_TEST_STUB_Export ex1 typedef ::OldDif2::ex1_ptr _stub_ptr_type; typedef ::OldDif2::ex1_var _stub_var_type; - ex1 (const ex1& rhs); + ex1 (const ex1& rhs) = default; virtual ~ex1 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -980,7 +980,7 @@ class TAO_IDL_TEST_STUB_Export AMI_ex1Handler typedef ::OldDif2::AMI_ex1Handler_ptr _stub_ptr_type; typedef ::OldDif2::AMI_ex1Handler_var _stub_var_type; - AMI_ex1Handler (const AMI_ex1Handler& rhs); + AMI_ex1Handler (const AMI_ex1Handler& rhs) = default; virtual ~AMI_ex1Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1396,7 +1396,7 @@ class TAO_IDL_TEST_STUB_Export ex2 typedef ::OldDif2::ex2_ptr _stub_ptr_type; typedef ::OldDif2::ex2_var _stub_var_type; - ex2 (const ex2& rhs); + ex2 (const ex2& rhs) = default; virtual ~ex2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1647,7 +1647,7 @@ class TAO_IDL_TEST_STUB_Export AMI_ex2Handler typedef ::OldDif2::AMI_ex2Handler_ptr _stub_ptr_type; typedef ::OldDif2::AMI_ex2Handler_var _stub_var_type; - AMI_ex2Handler (const AMI_ex2Handler& rhs); + AMI_ex2Handler (const AMI_ex2Handler& rhs) = default; virtual ~AMI_ex2Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2032,7 +2032,7 @@ class TAO_IDL_TEST_STUB_Export ex3 typedef ::OldDif2::ex3_ptr _stub_ptr_type; typedef ::OldDif2::ex3_var _stub_var_type; - ex3 (const ex3& rhs); + ex3 (const ex3& rhs) = default; virtual ~ex3 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2286,7 +2286,7 @@ class TAO_IDL_TEST_STUB_Export AMI_ex3Handler typedef ::OldDif2::AMI_ex3Handler_ptr _stub_ptr_type; typedef ::OldDif2::AMI_ex3Handler_var _stub_var_type; - AMI_ex3Handler (const AMI_ex3Handler& rhs); + AMI_ex3Handler (const AMI_ex3Handler& rhs) = default; virtual ~AMI_ex3Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2733,7 +2733,7 @@ class TAO_IDL_TEST_STUB_Export ex4 typedef ::OldDif2::ex4_ptr _stub_ptr_type; typedef ::OldDif2::ex4_var _stub_var_type; - ex4 (const ex4& rhs); + ex4 (const ex4& rhs) = default; virtual ~ex4 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3067,7 +3067,7 @@ class TAO_IDL_TEST_STUB_Export AMI_ex4Handler typedef ::OldDif2::AMI_ex4Handler_ptr _stub_ptr_type; typedef ::OldDif2::AMI_ex4Handler_var _stub_var_type; - AMI_ex4Handler (const AMI_ex4Handler& rhs); + AMI_ex4Handler (const AMI_ex4Handler& rhs) = default; virtual ~AMI_ex4Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/enum_in_structC.h b/tests/IDL_Test/enum_in_structC.h index 7c53c05..62531d1 100644 --- a/tests/IDL_Test/enum_in_structC.h +++ b/tests/IDL_Test/enum_in_structC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_ENUM_IN_STRUCTC_RG28DY_H_ -#define _TAO_IDL_ENUM_IN_STRUCTC_RG28DY_H_ +#ifndef _TAO_IDL_ENUM_IN_STRUCTC_AOFNYW_H_ +#define _TAO_IDL_ENUM_IN_STRUCTC_AOFNYW_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/enum_in_structS.cpp b/tests/IDL_Test/enum_in_structS.cpp index 1b3c3a0..1246b18 100644 --- a/tests/IDL_Test/enum_in_structS.cpp +++ b/tests/IDL_Test/enum_in_structS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_ENUM_IN_STRUCTS_WMYQHJ_CPP_ -#define _TAO_IDL_ENUM_IN_STRUCTS_WMYQHJ_CPP_ +#ifndef _TAO_IDL_ENUM_IN_STRUCTS_AMAUW1_CPP_ +#define _TAO_IDL_ENUM_IN_STRUCTS_AMAUW1_CPP_ #include "enum_in_structS.h" diff --git a/tests/IDL_Test/enum_in_structS.h b/tests/IDL_Test/enum_in_structS.h index c4b213e..b5f5cd2 100644 --- a/tests/IDL_Test/enum_in_structS.h +++ b/tests/IDL_Test/enum_in_structS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_ENUM_IN_STRUCTS_WMYQHJ_H_ -#define _TAO_IDL_ENUM_IN_STRUCTS_WMYQHJ_H_ +#ifndef _TAO_IDL_ENUM_IN_STRUCTS_AMAUW1_H_ +#define _TAO_IDL_ENUM_IN_STRUCTS_AMAUW1_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/expressionsC.h b/tests/IDL_Test/expressionsC.h index 9da399b..546d789 100644 --- a/tests/IDL_Test/expressionsC.h +++ b/tests/IDL_Test/expressionsC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_EXPRESSIONSC_ZYEHEW_H_ -#define _TAO_IDL_EXPRESSIONSC_ZYEHEW_H_ +#ifndef _TAO_IDL_EXPRESSIONSC_CJTE6K_H_ +#define _TAO_IDL_EXPRESSIONSC_CJTE6K_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/expressionsS.cpp b/tests/IDL_Test/expressionsS.cpp index d562746..585e5fe 100644 --- a/tests/IDL_Test/expressionsS.cpp +++ b/tests/IDL_Test/expressionsS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_EXPRESSIONSS_ZYEHEW_CPP_ -#define _TAO_IDL_EXPRESSIONSS_ZYEHEW_CPP_ +#ifndef _TAO_IDL_EXPRESSIONSS_JRLC6C_CPP_ +#define _TAO_IDL_EXPRESSIONSS_JRLC6C_CPP_ #include "expressionsS.h" diff --git a/tests/IDL_Test/expressionsS.h b/tests/IDL_Test/expressionsS.h index c7de90e..21c6ddc 100644 --- a/tests/IDL_Test/expressionsS.h +++ b/tests/IDL_Test/expressionsS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_EXPRESSIONSS_ZYEHEW_H_ -#define _TAO_IDL_EXPRESSIONSS_ZYEHEW_H_ +#ifndef _TAO_IDL_EXPRESSIONSS_JRLC6C_H_ +#define _TAO_IDL_EXPRESSIONSS_JRLC6C_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/fullC.h b/tests/IDL_Test/fullC.h index a0c90b8..77f0181 100644 --- a/tests/IDL_Test/fullC.h +++ b/tests/IDL_Test/fullC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_FULLC_I3YWTS_H_ -#define _TAO_IDL_FULLC_I3YWTS_H_ +#ifndef _TAO_IDL_FULLC_UPB62L_H_ +#define _TAO_IDL_FULLC_UPB62L_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/fullS.cpp b/tests/IDL_Test/fullS.cpp index 67e97e5..5119fb0 100644 --- a/tests/IDL_Test/fullS.cpp +++ b/tests/IDL_Test/fullS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_FULLS_DTKBZK_CPP_ -#define _TAO_IDL_FULLS_DTKBZK_CPP_ +#ifndef _TAO_IDL_FULLS_QV0WQU_CPP_ +#define _TAO_IDL_FULLS_QV0WQU_CPP_ #include "fullS.h" @@ -145,20 +145,14 @@ static TAO_scope_test_AMH_i_scope_test_Perfect_Hash_OpTable tao_scope_test_AMH_i POA_scope_test::AMH_i_scope_test::AMH_i_scope_test () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_scope_test_AMH_i_scope_test_optable); -} - -POA_scope_test::AMH_i_scope_test::AMH_i_scope_test (const AMH_i_scope_test& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_scope_test_AMH_i_scope_test_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -309,20 +303,14 @@ POA_scope_test::_TAO_i_scope_test_Direct_Proxy_Impl::~_TAO_i_scope_test_Direct_P POA_scope_test::i_scope_test::i_scope_test () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_scope_test_i_scope_test_optable); -} - -POA_scope_test::i_scope_test::i_scope_test (const i_scope_test& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_scope_test_i_scope_test_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -344,7 +332,7 @@ const char* POA_scope_test::i_scope_test::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -357,7 +345,7 @@ void POA_scope_test::i_scope_test::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -483,21 +471,14 @@ POA_scope_test::_TAO_AMI_i_scope_testHandler_Direct_Proxy_Impl::~_TAO_AMI_i_scop POA_scope_test::AMI_i_scope_testHandler::AMI_i_scope_testHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_scope_test_AMI_i_scope_testHandler_optable); -} - -POA_scope_test::AMI_i_scope_testHandler::AMI_i_scope_testHandler (const AMI_i_scope_testHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_scope_test_AMI_i_scope_testHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -520,7 +501,7 @@ const char* POA_scope_test::AMI_i_scope_testHandler::_interface_repository_id () // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -533,7 +514,7 @@ void POA_scope_test::AMI_i_scope_testHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -663,15 +644,8 @@ static TAO_mod2_AMH_fwd_Perfect_Hash_OpTable tao_mod2_AMH_fwd_optable; POA_mod2::AMH_fwd::AMH_fwd () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod2_AMH_fwd_optable); -} - -POA_mod2::AMH_fwd::AMH_fwd (const AMH_fwd& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_mod2_AMH_fwd_optable); } @@ -821,7 +795,7 @@ POA_mod2::AMH_fwd::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1063,15 +1037,8 @@ POA_mod2::_TAO_fwd_Direct_Proxy_Impl::op ( POA_mod2::fwd::fwd () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod2_fwd_optable); -} - -POA_mod2::fwd::fwd (const fwd& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_mod2_fwd_optable); } @@ -1351,7 +1318,7 @@ void POA_mod2::fwd::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1373,7 +1340,7 @@ const char* POA_mod2::fwd::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1386,7 +1353,7 @@ void POA_mod2::fwd::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1754,16 +1721,8 @@ POA_mod2::_TAO_AMI_fwdHandler_Direct_Proxy_Impl::op_excep ( POA_mod2::AMI_fwdHandler::AMI_fwdHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod2_AMI_fwdHandler_optable); -} - -POA_mod2::AMI_fwdHandler::AMI_fwdHandler (const AMI_fwdHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_mod2_AMI_fwdHandler_optable); } @@ -2303,7 +2262,7 @@ void POA_mod2::AMI_fwdHandler::op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2326,7 +2285,7 @@ const char* POA_mod2::AMI_fwdHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2339,7 +2298,7 @@ void POA_mod2::AMI_fwdHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/fullS.h b/tests/IDL_Test/fullS.h index 3e90fb6..3906935 100644 --- a/tests/IDL_Test/fullS.h +++ b/tests/IDL_Test/fullS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_FULLS_ZEUNUL_H_ -#define _TAO_IDL_FULLS_ZEUNUL_H_ +#ifndef _TAO_IDL_FULLS_QV0WQU_H_ +#define _TAO_IDL_FULLS_QV0WQU_H_ #include /**/ "ace/pre.h" @@ -330,7 +330,7 @@ class TAO_IDL_TEST_STUB_Export i_scope_test typedef ::scope_test::i_scope_test_ptr _stub_ptr_type; typedef ::scope_test::i_scope_test_var _stub_var_type; - i_scope_test (const i_scope_test& rhs); + i_scope_test (const i_scope_test& rhs) = default; virtual ~i_scope_test () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -401,7 +401,7 @@ class TAO_IDL_TEST_STUB_Export AMI_i_scope_testHandler typedef ::scope_test::AMI_i_scope_testHandler_ptr _stub_ptr_type; typedef ::scope_test::AMI_i_scope_testHandler_var _stub_var_type; - AMI_i_scope_testHandler (const AMI_i_scope_testHandler& rhs); + AMI_i_scope_testHandler (const AMI_i_scope_testHandler& rhs) = default; virtual ~AMI_i_scope_testHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -538,7 +538,7 @@ class TAO_IDL_TEST_STUB_Export fwd typedef ::mod2::fwd_ptr _stub_ptr_type; typedef ::mod2::fwd_var _stub_var_type; - fwd (const fwd& rhs); + fwd (const fwd& rhs) = default; virtual ~fwd () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -693,7 +693,7 @@ class TAO_IDL_TEST_STUB_Export AMI_fwdHandler typedef ::mod2::AMI_fwdHandler_ptr _stub_ptr_type; typedef ::mod2::AMI_fwdHandler_var _stub_var_type; - AMI_fwdHandler (const AMI_fwdHandler& rhs); + AMI_fwdHandler (const AMI_fwdHandler& rhs) = default; virtual ~AMI_fwdHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/fwdC.h b/tests/IDL_Test/fwdC.h index 6c5402e..f8d2c0c 100644 --- a/tests/IDL_Test/fwdC.h +++ b/tests/IDL_Test/fwdC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_FWDC_HQTJC3_H_ -#define _TAO_IDL_FWDC_HQTJC3_H_ +#ifndef _TAO_IDL_FWDC_BBBF7L_H_ +#define _TAO_IDL_FWDC_BBBF7L_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/fwdS.cpp b/tests/IDL_Test/fwdS.cpp index 41cab22..54a0f74 100644 --- a/tests/IDL_Test/fwdS.cpp +++ b/tests/IDL_Test/fwdS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_FWDS_DR8FAT_CPP_ -#define _TAO_IDL_FWDS_DR8FAT_CPP_ +#ifndef _TAO_IDL_FWDS_ZDIFK2_CPP_ +#define _TAO_IDL_FWDS_ZDIFK2_CPP_ #include "fwdS.h" @@ -145,15 +145,8 @@ static TAO_mod2_AMH_full_Perfect_Hash_OpTable tao_mod2_AMH_full_optable; POA_mod2::AMH_full::AMH_full () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod2_AMH_full_optable); -} - -POA_mod2::AMH_full::AMH_full (const AMH_full& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_mod2_AMH_full_optable); } @@ -211,7 +204,7 @@ POA_mod2::AMH_full::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -387,15 +380,8 @@ POA_mod2::_TAO_full_Direct_Proxy_Impl::op ( POA_mod2::full::full () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod2_full_optable); -} - -POA_mod2::full::full (const full& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_mod2_full_optable); } @@ -507,7 +493,7 @@ void POA_mod2::full::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -529,7 +515,7 @@ const char* POA_mod2::full::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -542,7 +528,7 @@ void POA_mod2::full::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -754,16 +740,8 @@ POA_mod2::_TAO_AMI_fullHandler_Direct_Proxy_Impl::op_excep ( POA_mod2::AMI_fullHandler::AMI_fullHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod2_AMI_fullHandler_optable); -} - -POA_mod2::AMI_fullHandler::AMI_fullHandler (const AMI_fullHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_mod2_AMI_fullHandler_optable); } @@ -950,7 +928,7 @@ void POA_mod2::AMI_fullHandler::op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -973,7 +951,7 @@ const char* POA_mod2::AMI_fullHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -986,7 +964,7 @@ void POA_mod2::AMI_fullHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1094,20 +1072,14 @@ static TAO_fwd_mixed_intf_AMH_concrete_parent_Perfect_Hash_OpTable tao_fwd_mixed POA_fwd_mixed_intf::AMH_concrete_parent::AMH_concrete_parent () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_fwd_mixed_intf_AMH_concrete_parent_optable); -} - -POA_fwd_mixed_intf::AMH_concrete_parent::AMH_concrete_parent (const AMH_concrete_parent& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_fwd_mixed_intf_AMH_concrete_parent_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1258,20 +1230,14 @@ POA_fwd_mixed_intf::_TAO_concrete_parent_Direct_Proxy_Impl::~_TAO_concrete_paren POA_fwd_mixed_intf::concrete_parent::concrete_parent () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_fwd_mixed_intf_concrete_parent_optable); -} - -POA_fwd_mixed_intf::concrete_parent::concrete_parent (const concrete_parent& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_fwd_mixed_intf_concrete_parent_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1293,7 +1259,7 @@ const char* POA_fwd_mixed_intf::concrete_parent::_interface_repository_id () con // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1306,7 +1272,7 @@ void POA_fwd_mixed_intf::concrete_parent::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1432,21 +1398,14 @@ POA_fwd_mixed_intf::_TAO_AMI_concrete_parentHandler_Direct_Proxy_Impl::~_TAO_AMI POA_fwd_mixed_intf::AMI_concrete_parentHandler::AMI_concrete_parentHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_fwd_mixed_intf_AMI_concrete_parentHandler_optable); -} - -POA_fwd_mixed_intf::AMI_concrete_parentHandler::AMI_concrete_parentHandler (const AMI_concrete_parentHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_fwd_mixed_intf_AMI_concrete_parentHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1469,7 +1428,7 @@ const char* POA_fwd_mixed_intf::AMI_concrete_parentHandler::_interface_repositor // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1482,7 +1441,7 @@ void POA_fwd_mixed_intf::AMI_concrete_parentHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1604,21 +1563,14 @@ POA_fwd_mixed_intf::_TAO_mixed_abs_first_Direct_Proxy_Impl::~_TAO_mixed_abs_firs POA_fwd_mixed_intf::mixed_abs_first::mixed_abs_first () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_fwd_mixed_intf_mixed_abs_first_optable); -} - -POA_fwd_mixed_intf::mixed_abs_first::mixed_abs_first (const mixed_abs_first& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_fwd_mixed_intf::concrete_parent (rhs) -{ + this->optable_ = std::addressof (tao_fwd_mixed_intf_mixed_abs_first_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1643,7 +1595,7 @@ const char* POA_fwd_mixed_intf::mixed_abs_first::_interface_repository_id () con // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1656,7 +1608,7 @@ void POA_fwd_mixed_intf::mixed_abs_first::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1778,22 +1730,14 @@ POA_fwd_mixed_intf::_TAO_AMI_mixed_abs_firstHandler_Direct_Proxy_Impl::~_TAO_AMI POA_fwd_mixed_intf::AMI_mixed_abs_firstHandler::AMI_mixed_abs_firstHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_fwd_mixed_intf_AMI_mixed_abs_firstHandler_optable); -} - -POA_fwd_mixed_intf::AMI_mixed_abs_firstHandler::AMI_mixed_abs_firstHandler (const AMI_mixed_abs_firstHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_fwd_mixed_intf::AMI_concrete_parentHandler (rhs) -{ + this->optable_ = std::addressof (tao_fwd_mixed_intf_AMI_mixed_abs_firstHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1817,7 +1761,7 @@ const char* POA_fwd_mixed_intf::AMI_mixed_abs_firstHandler::_interface_repositor // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1830,7 +1774,7 @@ void POA_fwd_mixed_intf::AMI_mixed_abs_firstHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1952,21 +1896,14 @@ POA_fwd_mixed_intf::_TAO_mixed_conc_first_Direct_Proxy_Impl::~_TAO_mixed_conc_fi POA_fwd_mixed_intf::mixed_conc_first::mixed_conc_first () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_fwd_mixed_intf_mixed_conc_first_optable); -} - -POA_fwd_mixed_intf::mixed_conc_first::mixed_conc_first (const mixed_conc_first& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_fwd_mixed_intf::concrete_parent (rhs) -{ + this->optable_ = std::addressof (tao_fwd_mixed_intf_mixed_conc_first_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1991,7 +1928,7 @@ const char* POA_fwd_mixed_intf::mixed_conc_first::_interface_repository_id () co // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2004,7 +1941,7 @@ void POA_fwd_mixed_intf::mixed_conc_first::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2126,22 +2063,14 @@ POA_fwd_mixed_intf::_TAO_AMI_mixed_conc_firstHandler_Direct_Proxy_Impl::~_TAO_AM POA_fwd_mixed_intf::AMI_mixed_conc_firstHandler::AMI_mixed_conc_firstHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_fwd_mixed_intf_AMI_mixed_conc_firstHandler_optable); -} - -POA_fwd_mixed_intf::AMI_mixed_conc_firstHandler::AMI_mixed_conc_firstHandler (const AMI_mixed_conc_firstHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_fwd_mixed_intf::AMI_concrete_parentHandler (rhs) -{ + this->optable_ = std::addressof (tao_fwd_mixed_intf_AMI_mixed_conc_firstHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2165,7 +2094,7 @@ const char* POA_fwd_mixed_intf::AMI_mixed_conc_firstHandler::_interface_reposito // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2178,7 +2107,7 @@ void POA_fwd_mixed_intf::AMI_mixed_conc_firstHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/fwdS.h b/tests/IDL_Test/fwdS.h index d15a607..8d89804 100644 --- a/tests/IDL_Test/fwdS.h +++ b/tests/IDL_Test/fwdS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_FWDS_DR8FAT_H_ -#define _TAO_IDL_FWDS_DR8FAT_H_ +#ifndef _TAO_IDL_FWDS_ZDIFK2_H_ +#define _TAO_IDL_FWDS_ZDIFK2_H_ #include /**/ "ace/pre.h" @@ -578,7 +578,7 @@ class TAO_IDL_TEST_STUB_Export full typedef ::mod2::full_ptr _stub_ptr_type; typedef ::mod2::full_var _stub_var_type; - full (const full& rhs); + full (const full& rhs) = default; virtual ~full () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -680,7 +680,7 @@ class TAO_IDL_TEST_STUB_Export AMI_fullHandler typedef ::mod2::AMI_fullHandler_ptr _stub_ptr_type; typedef ::mod2::AMI_fullHandler_var _stub_var_type; - AMI_fullHandler (const AMI_fullHandler& rhs); + AMI_fullHandler (const AMI_fullHandler& rhs) = default; virtual ~AMI_fullHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -813,7 +813,7 @@ class TAO_IDL_TEST_STUB_Export concrete_parent typedef ::fwd_mixed_intf::concrete_parent_ptr _stub_ptr_type; typedef ::fwd_mixed_intf::concrete_parent_var _stub_var_type; - concrete_parent (const concrete_parent& rhs); + concrete_parent (const concrete_parent& rhs) = default; virtual ~concrete_parent () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -884,7 +884,7 @@ class TAO_IDL_TEST_STUB_Export AMI_concrete_parentHandler typedef ::fwd_mixed_intf::AMI_concrete_parentHandler_ptr _stub_ptr_type; typedef ::fwd_mixed_intf::AMI_concrete_parentHandler_var _stub_var_type; - AMI_concrete_parentHandler (const AMI_concrete_parentHandler& rhs); + AMI_concrete_parentHandler (const AMI_concrete_parentHandler& rhs) = default; virtual ~AMI_concrete_parentHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -942,7 +942,7 @@ class TAO_IDL_TEST_STUB_Export mixed_abs_first typedef ::fwd_mixed_intf::mixed_abs_first_ptr _stub_ptr_type; typedef ::fwd_mixed_intf::mixed_abs_first_var _stub_var_type; - mixed_abs_first (const mixed_abs_first& rhs); + mixed_abs_first (const mixed_abs_first& rhs) = default; virtual ~mixed_abs_first () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1000,7 +1000,7 @@ class TAO_IDL_TEST_STUB_Export AMI_mixed_abs_firstHandler typedef ::fwd_mixed_intf::AMI_mixed_abs_firstHandler_ptr _stub_ptr_type; typedef ::fwd_mixed_intf::AMI_mixed_abs_firstHandler_var _stub_var_type; - AMI_mixed_abs_firstHandler (const AMI_mixed_abs_firstHandler& rhs); + AMI_mixed_abs_firstHandler (const AMI_mixed_abs_firstHandler& rhs) = default; virtual ~AMI_mixed_abs_firstHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1058,7 +1058,7 @@ class TAO_IDL_TEST_STUB_Export mixed_conc_first typedef ::fwd_mixed_intf::mixed_conc_first_ptr _stub_ptr_type; typedef ::fwd_mixed_intf::mixed_conc_first_var _stub_var_type; - mixed_conc_first (const mixed_conc_first& rhs); + mixed_conc_first (const mixed_conc_first& rhs) = default; virtual ~mixed_conc_first () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1116,7 +1116,7 @@ class TAO_IDL_TEST_STUB_Export AMI_mixed_conc_firstHandler typedef ::fwd_mixed_intf::AMI_mixed_conc_firstHandler_ptr _stub_ptr_type; typedef ::fwd_mixed_intf::AMI_mixed_conc_firstHandler_var _stub_var_type; - AMI_mixed_conc_firstHandler (const AMI_mixed_conc_firstHandler& rhs); + AMI_mixed_conc_firstHandler (const AMI_mixed_conc_firstHandler& rhs) = default; virtual ~AMI_mixed_conc_firstHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/generic_objectA.h b/tests/IDL_Test/generic_objectA.h index 223d540..071a893 100644 --- a/tests/IDL_Test/generic_objectA.h +++ b/tests/IDL_Test/generic_objectA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_GENERIC_OBJECTA_Q4Y3UB_H_ -#define _TAO_IDL_GENERIC_OBJECTA_Q4Y3UB_H_ +#ifndef _TAO_IDL_GENERIC_OBJECTA_PG0CZH_H_ +#define _TAO_IDL_GENERIC_OBJECTA_PG0CZH_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/generic_objectC.h b/tests/IDL_Test/generic_objectC.h index 7c5a201..d8a7a43 100644 --- a/tests/IDL_Test/generic_objectC.h +++ b/tests/IDL_Test/generic_objectC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_GENERIC_OBJECTC_Q4Y3UB_H_ -#define _TAO_IDL_GENERIC_OBJECTC_Q4Y3UB_H_ +#ifndef _TAO_IDL_GENERIC_OBJECTC_LZOK3K_H_ +#define _TAO_IDL_GENERIC_OBJECTC_LZOK3K_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/generic_objectS.cpp b/tests/IDL_Test/generic_objectS.cpp index 15ab55d..96082f3 100644 --- a/tests/IDL_Test/generic_objectS.cpp +++ b/tests/IDL_Test/generic_objectS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_GENERIC_OBJECTS_9RGO9V_CPP_ -#define _TAO_IDL_GENERIC_OBJECTS_9RGO9V_CPP_ +#ifndef _TAO_IDL_GENERIC_OBJECTS_LZOK3K_CPP_ +#define _TAO_IDL_GENERIC_OBJECTS_LZOK3K_CPP_ #include "generic_objectS.h" @@ -145,15 +145,8 @@ static TAO_AMH_generic_Perfect_Hash_OpTable tao_AMH_generic_optable; POA_AMH_generic::POA_AMH_generic () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_generic_optable); -} - -POA_AMH_generic::POA_AMH_generic (const POA_AMH_generic& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_generic_optable); } @@ -211,7 +204,7 @@ POA_AMH_generic::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -387,15 +380,8 @@ _TAO_generic_Direct_Proxy_Impl::op ( POA_generic::POA_generic () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_generic_optable); -} - -POA_generic::POA_generic (const POA_generic& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_generic_optable); } @@ -503,7 +489,7 @@ void POA_generic::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -525,7 +511,7 @@ const char* POA_generic::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -538,7 +524,7 @@ void POA_generic::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -750,16 +736,8 @@ _TAO_AMI_genericHandler_Direct_Proxy_Impl::op_excep ( POA_AMI_genericHandler::POA_AMI_genericHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_genericHandler_optable); -} - -POA_AMI_genericHandler::POA_AMI_genericHandler (const POA_AMI_genericHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_genericHandler_optable); } @@ -938,7 +916,7 @@ void POA_AMI_genericHandler::op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -961,7 +939,7 @@ const char* POA_AMI_genericHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -974,7 +952,7 @@ void POA_AMI_genericHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/generic_objectS.h b/tests/IDL_Test/generic_objectS.h index eba6c21..fdd00a5 100644 --- a/tests/IDL_Test/generic_objectS.h +++ b/tests/IDL_Test/generic_objectS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_GENERIC_OBJECTS_Q4Y3UB_H_ -#define _TAO_IDL_GENERIC_OBJECTS_Q4Y3UB_H_ +#ifndef _TAO_IDL_GENERIC_OBJECTS_LZOK3K_H_ +#define _TAO_IDL_GENERIC_OBJECTS_LZOK3K_H_ #include /**/ "ace/pre.h" @@ -241,7 +241,7 @@ class TAO_IDL_TEST_STUB_Export POA_generic typedef ::generic_ptr _stub_ptr_type; typedef ::generic_var _stub_var_type; - POA_generic (const POA_generic& rhs); + POA_generic (const POA_generic& rhs) = default; virtual ~POA_generic () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -343,7 +343,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_genericHandler typedef ::AMI_genericHandler_ptr _stub_ptr_type; typedef ::AMI_genericHandler_var _stub_var_type; - POA_AMI_genericHandler (const POA_AMI_genericHandler& rhs); + POA_AMI_genericHandler (const POA_AMI_genericHandler& rhs) = default; virtual ~POA_AMI_genericHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/gperfC.h b/tests/IDL_Test/gperfC.h index fa2a3c3..0d24955 100644 --- a/tests/IDL_Test/gperfC.h +++ b/tests/IDL_Test/gperfC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_GPERFC_RRBQKS_H_ -#define _TAO_IDL_GPERFC_RRBQKS_H_ +#ifndef _TAO_IDL_GPERFC_A1J9IJ_H_ +#define _TAO_IDL_GPERFC_A1J9IJ_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/gperfS.cpp b/tests/IDL_Test/gperfS.cpp index 068bc34..2f3fff4 100644 --- a/tests/IDL_Test/gperfS.cpp +++ b/tests/IDL_Test/gperfS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_GPERFS_B9EC5T_CPP_ -#define _TAO_IDL_GPERFS_B9EC5T_CPP_ +#ifndef _TAO_IDL_GPERFS_M3FEDW_CPP_ +#define _TAO_IDL_GPERFS_M3FEDW_CPP_ #include "gperfS.h" @@ -145,15 +145,8 @@ static TAO_AMH_testlistitem_Perfect_Hash_OpTable tao_AMH_testlistitem_optable; POA_AMH_testlistitem::POA_AMH_testlistitem () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_testlistitem_optable); -} - -POA_AMH_testlistitem::POA_AMH_testlistitem (const POA_AMH_testlistitem& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_testlistitem_optable); } @@ -199,7 +192,7 @@ POA_AMH_testlistitem::_get_name_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -372,15 +365,8 @@ _TAO_testlistitem_Direct_Proxy_Impl::_get_name ( POA_testlistitem::POA_testlistitem () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_testlistitem_optable); -} - -POA_testlistitem::POA_testlistitem (const POA_testlistitem& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_testlistitem_optable); } @@ -461,7 +447,7 @@ void POA_testlistitem::_get_name_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -483,7 +469,7 @@ const char* POA_testlistitem::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -496,7 +482,7 @@ void POA_testlistitem::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -702,16 +688,8 @@ _TAO_AMI_testlistitemHandler_Direct_Proxy_Impl::get_name_excep ( POA_AMI_testlistitemHandler::POA_AMI_testlistitemHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_testlistitemHandler_optable); -} - -POA_AMI_testlistitemHandler::POA_AMI_testlistitemHandler (const POA_AMI_testlistitemHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_testlistitemHandler_optable); } @@ -872,7 +850,7 @@ void POA_AMI_testlistitemHandler::get_name_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -895,7 +873,7 @@ const char* POA_AMI_testlistitemHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -908,7 +886,7 @@ void POA_AMI_testlistitemHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1050,15 +1028,8 @@ static TAO_AMH_test_Perfect_Hash_OpTable tao_AMH_test_optable; POA_AMH_test::POA_AMH_test () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_test_optable); -} - -POA_AMH_test::POA_AMH_test (const POA_AMH_test& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_test_optable); } @@ -1736,7 +1707,7 @@ POA_AMH_test::new_testlistitem_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2252,15 +2223,8 @@ _TAO_test_Direct_Proxy_Impl::new_testlistitem ( POA_test::POA_test () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_test_optable); -} - -POA_test::POA_test (const POA_test& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_test_optable); } @@ -3407,7 +3371,7 @@ void POA_test::new_testlistitem_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3429,7 +3393,7 @@ const char* POA_test::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3442,7 +3406,7 @@ void POA_test::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4801,16 +4765,8 @@ _TAO_AMI_testHandler_Direct_Proxy_Impl::new_testlistitem_excep ( POA_AMI_testHandler::POA_AMI_testHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_testHandler_optable); -} - -POA_AMI_testHandler::POA_AMI_testHandler (const POA_AMI_testHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_testHandler_optable); } @@ -7008,7 +6964,7 @@ void POA_AMI_testHandler::new_testlistitem_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7031,7 +6987,7 @@ const char* POA_AMI_testHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -7044,7 +7000,7 @@ void POA_AMI_testHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -7190,15 +7146,8 @@ static TAO_AMH_Simple_Server_Perfect_Hash_OpTable tao_AMH_Simple_Server_optable; POA_AMH_Simple_Server::POA_AMH_Simple_Server () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_Simple_Server_optable); -} - -POA_AMH_Simple_Server::POA_AMH_Simple_Server (const POA_AMH_Simple_Server& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_Simple_Server_optable); } @@ -7907,7 +7856,7 @@ POA_AMH_Simple_Server::transferTriggerTdc_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -8474,15 +8423,8 @@ _TAO_Simple_Server_Direct_Proxy_Impl::transferTriggerTdc ( POA_Simple_Server::POA_Simple_Server () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Simple_Server_optable); -} - -POA_Simple_Server::POA_Simple_Server (const POA_Simple_Server& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Simple_Server_optable); } @@ -9569,7 +9511,7 @@ void POA_Simple_Server::transferTriggerTdc_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -9591,7 +9533,7 @@ const char* POA_Simple_Server::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -9604,7 +9546,7 @@ void POA_Simple_Server::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -10216,21 +10158,14 @@ _TAO_AMI_Simple_ServerHandler_Direct_Proxy_Impl::~_TAO_AMI_Simple_ServerHandler_ POA_AMI_Simple_ServerHandler::POA_AMI_Simple_ServerHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_Simple_ServerHandler_optable); -} - -POA_AMI_Simple_ServerHandler::POA_AMI_Simple_ServerHandler (const POA_AMI_Simple_ServerHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_Simple_ServerHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -10253,7 +10188,7 @@ const char* POA_AMI_Simple_ServerHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -10266,7 +10201,7 @@ void POA_AMI_Simple_ServerHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/gperfS.h b/tests/IDL_Test/gperfS.h index 0138003..3db7fc5 100644 --- a/tests/IDL_Test/gperfS.h +++ b/tests/IDL_Test/gperfS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_GPERFS_OBHD71_H_ -#define _TAO_IDL_GPERFS_OBHD71_H_ +#ifndef _TAO_IDL_GPERFS_FNYFQH_H_ +#define _TAO_IDL_GPERFS_FNYFQH_H_ #include /**/ "ace/pre.h" @@ -343,7 +343,7 @@ class TAO_IDL_TEST_STUB_Export POA_testlistitem typedef ::testlistitem_ptr _stub_ptr_type; typedef ::testlistitem_var _stub_var_type; - POA_testlistitem (const POA_testlistitem& rhs); + POA_testlistitem (const POA_testlistitem& rhs) = default; virtual ~POA_testlistitem () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -440,7 +440,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_testlistitemHandler typedef ::AMI_testlistitemHandler_ptr _stub_ptr_type; typedef ::AMI_testlistitemHandler_var _stub_var_type; - POA_AMI_testlistitemHandler (const POA_AMI_testlistitemHandler& rhs); + POA_AMI_testlistitemHandler (const POA_AMI_testlistitemHandler& rhs) = default; virtual ~POA_AMI_testlistitemHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -747,7 +747,7 @@ class TAO_IDL_TEST_STUB_Export POA_test typedef ::test_ptr _stub_ptr_type; typedef ::test_var _stub_var_type; - POA_test (const POA_test& rhs); + POA_test (const POA_test& rhs) = default; virtual ~POA_test () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1209,7 +1209,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_testHandler typedef ::AMI_testHandler_ptr _stub_ptr_type; typedef ::AMI_testHandler_var _stub_var_type; - POA_AMI_testHandler (const POA_AMI_testHandler& rhs); + POA_AMI_testHandler (const POA_AMI_testHandler& rhs) = default; virtual ~POA_AMI_testHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2013,7 +2013,7 @@ class TAO_IDL_TEST_STUB_Export POA_Simple_Server typedef ::Simple_Server_ptr _stub_ptr_type; typedef ::Simple_Server_var _stub_var_type; - POA_Simple_Server (const POA_Simple_Server& rhs); + POA_Simple_Server (const POA_Simple_Server& rhs) = default; virtual ~POA_Simple_Server () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2534,7 +2534,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_Simple_ServerHandler typedef ::AMI_Simple_ServerHandler_ptr _stub_ptr_type; typedef ::AMI_Simple_ServerHandler_var _stub_var_type; - POA_AMI_Simple_ServerHandler (const POA_AMI_Simple_ServerHandler& rhs); + POA_AMI_Simple_ServerHandler (const POA_AMI_Simple_ServerHandler& rhs) = default; virtual ~POA_AMI_Simple_ServerHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/includedC.h b/tests/IDL_Test/includedC.h index 6fbfae3..d047d6c 100644 --- a/tests/IDL_Test/includedC.h +++ b/tests/IDL_Test/includedC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_INCLUDEDC_UW8LE0_H_ -#define _TAO_IDL_INCLUDEDC_UW8LE0_H_ +#ifndef _TAO_IDL_INCLUDEDC_HP8UDG_H_ +#define _TAO_IDL_INCLUDEDC_HP8UDG_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/includedS.cpp b/tests/IDL_Test/includedS.cpp index 831d4e1..0ec0fa0 100644 --- a/tests/IDL_Test/includedS.cpp +++ b/tests/IDL_Test/includedS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_INCLUDEDS_OIEJKF_CPP_ -#define _TAO_IDL_INCLUDEDS_OIEJKF_CPP_ +#ifndef _TAO_IDL_INCLUDEDS_BAFOYA_CPP_ +#define _TAO_IDL_INCLUDEDS_BAFOYA_CPP_ #include "includedS.h" @@ -143,22 +143,15 @@ static TAO_RootModule_SUBMODULE1_AMH_ParentIF_Perfect_Hash_OpTable tao_RootModul POA_RootModule::SUBMODULE1::AMH_ParentIF::AMH_ParentIF () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_RootModule_SUBMODULE1_AMH_ParentIF_optable); -} - -POA_RootModule::SUBMODULE1::AMH_ParentIF::AMH_ParentIF (const AMH_ParentIF& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_RootModule_SUBMODULE1_AMH_ParentIF_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -307,22 +300,15 @@ POA_RootModule::SUBMODULE1::_TAO_ParentIF_Direct_Proxy_Impl::~_TAO_ParentIF_Dire POA_RootModule::SUBMODULE1::ParentIF::ParentIF () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_RootModule_SUBMODULE1_ParentIF_optable); -} - -POA_RootModule::SUBMODULE1::ParentIF::ParentIF (const ParentIF& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_RootModule_SUBMODULE1_ParentIF_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -344,7 +330,7 @@ const char* POA_RootModule::SUBMODULE1::ParentIF::_interface_repository_id () co // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -357,7 +343,7 @@ void POA_RootModule::SUBMODULE1::ParentIF::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -483,21 +469,14 @@ POA_RootModule::SUBMODULE1::_TAO_AMI_ParentIFHandler_Direct_Proxy_Impl::~_TAO_AM POA_RootModule::SUBMODULE1::AMI_ParentIFHandler::AMI_ParentIFHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_RootModule_SUBMODULE1_AMI_ParentIFHandler_optable); -} - -POA_RootModule::SUBMODULE1::AMI_ParentIFHandler::AMI_ParentIFHandler (const AMI_ParentIFHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_RootModule_SUBMODULE1_AMI_ParentIFHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -520,7 +499,7 @@ const char* POA_RootModule::SUBMODULE1::AMI_ParentIFHandler::_interface_reposito // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -533,7 +512,7 @@ void POA_RootModule::SUBMODULE1::AMI_ParentIFHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -639,22 +618,15 @@ static TAO_AMH_AAA_Perfect_Hash_OpTable tao_AMH_AAA_optable; POA_AMH_AAA::POA_AMH_AAA () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_AAA_optable); -} - -POA_AMH_AAA::POA_AMH_AAA (const POA_AMH_AAA& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_AAA_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -803,22 +775,15 @@ _TAO_AAA_Direct_Proxy_Impl::~_TAO_AAA_Direct_Proxy_Impl () POA_AAA::POA_AAA () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AAA_optable); -} - -POA_AAA::POA_AAA (const POA_AAA& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AAA_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -840,7 +805,7 @@ const char* POA_AAA::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -853,7 +818,7 @@ void POA_AAA::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -979,21 +944,14 @@ _TAO_AMI_AAAHandler_Direct_Proxy_Impl::~_TAO_AMI_AAAHandler_Direct_Proxy_Impl () POA_AMI_AAAHandler::POA_AMI_AAAHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_AAAHandler_optable); -} - -POA_AMI_AAAHandler::POA_AMI_AAAHandler (const POA_AMI_AAAHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_AAAHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1016,7 +974,7 @@ const char* POA_AMI_AAAHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1029,7 +987,7 @@ void POA_AMI_AAAHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/includedS.h b/tests/IDL_Test/includedS.h index 5504d1e..dd232a9 100644 --- a/tests/IDL_Test/includedS.h +++ b/tests/IDL_Test/includedS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_INCLUDEDS_25VSNJ_H_ -#define _TAO_IDL_INCLUDEDS_25VSNJ_H_ +#ifndef _TAO_IDL_INCLUDEDS_BAFOYA_H_ +#define _TAO_IDL_INCLUDEDS_BAFOYA_H_ #include /**/ "ace/pre.h" @@ -417,7 +417,7 @@ namespace POA_RootModule typedef ::RootModule::SUBMODULE1::ParentIF_ptr _stub_ptr_type; typedef ::RootModule::SUBMODULE1::ParentIF_var _stub_var_type; - ParentIF (const ParentIF& rhs); + ParentIF (const ParentIF& rhs) = default; virtual ~ParentIF () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -488,7 +488,7 @@ namespace POA_RootModule typedef ::RootModule::SUBMODULE1::AMI_ParentIFHandler_ptr _stub_ptr_type; typedef ::RootModule::SUBMODULE1::AMI_ParentIFHandler_var _stub_var_type; - AMI_ParentIFHandler (const AMI_ParentIFHandler& rhs); + AMI_ParentIFHandler (const AMI_ParentIFHandler& rhs) = default; virtual ~AMI_ParentIFHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -585,7 +585,7 @@ class TAO_IDL_TEST_STUB_Export POA_AAA typedef ::AAA_ptr _stub_ptr_type; typedef ::AAA_var _stub_var_type; - POA_AAA (const POA_AAA& rhs); + POA_AAA (const POA_AAA& rhs) = default; virtual ~POA_AAA () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -656,7 +656,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_AAAHandler typedef ::AMI_AAAHandler_ptr _stub_ptr_type; typedef ::AMI_AAAHandler_var _stub_var_type; - POA_AMI_AAAHandler (const POA_AMI_AAAHandler& rhs); + POA_AMI_AAAHandler (const POA_AMI_AAAHandler& rhs) = default; virtual ~POA_AMI_AAAHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/includingC.h b/tests/IDL_Test/includingC.h index 489da1d..83a3c24 100644 --- a/tests/IDL_Test/includingC.h +++ b/tests/IDL_Test/includingC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_INCLUDINGC_LTJXCI_H_ -#define _TAO_IDL_INCLUDINGC_LTJXCI_H_ +#ifndef _TAO_IDL_INCLUDINGC_ZXAKLL_H_ +#define _TAO_IDL_INCLUDINGC_ZXAKLL_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/includingS.cpp b/tests/IDL_Test/includingS.cpp index adde3aa..e713c05 100644 --- a/tests/IDL_Test/includingS.cpp +++ b/tests/IDL_Test/includingS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_INCLUDINGS_TMPMDY_CPP_ -#define _TAO_IDL_INCLUDINGS_TMPMDY_CPP_ +#ifndef _TAO_IDL_INCLUDINGS_QUVPDI_CPP_ +#define _TAO_IDL_INCLUDINGS_QUVPDI_CPP_ #include "includingS.h" @@ -143,22 +143,15 @@ static TAO_AMH_iface_Perfect_Hash_OpTable tao_AMH_iface_optable; POA_AMH_iface::POA_AMH_iface () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_iface_optable); -} - -POA_AMH_iface::POA_AMH_iface (const POA_AMH_iface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_iface_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -307,22 +300,15 @@ _TAO_iface_Direct_Proxy_Impl::~_TAO_iface_Direct_Proxy_Impl () POA_iface::POA_iface () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_iface_optable); -} - -POA_iface::POA_iface (const POA_iface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_iface_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -344,7 +330,7 @@ const char* POA_iface::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -357,7 +343,7 @@ void POA_iface::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -483,21 +469,14 @@ _TAO_AMI_ifaceHandler_Direct_Proxy_Impl::~_TAO_AMI_ifaceHandler_Direct_Proxy_Imp POA_AMI_ifaceHandler::POA_AMI_ifaceHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_ifaceHandler_optable); -} - -POA_AMI_ifaceHandler::POA_AMI_ifaceHandler (const POA_AMI_ifaceHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_ifaceHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -520,7 +499,7 @@ const char* POA_AMI_ifaceHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -533,7 +512,7 @@ void POA_AMI_ifaceHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -641,15 +620,8 @@ static TAO_AMH_MyInt_Perfect_Hash_OpTable tao_AMH_MyInt_optable; POA_AMH_MyInt::POA_AMH_MyInt () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_MyInt_optable); -} - -POA_AMH_MyInt::POA_AMH_MyInt (const POA_AMH_MyInt& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_MyInt_optable); } @@ -704,7 +676,7 @@ POA_AMH_MyInt::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -878,15 +850,8 @@ _TAO_MyInt_Direct_Proxy_Impl::op ( POA_MyInt::POA_MyInt () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_MyInt_optable); -} - -POA_MyInt::POA_MyInt (const POA_MyInt& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_MyInt_optable); } @@ -976,7 +941,7 @@ void POA_MyInt::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -998,7 +963,7 @@ const char* POA_MyInt::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1011,7 +976,7 @@ void POA_MyInt::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1217,16 +1182,8 @@ _TAO_AMI_MyIntHandler_Direct_Proxy_Impl::op_excep ( POA_AMI_MyIntHandler::POA_AMI_MyIntHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_MyIntHandler_optable); -} - -POA_AMI_MyIntHandler::POA_AMI_MyIntHandler (const POA_AMI_MyIntHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_MyIntHandler_optable); } @@ -1387,7 +1344,7 @@ void POA_AMI_MyIntHandler::op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1410,7 +1367,7 @@ const char* POA_AMI_MyIntHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1423,7 +1380,7 @@ void POA_AMI_MyIntHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1529,23 +1486,15 @@ static TAO_RootModule_SUBMODULE1_AMH_ChildIF_Perfect_Hash_OpTable tao_RootModule POA_RootModule::SUBMODULE1::AMH_ChildIF::AMH_ChildIF () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_RootModule_SUBMODULE1_AMH_ChildIF_optable); -} - -POA_RootModule::SUBMODULE1::AMH_ChildIF::AMH_ChildIF (const AMH_ChildIF& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_RootModule::SUBMODULE1::AMH_ParentIF (rhs) { + this->optable_ = std::addressof (tao_RootModule_SUBMODULE1_AMH_ChildIF_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1695,23 +1644,15 @@ POA_RootModule::SUBMODULE1::_TAO_ChildIF_Direct_Proxy_Impl::~_TAO_ChildIF_Direct POA_RootModule::SUBMODULE1::ChildIF::ChildIF () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_RootModule_SUBMODULE1_ChildIF_optable); -} - -POA_RootModule::SUBMODULE1::ChildIF::ChildIF (const ChildIF& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_RootModule::SUBMODULE1::ParentIF (rhs) { + this->optable_ = std::addressof (tao_RootModule_SUBMODULE1_ChildIF_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1734,7 +1675,7 @@ const char* POA_RootModule::SUBMODULE1::ChildIF::_interface_repository_id () con // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1747,7 +1688,7 @@ void POA_RootModule::SUBMODULE1::ChildIF::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1873,22 +1814,14 @@ POA_RootModule::SUBMODULE1::_TAO_AMI_ChildIFHandler_Direct_Proxy_Impl::~_TAO_AMI POA_RootModule::SUBMODULE1::AMI_ChildIFHandler::AMI_ChildIFHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_RootModule_SUBMODULE1_AMI_ChildIFHandler_optable); -} - -POA_RootModule::SUBMODULE1::AMI_ChildIFHandler::AMI_ChildIFHandler (const AMI_ChildIFHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_RootModule::SUBMODULE1::AMI_ParentIFHandler (rhs) -{ + this->optable_ = std::addressof (tao_RootModule_SUBMODULE1_AMI_ChildIFHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1912,7 +1845,7 @@ const char* POA_RootModule::SUBMODULE1::AMI_ChildIFHandler::_interface_repositor // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1925,7 +1858,7 @@ void POA_RootModule::SUBMODULE1::AMI_ChildIFHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2031,22 +1964,15 @@ static TAO_AMH_B_Perfect_Hash_OpTable tao_AMH_B_optable; POA_AMH_B::POA_AMH_B () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_B_optable); -} - -POA_AMH_B::POA_AMH_B (const POA_AMH_B& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_B_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2195,22 +2121,15 @@ _TAO_B_Direct_Proxy_Impl::~_TAO_B_Direct_Proxy_Impl () POA_B::POA_B () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_B_optable); -} - -POA_B::POA_B (const POA_B& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_B_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2232,7 +2151,7 @@ const char* POA_B::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2245,7 +2164,7 @@ void POA_B::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2371,21 +2290,14 @@ _TAO_AMI_BHandler_Direct_Proxy_Impl::~_TAO_AMI_BHandler_Direct_Proxy_Impl () POA_AMI_BHandler::POA_AMI_BHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_BHandler_optable); -} - -POA_AMI_BHandler::POA_AMI_BHandler (const POA_AMI_BHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_BHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2408,7 +2320,7 @@ const char* POA_AMI_BHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2421,7 +2333,7 @@ void POA_AMI_BHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/includingS.h b/tests/IDL_Test/includingS.h index 4843de5..7ac02bc 100644 --- a/tests/IDL_Test/includingS.h +++ b/tests/IDL_Test/includingS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_INCLUDINGS_TMPMDY_H_ -#define _TAO_IDL_INCLUDINGS_TMPMDY_H_ +#ifndef _TAO_IDL_INCLUDINGS_QBLUFH_H_ +#define _TAO_IDL_INCLUDINGS_QBLUFH_H_ #include /**/ "ace/pre.h" @@ -503,7 +503,7 @@ class TAO_IDL_TEST_STUB_Export POA_iface typedef ::iface_ptr _stub_ptr_type; typedef ::iface_var _stub_var_type; - POA_iface (const POA_iface& rhs); + POA_iface (const POA_iface& rhs) = default; virtual ~POA_iface () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -574,7 +574,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_ifaceHandler typedef ::AMI_ifaceHandler_ptr _stub_ptr_type; typedef ::AMI_ifaceHandler_var _stub_var_type; - POA_AMI_ifaceHandler (const POA_AMI_ifaceHandler& rhs); + POA_AMI_ifaceHandler (const POA_AMI_ifaceHandler& rhs) = default; virtual ~POA_AMI_ifaceHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -696,7 +696,7 @@ class TAO_IDL_TEST_STUB_Export POA_MyInt typedef ::MyInt_ptr _stub_ptr_type; typedef ::MyInt_var _stub_var_type; - POA_MyInt (const POA_MyInt& rhs); + POA_MyInt (const POA_MyInt& rhs) = default; virtual ~POA_MyInt () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -794,7 +794,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_MyIntHandler typedef ::AMI_MyIntHandler_ptr _stub_ptr_type; typedef ::AMI_MyIntHandler_var _stub_var_type; - POA_AMI_MyIntHandler (const POA_AMI_MyIntHandler& rhs); + POA_AMI_MyIntHandler (const POA_AMI_MyIntHandler& rhs) = default; virtual ~POA_AMI_MyIntHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -926,7 +926,7 @@ namespace POA_RootModule typedef ::RootModule::SUBMODULE1::ChildIF_ptr _stub_ptr_type; typedef ::RootModule::SUBMODULE1::ChildIF_var _stub_var_type; - ChildIF (const ChildIF& rhs); + ChildIF (const ChildIF& rhs) = default; virtual ~ChildIF () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -998,7 +998,7 @@ namespace POA_RootModule typedef ::RootModule::SUBMODULE1::AMI_ChildIFHandler_ptr _stub_ptr_type; typedef ::RootModule::SUBMODULE1::AMI_ChildIFHandler_var _stub_var_type; - AMI_ChildIFHandler (const AMI_ChildIFHandler& rhs); + AMI_ChildIFHandler (const AMI_ChildIFHandler& rhs) = default; virtual ~AMI_ChildIFHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1095,7 +1095,7 @@ class TAO_IDL_TEST_STUB_Export POA_B typedef ::B_ptr _stub_ptr_type; typedef ::B_var _stub_var_type; - POA_B (const POA_B& rhs); + POA_B (const POA_B& rhs) = default; virtual ~POA_B () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1166,7 +1166,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_BHandler typedef ::AMI_BHandler_ptr _stub_ptr_type; typedef ::AMI_BHandler_var _stub_var_type; - POA_AMI_BHandler (const POA_AMI_BHandler& rhs); + POA_AMI_BHandler (const POA_AMI_BHandler& rhs) = default; virtual ~POA_AMI_BHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/inheritA.h b/tests/IDL_Test/inheritA.h index bd72f6b..3d7b337 100644 --- a/tests/IDL_Test/inheritA.h +++ b/tests/IDL_Test/inheritA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_INHERITA_ZI8PAJ_H_ -#define _TAO_IDL_INHERITA_ZI8PAJ_H_ +#ifndef _TAO_IDL_INHERITA_JOK5PT_H_ +#define _TAO_IDL_INHERITA_JOK5PT_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/inheritC.h b/tests/IDL_Test/inheritC.h index 36f48d2..a8c7486 100644 --- a/tests/IDL_Test/inheritC.h +++ b/tests/IDL_Test/inheritC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_INHERITC_ZI8PAJ_H_ -#define _TAO_IDL_INHERITC_ZI8PAJ_H_ +#ifndef _TAO_IDL_INHERITC_JOK5PT_H_ +#define _TAO_IDL_INHERITC_JOK5PT_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/inheritS.cpp b/tests/IDL_Test/inheritS.cpp index ea3fe69..6dc196f 100644 --- a/tests/IDL_Test/inheritS.cpp +++ b/tests/IDL_Test/inheritS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_INHERITS_ZC9XBC_CPP_ -#define _TAO_IDL_INHERITS_ZC9XBC_CPP_ +#ifndef _TAO_IDL_INHERITS_RESWIB_CPP_ +#define _TAO_IDL_INHERITS_RESWIB_CPP_ #include "inheritS.h" @@ -144,15 +144,8 @@ static TAO_OldInherit_AMH_one_Perfect_Hash_OpTable tao_OldInherit_AMH_one_optabl POA_OldInherit::AMH_one::AMH_one () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMH_one_optable); -} - -POA_OldInherit::AMH_one::AMH_one (const AMH_one& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMH_one_optable); } @@ -198,7 +191,7 @@ POA_OldInherit::AMH_one::op_one_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -369,15 +362,8 @@ POA_OldInherit::_TAO_one_Direct_Proxy_Impl::op_one ( POA_OldInherit::one::one () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_one_optable); -} - -POA_OldInherit::one::one (const one& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldInherit_one_optable); } @@ -448,7 +434,7 @@ void POA_OldInherit::one::op_one_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -470,7 +456,7 @@ const char* POA_OldInherit::one::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -483,7 +469,7 @@ void POA_OldInherit::one::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -678,16 +664,8 @@ POA_OldInherit::_TAO_AMI_oneHandler_Direct_Proxy_Impl::op_one_excep ( POA_OldInherit::AMI_oneHandler::AMI_oneHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMI_oneHandler_optable); -} - -POA_OldInherit::AMI_oneHandler::AMI_oneHandler (const AMI_oneHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMI_oneHandler_optable); } @@ -839,7 +817,7 @@ void POA_OldInherit::AMI_oneHandler::op_one_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -862,7 +840,7 @@ const char* POA_OldInherit::AMI_oneHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -875,7 +853,7 @@ void POA_OldInherit::AMI_oneHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -983,16 +961,8 @@ static TAO_OldInherit_AMH_two_Perfect_Hash_OpTable tao_OldInherit_AMH_two_optabl POA_OldInherit::AMH_two::AMH_two () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMH_two_optable); -} - -POA_OldInherit::AMH_two::AMH_two (const AMH_two& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldInherit::AMH_one (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMH_two_optable); } @@ -1038,7 +1008,7 @@ POA_OldInherit::AMH_two::op_two_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1211,16 +1181,8 @@ POA_OldInherit::_TAO_two_Direct_Proxy_Impl::op_two ( POA_OldInherit::two::two () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_two_optable); -} - -POA_OldInherit::two::two (const two& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldInherit::one (rhs) { + this->optable_ = std::addressof (tao_OldInherit_two_optable); } @@ -1291,7 +1253,7 @@ void POA_OldInherit::two::op_two_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1314,7 +1276,7 @@ const char* POA_OldInherit::two::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1327,7 +1289,7 @@ void POA_OldInherit::two::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1546,17 +1508,8 @@ POA_OldInherit::_TAO_AMI_twoHandler_Direct_Proxy_Impl::op_two_excep ( POA_OldInherit::AMI_twoHandler::AMI_twoHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMI_twoHandler_optable); -} - -POA_OldInherit::AMI_twoHandler::AMI_twoHandler (const AMI_twoHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_OldInherit::AMI_oneHandler (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMI_twoHandler_optable); } @@ -1708,7 +1661,7 @@ void POA_OldInherit::AMI_twoHandler::op_two_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1732,7 +1685,7 @@ const char* POA_OldInherit::AMI_twoHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1745,7 +1698,7 @@ void POA_OldInherit::AMI_twoHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1855,16 +1808,8 @@ static TAO_OldInherit_AMH_three_Perfect_Hash_OpTable tao_OldInherit_AMH_three_op POA_OldInherit::AMH_three::AMH_three () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMH_three_optable); -} - -POA_OldInherit::AMH_three::AMH_three (const AMH_three& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldInherit::AMH_one (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMH_three_optable); } @@ -1910,7 +1855,7 @@ POA_OldInherit::AMH_three::op_three_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2085,16 +2030,8 @@ POA_OldInherit::_TAO_three_Direct_Proxy_Impl::op_three ( POA_OldInherit::three::three () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_three_optable); -} - -POA_OldInherit::three::three (const three& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldInherit::one (rhs) { + this->optable_ = std::addressof (tao_OldInherit_three_optable); } @@ -2165,7 +2102,7 @@ void POA_OldInherit::three::op_three_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2188,7 +2125,7 @@ const char* POA_OldInherit::three::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2201,7 +2138,7 @@ void POA_OldInherit::three::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2402,17 +2339,8 @@ POA_OldInherit::_TAO_AMI_threeHandler_Direct_Proxy_Impl::op_three_excep ( POA_OldInherit::AMI_threeHandler::AMI_threeHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMI_threeHandler_optable); -} - -POA_OldInherit::AMI_threeHandler::AMI_threeHandler (const AMI_threeHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_OldInherit::AMI_oneHandler (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMI_threeHandler_optable); } @@ -2564,7 +2492,7 @@ void POA_OldInherit::AMI_threeHandler::op_three_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2588,7 +2516,7 @@ const char* POA_OldInherit::AMI_threeHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2601,7 +2529,7 @@ void POA_OldInherit::AMI_threeHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2713,18 +2641,8 @@ static TAO_OldInherit_AMH_four_Perfect_Hash_OpTable tao_OldInherit_AMH_four_opta POA_OldInherit::AMH_four::AMH_four () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMH_four_optable); -} - -POA_OldInherit::AMH_four::AMH_four (const AMH_four& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldInherit::AMH_one (rhs), - POA_OldInherit::AMH_two (rhs), - POA_OldInherit::AMH_three (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMH_four_optable); } @@ -2770,7 +2688,7 @@ POA_OldInherit::AMH_four::op_four_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2949,18 +2867,8 @@ POA_OldInherit::_TAO_four_Direct_Proxy_Impl::op_four ( POA_OldInherit::four::four () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_four_optable); -} - -POA_OldInherit::four::four (const four& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldInherit::one (rhs), - POA_OldInherit::two (rhs), - POA_OldInherit::three (rhs) { + this->optable_ = std::addressof (tao_OldInherit_four_optable); } @@ -3031,7 +2939,7 @@ void POA_OldInherit::four::op_four_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3056,7 +2964,7 @@ const char* POA_OldInherit::four::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3069,7 +2977,7 @@ void POA_OldInherit::four::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3293,19 +3201,8 @@ POA_OldInherit::_TAO_AMI_fourHandler_Direct_Proxy_Impl::op_four_excep ( POA_OldInherit::AMI_fourHandler::AMI_fourHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMI_fourHandler_optable); -} - -POA_OldInherit::AMI_fourHandler::AMI_fourHandler (const AMI_fourHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_OldInherit::AMI_oneHandler (rhs), - POA_OldInherit::AMI_twoHandler (rhs), - POA_OldInherit::AMI_threeHandler (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMI_fourHandler_optable); } @@ -3457,7 +3354,7 @@ void POA_OldInherit::AMI_fourHandler::op_four_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3483,7 +3380,7 @@ const char* POA_OldInherit::AMI_fourHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3496,7 +3393,7 @@ void POA_OldInherit::AMI_fourHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3608,19 +3505,8 @@ static TAO_OldInherit_AMH_five_Perfect_Hash_OpTable tao_OldInherit_AMH_five_opta POA_OldInherit::AMH_five::AMH_five () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMH_five_optable); -} - -POA_OldInherit::AMH_five::AMH_five (const AMH_five& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldInherit::AMH_one (rhs), - POA_OldInherit::AMH_two (rhs), - POA_OldInherit::AMH_three (rhs), - POA_OldInherit::AMH_four (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMH_five_optable); } @@ -3666,7 +3552,7 @@ POA_OldInherit::AMH_five::op_five_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3846,19 +3732,8 @@ POA_OldInherit::_TAO_five_Direct_Proxy_Impl::op_five ( POA_OldInherit::five::five () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_five_optable); -} - -POA_OldInherit::five::five (const five& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldInherit::one (rhs), - POA_OldInherit::two (rhs), - POA_OldInherit::three (rhs), - POA_OldInherit::four (rhs) { + this->optable_ = std::addressof (tao_OldInherit_five_optable); } @@ -3929,7 +3804,7 @@ void POA_OldInherit::five::op_five_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3955,7 +3830,7 @@ const char* POA_OldInherit::five::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3968,7 +3843,7 @@ void POA_OldInherit::five::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4194,20 +4069,8 @@ POA_OldInherit::_TAO_AMI_fiveHandler_Direct_Proxy_Impl::op_five_excep ( POA_OldInherit::AMI_fiveHandler::AMI_fiveHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldInherit_AMI_fiveHandler_optable); -} - -POA_OldInherit::AMI_fiveHandler::AMI_fiveHandler (const AMI_fiveHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_OldInherit::AMI_oneHandler (rhs), - POA_OldInherit::AMI_twoHandler (rhs), - POA_OldInherit::AMI_threeHandler (rhs), - POA_OldInherit::AMI_fourHandler (rhs) { + this->optable_ = std::addressof (tao_OldInherit_AMI_fiveHandler_optable); } @@ -4359,7 +4222,7 @@ void POA_OldInherit::AMI_fiveHandler::op_five_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4386,7 +4249,7 @@ const char* POA_OldInherit::AMI_fiveHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4399,7 +4262,7 @@ void POA_OldInherit::AMI_fiveHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/inheritS.h b/tests/IDL_Test/inheritS.h index ba43fc1..cab7310 100644 --- a/tests/IDL_Test/inheritS.h +++ b/tests/IDL_Test/inheritS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_INHERITS_ZC9XBC_H_ -#define _TAO_IDL_INHERITS_ZC9XBC_H_ +#ifndef _TAO_IDL_INHERITS_QADOXZ_H_ +#define _TAO_IDL_INHERITS_QADOXZ_H_ #include /**/ "ace/pre.h" @@ -453,7 +453,7 @@ class TAO_IDL_TEST_STUB_Export one typedef ::OldInherit::one_ptr _stub_ptr_type; typedef ::OldInherit::one_var _stub_var_type; - one (const one& rhs); + one (const one& rhs) = default; virtual ~one () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -549,7 +549,7 @@ class TAO_IDL_TEST_STUB_Export AMI_oneHandler typedef ::OldInherit::AMI_oneHandler_ptr _stub_ptr_type; typedef ::OldInherit::AMI_oneHandler_var _stub_var_type; - AMI_oneHandler (const AMI_oneHandler& rhs); + AMI_oneHandler (const AMI_oneHandler& rhs) = default; virtual ~AMI_oneHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -680,7 +680,7 @@ class TAO_IDL_TEST_STUB_Export two typedef ::OldInherit::two_ptr _stub_ptr_type; typedef ::OldInherit::two_var _stub_var_type; - two (const two& rhs); + two (const two& rhs) = default; virtual ~two () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -777,7 +777,7 @@ class TAO_IDL_TEST_STUB_Export AMI_twoHandler typedef ::OldInherit::AMI_twoHandler_ptr _stub_ptr_type; typedef ::OldInherit::AMI_twoHandler_var _stub_var_type; - AMI_twoHandler (const AMI_twoHandler& rhs); + AMI_twoHandler (const AMI_twoHandler& rhs) = default; virtual ~AMI_twoHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -908,7 +908,7 @@ class TAO_IDL_TEST_STUB_Export three typedef ::OldInherit::three_ptr _stub_ptr_type; typedef ::OldInherit::three_var _stub_var_type; - three (const three& rhs); + three (const three& rhs) = default; virtual ~three () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1005,7 +1005,7 @@ class TAO_IDL_TEST_STUB_Export AMI_threeHandler typedef ::OldInherit::AMI_threeHandler_ptr _stub_ptr_type; typedef ::OldInherit::AMI_threeHandler_var _stub_var_type; - AMI_threeHandler (const AMI_threeHandler& rhs); + AMI_threeHandler (const AMI_threeHandler& rhs) = default; virtual ~AMI_threeHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1138,7 +1138,7 @@ class TAO_IDL_TEST_STUB_Export four typedef ::OldInherit::four_ptr _stub_ptr_type; typedef ::OldInherit::four_var _stub_var_type; - four (const four& rhs); + four (const four& rhs) = default; virtual ~four () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1237,7 +1237,7 @@ class TAO_IDL_TEST_STUB_Export AMI_fourHandler typedef ::OldInherit::AMI_fourHandler_ptr _stub_ptr_type; typedef ::OldInherit::AMI_fourHandler_var _stub_var_type; - AMI_fourHandler (const AMI_fourHandler& rhs); + AMI_fourHandler (const AMI_fourHandler& rhs) = default; virtual ~AMI_fourHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1373,7 +1373,7 @@ class TAO_IDL_TEST_STUB_Export five typedef ::OldInherit::five_ptr _stub_ptr_type; typedef ::OldInherit::five_var _stub_var_type; - five (const five& rhs); + five (const five& rhs) = default; virtual ~five () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1474,7 +1474,7 @@ class TAO_IDL_TEST_STUB_Export AMI_fiveHandler typedef ::OldInherit::AMI_fiveHandler_ptr _stub_ptr_type; typedef ::OldInherit::AMI_fiveHandler_var _stub_var_type; - AMI_fiveHandler (const AMI_fiveHandler& rhs); + AMI_fiveHandler (const AMI_fiveHandler& rhs) = default; virtual ~AMI_fiveHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/interfaceC.h b/tests/IDL_Test/interfaceC.h index 2dd7b74..21252fe 100644 --- a/tests/IDL_Test/interfaceC.h +++ b/tests/IDL_Test/interfaceC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_INTERFACEC_5FWUWZ_H_ -#define _TAO_IDL_INTERFACEC_5FWUWZ_H_ +#ifndef _TAO_IDL_INTERFACEC_MVHRVN_H_ +#define _TAO_IDL_INTERFACEC_MVHRVN_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/interfaceS.cpp b/tests/IDL_Test/interfaceS.cpp index f1f3f78..33b6aa0 100644 --- a/tests/IDL_Test/interfaceS.cpp +++ b/tests/IDL_Test/interfaceS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_INTERFACES_4683AV_CPP_ -#define _TAO_IDL_INTERFACES_4683AV_CPP_ +#ifndef _TAO_IDL_INTERFACES_MZCWIC_CPP_ +#define _TAO_IDL_INTERFACES_MZCWIC_CPP_ #include "interfaceS.h" @@ -166,15 +166,8 @@ static TAO_AMH_Base_Perfect_Hash_OpTable tao_AMH_Base_optable; POA_AMH_Base::POA_AMH_Base () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_Base_optable); -} - -POA_AMH_Base::POA_AMH_Base (const POA_AMH_Base& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_Base_optable); } @@ -270,7 +263,7 @@ POA_AMH_Base::_set_value_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -486,15 +479,8 @@ _TAO_Base_Direct_Proxy_Impl::_set_value ( POA_Base::POA_Base () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Base_optable); -} - -POA_Base::POA_Base (const POA_Base& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Base_optable); } @@ -652,7 +638,7 @@ void POA_Base::_set_value_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -674,7 +660,7 @@ const char* POA_Base::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -687,7 +673,7 @@ void POA_Base::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -965,16 +951,8 @@ _TAO_AMI_BaseHandler_Direct_Proxy_Impl::set_value_excep ( POA_AMI_BaseHandler::POA_AMI_BaseHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_BaseHandler_optable); -} - -POA_AMI_BaseHandler::POA_AMI_BaseHandler (const POA_AMI_BaseHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_BaseHandler_optable); } @@ -1272,7 +1250,7 @@ void POA_AMI_BaseHandler::set_value_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1295,7 +1273,7 @@ const char* POA_AMI_BaseHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1308,7 +1286,7 @@ void POA_AMI_BaseHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1439,21 +1417,14 @@ static TAO_AMH_Derived_Perfect_Hash_OpTable tao_AMH_Derived_optable; POA_AMH_Derived::POA_AMH_Derived () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_Derived_optable); -} - -POA_AMH_Derived::POA_AMH_Derived (const POA_AMH_Derived& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_AMH_Base (rhs) -{ + this->optable_ = std::addressof (tao_AMH_Derived_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1628,21 +1599,14 @@ _TAO_Derived_Direct_Proxy_Impl::~_TAO_Derived_Direct_Proxy_Impl () POA_Derived::POA_Derived () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Derived_optable); -} - -POA_Derived::POA_Derived (const POA_Derived& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_Base (rhs) -{ + this->optable_ = std::addressof (tao_Derived_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1665,7 +1629,7 @@ const char* POA_Derived::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1678,7 +1642,7 @@ void POA_Derived::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1810,22 +1774,14 @@ _TAO_AMI_DerivedHandler_Direct_Proxy_Impl::~_TAO_AMI_DerivedHandler_Direct_Proxy POA_AMI_DerivedHandler::POA_AMI_DerivedHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_DerivedHandler_optable); -} - -POA_AMI_DerivedHandler::POA_AMI_DerivedHandler (const POA_AMI_DerivedHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_AMI_BaseHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_DerivedHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1849,7 +1805,7 @@ const char* POA_AMI_DerivedHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1862,7 +1818,7 @@ void POA_AMI_DerivedHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1969,15 +1925,8 @@ static TAO_AMH_foostep_Perfect_Hash_OpTable tao_AMH_foostep_optable; POA_AMH_foostep::POA_AMH_foostep () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_foostep_optable); -} - -POA_AMH_foostep::POA_AMH_foostep (const POA_AMH_foostep& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_foostep_optable); } @@ -2023,7 +1972,7 @@ POA_AMH_foostep::getDate_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2195,15 +2144,8 @@ _TAO_foostep_Direct_Proxy_Impl::getDate ( POA_foostep::POA_foostep () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_foostep_optable); -} - -POA_foostep::POA_foostep (const POA_foostep& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_foostep_optable); } @@ -2284,7 +2226,7 @@ void POA_foostep::getDate_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2306,7 +2248,7 @@ const char* POA_foostep::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2319,7 +2261,7 @@ void POA_foostep::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2524,16 +2466,8 @@ _TAO_AMI_foostepHandler_Direct_Proxy_Impl::getDate_excep ( POA_AMI_foostepHandler::POA_AMI_foostepHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_foostepHandler_optable); -} - -POA_AMI_foostepHandler::POA_AMI_foostepHandler (const POA_AMI_foostepHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_foostepHandler_optable); } @@ -2694,7 +2628,7 @@ void POA_AMI_foostepHandler::getDate_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2717,7 +2651,7 @@ const char* POA_AMI_foostepHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2730,7 +2664,7 @@ void POA_AMI_foostepHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2836,22 +2770,15 @@ static TAO_AMH_mother_Perfect_Hash_OpTable tao_AMH_mother_optable; POA_AMH_mother::POA_AMH_mother () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_mother_optable); -} - -POA_AMH_mother::POA_AMH_mother (const POA_AMH_mother& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_mother_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3000,22 +2927,15 @@ _TAO_mother_Direct_Proxy_Impl::~_TAO_mother_Direct_Proxy_Impl () POA_mother::POA_mother () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mother_optable); -} - -POA_mother::POA_mother (const POA_mother& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_mother_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3037,7 +2957,7 @@ const char* POA_mother::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3050,7 +2970,7 @@ void POA_mother::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3176,21 +3096,14 @@ _TAO_AMI_motherHandler_Direct_Proxy_Impl::~_TAO_AMI_motherHandler_Direct_Proxy_I POA_AMI_motherHandler::POA_AMI_motherHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_motherHandler_optable); -} - -POA_AMI_motherHandler::POA_AMI_motherHandler (const POA_AMI_motherHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_motherHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3213,7 +3126,7 @@ const char* POA_AMI_motherHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3226,7 +3139,7 @@ void POA_AMI_motherHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3332,22 +3245,15 @@ static TAO_AMH_father_Perfect_Hash_OpTable tao_AMH_father_optable; POA_AMH_father::POA_AMH_father () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_father_optable); -} - -POA_AMH_father::POA_AMH_father (const POA_AMH_father& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_father_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3496,22 +3402,15 @@ _TAO_father_Direct_Proxy_Impl::~_TAO_father_Direct_Proxy_Impl () POA_father::POA_father () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_father_optable); -} - -POA_father::POA_father (const POA_father& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_father_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3533,7 +3432,7 @@ const char* POA_father::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3546,7 +3445,7 @@ void POA_father::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3672,21 +3571,14 @@ _TAO_AMI_fatherHandler_Direct_Proxy_Impl::~_TAO_AMI_fatherHandler_Direct_Proxy_I POA_AMI_fatherHandler::POA_AMI_fatherHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_fatherHandler_optable); -} - -POA_AMI_fatherHandler::POA_AMI_fatherHandler (const POA_AMI_fatherHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_fatherHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3709,7 +3601,7 @@ const char* POA_AMI_fatherHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3722,7 +3614,7 @@ void POA_AMI_fatherHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3830,22 +3722,14 @@ static TAO_AMH_child_Perfect_Hash_OpTable tao_AMH_child_optable; POA_AMH_child::POA_AMH_child () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_child_optable); -} - -POA_AMH_child::POA_AMH_child (const POA_AMH_child& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_AMH_mother (rhs), - POA_AMH_father (rhs) -{ + this->optable_ = std::addressof (tao_AMH_child_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3998,22 +3882,14 @@ _TAO_child_Direct_Proxy_Impl::~_TAO_child_Direct_Proxy_Impl () POA_child::POA_child () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_child_optable); -} - -POA_child::POA_child (const POA_child& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_mother (rhs), - POA_father (rhs) -{ + this->optable_ = std::addressof (tao_child_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4037,7 +3913,7 @@ const char* POA_child::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4050,7 +3926,7 @@ void POA_child::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4176,23 +4052,14 @@ _TAO_AMI_childHandler_Direct_Proxy_Impl::~_TAO_AMI_childHandler_Direct_Proxy_Imp POA_AMI_childHandler::POA_AMI_childHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_childHandler_optable); -} - -POA_AMI_childHandler::POA_AMI_childHandler (const POA_AMI_childHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_AMI_motherHandler (rhs), - POA_AMI_fatherHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_childHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4217,7 +4084,7 @@ const char* POA_AMI_childHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4230,7 +4097,7 @@ void POA_AMI_childHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4338,20 +4205,14 @@ static TAO_AMH_try_Perfect_Hash_OpTable tao_AMH_try_optable; POA_AMH__cxx_try::POA_AMH__cxx_try () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_try_optable); -} - -POA_AMH__cxx_try::POA_AMH__cxx_try (const POA_AMH__cxx_try& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_AMH_try_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4502,20 +4363,14 @@ _TAO__cxx_try_Direct_Proxy_Impl::~_TAO__cxx_try_Direct_Proxy_Impl () POA__cxx_try::POA__cxx_try () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_try_optable); -} - -POA__cxx_try::POA__cxx_try (const POA__cxx_try& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_try_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4537,7 +4392,7 @@ const char* POA__cxx_try::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4550,7 +4405,7 @@ void POA__cxx_try::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4676,21 +4531,14 @@ _TAO_AMI__cxx_tryHandler_Direct_Proxy_Impl::~_TAO_AMI__cxx_tryHandler_Direct_Pro POA_AMI__cxx_tryHandler::POA_AMI__cxx_tryHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI__cxx_tryHandler_optable); -} - -POA_AMI__cxx_tryHandler::POA_AMI__cxx_tryHandler (const POA_AMI__cxx_tryHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI__cxx_tryHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4713,7 +4561,7 @@ const char* POA_AMI__cxx_tryHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4726,7 +4574,7 @@ void POA_AMI__cxx_tryHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4835,15 +4683,8 @@ static TAO_AMH_later_user_Perfect_Hash_OpTable tao_AMH_later_user_optable; POA_AMH_later_user::POA_AMH_later_user () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_later_user_optable); -} - -POA_AMH_later_user::POA_AMH_later_user (const POA_AMH_later_user& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_later_user_optable); } @@ -4949,7 +4790,7 @@ POA_AMH_later_user::op2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -5148,15 +4989,8 @@ _TAO_later_user_Direct_Proxy_Impl::op2 ( POA_later_user::POA_later_user () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_later_user_optable); -} - -POA_later_user::POA_later_user (const POA_later_user& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_later_user_optable); } @@ -5341,7 +5175,7 @@ void POA_later_user::op2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -5363,7 +5197,7 @@ const char* POA_later_user::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -5376,7 +5210,7 @@ void POA_later_user::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -5659,16 +5493,8 @@ _TAO_AMI_later_userHandler_Direct_Proxy_Impl::op2_excep ( POA_AMI_later_userHandler::POA_AMI_later_userHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_later_userHandler_optable); -} - -POA_AMI_later_userHandler::POA_AMI_later_userHandler (const POA_AMI_later_userHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_later_userHandler_optable); } @@ -5984,7 +5810,7 @@ void POA_AMI_later_userHandler::op2_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6007,7 +5833,7 @@ const char* POA_AMI_later_userHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -6020,7 +5846,7 @@ void POA_AMI_later_userHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -6128,20 +5954,14 @@ static TAO_AMH_later_Perfect_Hash_OpTable tao_AMH_later_optable; POA_AMH_later::POA_AMH_later () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_later_optable); -} - -POA_AMH_later::POA_AMH_later (const POA_AMH_later& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_AMH_later_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6292,20 +6112,14 @@ _TAO_later_Direct_Proxy_Impl::~_TAO_later_Direct_Proxy_Impl () POA_later::POA_later () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_later_optable); -} - -POA_later::POA_later (const POA_later& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_later_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6327,7 +6141,7 @@ const char* POA_later::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -6340,7 +6154,7 @@ void POA_later::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -6466,21 +6280,14 @@ _TAO_AMI_laterHandler_Direct_Proxy_Impl::~_TAO_AMI_laterHandler_Direct_Proxy_Imp POA_AMI_laterHandler::POA_AMI_laterHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_laterHandler_optable); -} - -POA_AMI_laterHandler::POA_AMI_laterHandler (const POA_AMI_laterHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_laterHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6503,7 +6310,7 @@ const char* POA_AMI_laterHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -6516,7 +6323,7 @@ void POA_AMI_laterHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -6622,22 +6429,15 @@ static TAO_AMH_Begin_Perfect_Hash_OpTable tao_AMH_Begin_optable; POA_AMH_Begin::POA_AMH_Begin () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_Begin_optable); -} - -POA_AMH_Begin::POA_AMH_Begin (const POA_AMH_Begin& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_Begin_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6786,22 +6586,15 @@ _TAO_Begin_Direct_Proxy_Impl::~_TAO_Begin_Direct_Proxy_Impl () POA_Begin::POA_Begin () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Begin_optable); -} - -POA_Begin::POA_Begin (const POA_Begin& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Begin_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6823,7 +6616,7 @@ const char* POA_Begin::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -6836,7 +6629,7 @@ void POA_Begin::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -6962,21 +6755,14 @@ _TAO_AMI_BeginHandler_Direct_Proxy_Impl::~_TAO_AMI_BeginHandler_Direct_Proxy_Imp POA_AMI_BeginHandler::POA_AMI_BeginHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_BeginHandler_optable); -} - -POA_AMI_BeginHandler::POA_AMI_BeginHandler (const POA_AMI_BeginHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_BeginHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6999,7 +6785,7 @@ const char* POA_AMI_BeginHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -7012,7 +6798,7 @@ void POA_AMI_BeginHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -7120,21 +6906,14 @@ static TAO_AMH_Middle_Perfect_Hash_OpTable tao_AMH_Middle_optable; POA_AMH_Middle::POA_AMH_Middle () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_Middle_optable); -} - -POA_AMH_Middle::POA_AMH_Middle (const POA_AMH_Middle& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_AMH_Begin (rhs) -{ + this->optable_ = std::addressof (tao_AMH_Middle_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7286,21 +7065,14 @@ _TAO_Middle_Direct_Proxy_Impl::~_TAO_Middle_Direct_Proxy_Impl () POA_Middle::POA_Middle () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Middle_optable); -} - -POA_Middle::POA_Middle (const POA_Middle& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_Begin (rhs) -{ + this->optable_ = std::addressof (tao_Middle_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7323,7 +7095,7 @@ const char* POA_Middle::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -7336,7 +7108,7 @@ void POA_Middle::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -7462,22 +7234,14 @@ _TAO_AMI_MiddleHandler_Direct_Proxy_Impl::~_TAO_AMI_MiddleHandler_Direct_Proxy_I POA_AMI_MiddleHandler::POA_AMI_MiddleHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_MiddleHandler_optable); -} - -POA_AMI_MiddleHandler::POA_AMI_MiddleHandler (const POA_AMI_MiddleHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_AMI_BeginHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_MiddleHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7501,7 +7265,7 @@ const char* POA_AMI_MiddleHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -7514,7 +7278,7 @@ void POA_AMI_MiddleHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -7622,22 +7386,14 @@ static TAO_AMH_End_Perfect_Hash_OpTable tao_AMH_End_optable; POA_AMH_End::POA_AMH_End () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_End_optable); -} - -POA_AMH_End::POA_AMH_End (const POA_AMH_End& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_AMH_Begin (rhs), - POA_AMH_Middle (rhs) -{ + this->optable_ = std::addressof (tao_AMH_End_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7790,22 +7546,14 @@ _TAO_End_Direct_Proxy_Impl::~_TAO_End_Direct_Proxy_Impl () POA_End::POA_End () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_End_optable); -} - -POA_End::POA_End (const POA_End& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_Begin (rhs), - POA_Middle (rhs) -{ + this->optable_ = std::addressof (tao_End_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7829,7 +7577,7 @@ const char* POA_End::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -7842,7 +7590,7 @@ void POA_End::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -7968,23 +7716,14 @@ _TAO_AMI_EndHandler_Direct_Proxy_Impl::~_TAO_AMI_EndHandler_Direct_Proxy_Impl () POA_AMI_EndHandler::POA_AMI_EndHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_EndHandler_optable); -} - -POA_AMI_EndHandler::POA_AMI_EndHandler (const POA_AMI_EndHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_AMI_BeginHandler (rhs), - POA_AMI_MiddleHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_EndHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -8009,7 +7748,7 @@ const char* POA_AMI_EndHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -8022,7 +7761,7 @@ void POA_AMI_EndHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -8151,15 +7890,8 @@ static TAO_AMH_Client_Perfect_Hash_OpTable tao_AMH_Client_optable; POA_AMH_Client::POA_AMH_Client () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_Client_optable); -} - -POA_AMH_Client::POA_AMH_Client (const POA_AMH_Client& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_Client_optable); } @@ -8255,7 +7987,7 @@ POA_AMH_Client::_set_v_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -8471,15 +8203,8 @@ _TAO_Client_Direct_Proxy_Impl::_set_v ( POA_Client::POA_Client () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Client_optable); -} - -POA_Client::POA_Client (const POA_Client& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Client_optable); } @@ -8637,7 +8362,7 @@ void POA_Client::_set_v_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -8659,7 +8384,7 @@ const char* POA_Client::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -8672,7 +8397,7 @@ void POA_Client::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -8950,16 +8675,8 @@ _TAO_AMI_ClientHandler_Direct_Proxy_Impl::set_v_excep ( POA_AMI_ClientHandler::POA_AMI_ClientHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_ClientHandler_optable); -} - -POA_AMI_ClientHandler::POA_AMI_ClientHandler (const POA_AMI_ClientHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_ClientHandler_optable); } @@ -9257,7 +8974,7 @@ void POA_AMI_ClientHandler::set_v_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -9280,7 +8997,7 @@ const char* POA_AMI_ClientHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -9293,7 +9010,7 @@ void POA_AMI_ClientHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -9424,15 +9141,8 @@ static TAO_AMH_AttributeTester_Perfect_Hash_OpTable tao_AMH_AttributeTester_opta POA_AMH_AttributeTester::POA_AMH_AttributeTester () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_AttributeTester_optable); -} - -POA_AMH_AttributeTester::POA_AMH_AttributeTester (const POA_AMH_AttributeTester& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_AttributeTester_optable); } @@ -9620,7 +9330,7 @@ POA_AMH_AttributeTester::_set_a_sb_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -9882,15 +9592,8 @@ _TAO_AttributeTester_Direct_Proxy_Impl::_set_a_sb ( POA_AttributeTester::POA_AttributeTester () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AttributeTester_optable); -} - -POA_AttributeTester::POA_AttributeTester (const POA_AttributeTester& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AttributeTester_optable); } @@ -10199,7 +9902,7 @@ void POA_AttributeTester::_set_a_sb_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -10221,7 +9924,7 @@ const char* POA_AttributeTester::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -10234,7 +9937,7 @@ void POA_AttributeTester::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -10684,16 +10387,8 @@ _TAO_AMI_AttributeTesterHandler_Direct_Proxy_Impl::set_a_sb_excep ( POA_AMI_AttributeTesterHandler::POA_AMI_AttributeTesterHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_AttributeTesterHandler_optable); -} - -POA_AMI_AttributeTesterHandler::POA_AMI_AttributeTesterHandler (const POA_AMI_AttributeTesterHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_AttributeTesterHandler_optable); } @@ -11282,7 +10977,7 @@ void POA_AMI_AttributeTesterHandler::set_a_sb_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -11305,7 +11000,7 @@ const char* POA_AMI_AttributeTesterHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -11318,7 +11013,7 @@ void POA_AMI_AttributeTesterHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -11426,15 +11121,8 @@ static TAO_ParamMod_AMH_ParameterTester_Perfect_Hash_OpTable tao_ParamMod_AMH_Pa POA_ParamMod::AMH_ParameterTester::AMH_ParameterTester () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_ParamMod_AMH_ParameterTester_optable); -} - -POA_ParamMod::AMH_ParameterTester::AMH_ParameterTester (const AMH_ParameterTester& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_ParamMod_AMH_ParameterTester_optable); } @@ -11495,7 +11183,7 @@ POA_ParamMod::AMH_ParameterTester::parameter_tester_op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -11671,15 +11359,8 @@ POA_ParamMod::_TAO_ParameterTester_Direct_Proxy_Impl::parameter_tester_op ( POA_ParamMod::ParameterTester::ParameterTester () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_ParamMod_ParameterTester_optable); -} - -POA_ParamMod::ParameterTester::ParameterTester (const ParameterTester& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_ParamMod_ParameterTester_optable); } @@ -11800,7 +11481,7 @@ void POA_ParamMod::ParameterTester::parameter_tester_op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -11822,7 +11503,7 @@ const char* POA_ParamMod::ParameterTester::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -11835,7 +11516,7 @@ void POA_ParamMod::ParameterTester::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -12047,16 +11728,8 @@ POA_ParamMod::_TAO_AMI_ParameterTesterHandler_Direct_Proxy_Impl::parameter_teste POA_ParamMod::AMI_ParameterTesterHandler::AMI_ParameterTesterHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_ParamMod_AMI_ParameterTesterHandler_optable); -} - -POA_ParamMod::AMI_ParameterTesterHandler::AMI_ParameterTesterHandler (const AMI_ParameterTesterHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_ParamMod_AMI_ParameterTesterHandler_optable); } @@ -12280,7 +11953,7 @@ void POA_ParamMod::AMI_ParameterTesterHandler::parameter_tester_op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -12303,7 +11976,7 @@ const char* POA_ParamMod::AMI_ParameterTesterHandler::_interface_repository_id ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -12316,7 +11989,7 @@ void POA_ParamMod::AMI_ParameterTesterHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -12422,22 +12095,15 @@ static TAO_AMH_A_Perfect_Hash_OpTable tao_AMH_A_optable; POA_AMH_A::POA_AMH_A () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_A_optable); -} - -POA_AMH_A::POA_AMH_A (const POA_AMH_A& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_A_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -12586,22 +12252,15 @@ _TAO_A_Direct_Proxy_Impl::~_TAO_A_Direct_Proxy_Impl () POA_A::POA_A () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_optable); -} - -POA_A::POA_A (const POA_A& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_A_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -12623,7 +12282,7 @@ const char* POA_A::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -12636,7 +12295,7 @@ void POA_A::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -12762,21 +12421,14 @@ _TAO_AMI_AHandler_Direct_Proxy_Impl::~_TAO_AMI_AHandler_Direct_Proxy_Impl () POA_AMI_AHandler::POA_AMI_AHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_AHandler_optable); -} - -POA_AMI_AHandler::POA_AMI_AHandler (const POA_AMI_AHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_AHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -12799,7 +12451,7 @@ const char* POA_AMI_AHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -12812,7 +12464,7 @@ void POA_AMI_AHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -12920,20 +12572,14 @@ static TAO_M_AMH_A_Perfect_Hash_OpTable tao_M_AMH_A_optable; POA_M::AMH_A::AMH_A () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_M_AMH_A_optable); -} - -POA_M::AMH_A::AMH_A (const AMH_A& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_M_AMH_A_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -13084,20 +12730,14 @@ POA_M::_TAO_A_Direct_Proxy_Impl::~_TAO_A_Direct_Proxy_Impl () POA_M::A::A () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_M_A_optable); -} - -POA_M::A::A (const A& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_M_A_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -13119,7 +12759,7 @@ const char* POA_M::A::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -13132,7 +12772,7 @@ void POA_M::A::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -13258,21 +12898,14 @@ POA_M::_TAO_AMI_AHandler_Direct_Proxy_Impl::~_TAO_AMI_AHandler_Direct_Proxy_Impl POA_M::AMI_AHandler::AMI_AHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_M_AMI_AHandler_optable); -} - -POA_M::AMI_AHandler::AMI_AHandler (const AMI_AHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_M_AMI_AHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -13295,7 +12928,7 @@ const char* POA_M::AMI_AHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -13308,7 +12941,7 @@ void POA_M::AMI_AHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -13415,15 +13048,8 @@ static TAO_i1_AMH_if1_Perfect_Hash_OpTable tao_i1_AMH_if1_optable; POA_i1::AMH_if1::AMH_if1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_i1_AMH_if1_optable); -} - -POA_i1::AMH_if1::AMH_if1 (const AMH_if1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_i1_AMH_if1_optable); } @@ -13469,7 +13095,7 @@ POA_i1::AMH_if1::getStr_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -13641,15 +13267,8 @@ POA_i1::_TAO_if1_Direct_Proxy_Impl::getStr ( POA_i1::if1::if1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_i1_if1_optable); -} - -POA_i1::if1::if1 (const if1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_i1_if1_optable); } @@ -13734,7 +13353,7 @@ void POA_i1::if1::getStr_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -13756,7 +13375,7 @@ const char* POA_i1::if1::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -13769,7 +13388,7 @@ void POA_i1::if1::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -13973,16 +13592,8 @@ POA_i1::_TAO_AMI_if1Handler_Direct_Proxy_Impl::getStr_excep ( POA_i1::AMI_if1Handler::AMI_if1Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_i1_AMI_if1Handler_optable); -} - -POA_i1::AMI_if1Handler::AMI_if1Handler (const AMI_if1Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_i1_AMI_if1Handler_optable); } @@ -14151,7 +13762,7 @@ void POA_i1::AMI_if1Handler::getStr_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -14174,7 +13785,7 @@ const char* POA_i1::AMI_if1Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -14187,7 +13798,7 @@ void POA_i1::AMI_if1Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -14295,16 +13906,8 @@ static TAO_i2_AMH_if2_Perfect_Hash_OpTable tao_i2_AMH_if2_optable; POA_i2::AMH_if2::AMH_if2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_i2_AMH_if2_optable); -} - -POA_i2::AMH_if2::AMH_if2 (const AMH_if2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_i1::AMH_if1 (rhs) { + this->optable_ = std::addressof (tao_i2_AMH_if2_optable); } @@ -14350,7 +13953,7 @@ POA_i2::AMH_if2::getstr2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -14524,16 +14127,8 @@ POA_i2::_TAO_if2_Direct_Proxy_Impl::getstr2 ( POA_i2::if2::if2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_i2_if2_optable); -} - -POA_i2::if2::if2 (const if2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_i1::if1 (rhs) { + this->optable_ = std::addressof (tao_i2_if2_optable); } @@ -14618,7 +14213,7 @@ void POA_i2::if2::getstr2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -14641,7 +14236,7 @@ const char* POA_i2::if2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -14654,7 +14249,7 @@ void POA_i2::if2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -14861,17 +14456,8 @@ POA_i2::_TAO_AMI_if2Handler_Direct_Proxy_Impl::getstr2_excep ( POA_i2::AMI_if2Handler::AMI_if2Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_i2_AMI_if2Handler_optable); -} - -POA_i2::AMI_if2Handler::AMI_if2Handler (const AMI_if2Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_i1::AMI_if1Handler (rhs) { + this->optable_ = std::addressof (tao_i2_AMI_if2Handler_optable); } @@ -15040,7 +14626,7 @@ void POA_i2::AMI_if2Handler::getstr2_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -15064,7 +14650,7 @@ const char* POA_i2::AMI_if2Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -15077,7 +14663,7 @@ void POA_i2::AMI_if2Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -15186,17 +14772,8 @@ static TAO_i2_AMH_if3_Perfect_Hash_OpTable tao_i2_AMH_if3_optable; POA_i2::AMH_if3::AMH_if3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_i2_AMH_if3_optable); -} - -POA_i2::AMH_if3::AMH_if3 (const AMH_if3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_i1::AMH_if1 (rhs), - POA_i2::AMH_if2 (rhs) { + this->optable_ = std::addressof (tao_i2_AMH_if3_optable); } @@ -15242,7 +14819,7 @@ POA_i2::AMH_if3::getstr3_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -15418,17 +14995,8 @@ POA_i2::_TAO_if3_Direct_Proxy_Impl::getstr3 ( POA_i2::if3::if3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_i2_if3_optable); -} - -POA_i2::if3::if3 (const if3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_i1::if1 (rhs), - POA_i2::if2 (rhs) { + this->optable_ = std::addressof (tao_i2_if3_optable); } @@ -15513,7 +15081,7 @@ void POA_i2::if3::getstr3_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -15537,7 +15105,7 @@ const char* POA_i2::if3::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -15550,7 +15118,7 @@ void POA_i2::if3::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -15779,18 +15347,8 @@ POA_i2::_TAO_AMI_if3Handler_Direct_Proxy_Impl::getstr3_excep ( POA_i2::AMI_if3Handler::AMI_if3Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_i2_AMI_if3Handler_optable); -} - -POA_i2::AMI_if3Handler::AMI_if3Handler (const AMI_if3Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_i1::AMI_if1Handler (rhs), - POA_i2::AMI_if2Handler (rhs) { + this->optable_ = std::addressof (tao_i2_AMI_if3Handler_optable); } @@ -15959,7 +15517,7 @@ void POA_i2::AMI_if3Handler::getstr3_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -15984,7 +15542,7 @@ const char* POA_i2::AMI_if3Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -15997,7 +15555,7 @@ void POA_i2::AMI_if3Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -16103,22 +15661,15 @@ static TAO_redefs_AMH_base_Perfect_Hash_OpTable tao_redefs_AMH_base_optable; POA_redefs::AMH_base::AMH_base () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_redefs_AMH_base_optable); -} - -POA_redefs::AMH_base::AMH_base (const AMH_base& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_redefs_AMH_base_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16267,22 +15818,15 @@ POA_redefs::_TAO_base_Direct_Proxy_Impl::~_TAO_base_Direct_Proxy_Impl () POA_redefs::base::base () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_redefs_base_optable); -} - -POA_redefs::base::base (const base& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_redefs_base_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16304,7 +15848,7 @@ const char* POA_redefs::base::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -16317,7 +15861,7 @@ void POA_redefs::base::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -16443,21 +15987,14 @@ POA_redefs::_TAO_AMI_baseHandler_Direct_Proxy_Impl::~_TAO_AMI_baseHandler_Direct POA_redefs::AMI_baseHandler::AMI_baseHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_redefs_AMI_baseHandler_optable); -} - -POA_redefs::AMI_baseHandler::AMI_baseHandler (const AMI_baseHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_redefs_AMI_baseHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16480,7 +16017,7 @@ const char* POA_redefs::AMI_baseHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -16493,7 +16030,7 @@ void POA_redefs::AMI_baseHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -16599,23 +16136,15 @@ static TAO_redefs_AMH_derived_Perfect_Hash_OpTable tao_redefs_AMH_derived_optabl POA_redefs::AMH_derived::AMH_derived () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_redefs_AMH_derived_optable); -} - -POA_redefs::AMH_derived::AMH_derived (const AMH_derived& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_redefs::AMH_base (rhs) { + this->optable_ = std::addressof (tao_redefs_AMH_derived_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16765,23 +16294,15 @@ POA_redefs::_TAO_derived_Direct_Proxy_Impl::~_TAO_derived_Direct_Proxy_Impl () POA_redefs::derived::derived () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_redefs_derived_optable); -} - -POA_redefs::derived::derived (const derived& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_redefs::base (rhs) { + this->optable_ = std::addressof (tao_redefs_derived_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16804,7 +16325,7 @@ const char* POA_redefs::derived::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -16817,7 +16338,7 @@ void POA_redefs::derived::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -16943,22 +16464,14 @@ POA_redefs::_TAO_AMI_derivedHandler_Direct_Proxy_Impl::~_TAO_AMI_derivedHandler_ POA_redefs::AMI_derivedHandler::AMI_derivedHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_redefs_AMI_derivedHandler_optable); -} - -POA_redefs::AMI_derivedHandler::AMI_derivedHandler (const AMI_derivedHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_redefs::AMI_baseHandler (rhs) -{ + this->optable_ = std::addressof (tao_redefs_AMI_derivedHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16982,7 +16495,7 @@ const char* POA_redefs::AMI_derivedHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -16995,7 +16508,7 @@ void POA_redefs::AMI_derivedHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -17101,22 +16614,15 @@ static TAO_Rec_Arg_Traits_AMH_base_Perfect_Hash_OpTable tao_Rec_Arg_Traits_AMH_b POA_Rec_Arg_Traits::AMH_base::AMH_base () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Rec_Arg_Traits_AMH_base_optable); -} - -POA_Rec_Arg_Traits::AMH_base::AMH_base (const AMH_base& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Rec_Arg_Traits_AMH_base_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17265,22 +16771,15 @@ POA_Rec_Arg_Traits::_TAO_base_Direct_Proxy_Impl::~_TAO_base_Direct_Proxy_Impl () POA_Rec_Arg_Traits::base::base () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Rec_Arg_Traits_base_optable); -} - -POA_Rec_Arg_Traits::base::base (const base& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Rec_Arg_Traits_base_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17302,7 +16801,7 @@ const char* POA_Rec_Arg_Traits::base::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -17315,7 +16814,7 @@ void POA_Rec_Arg_Traits::base::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -17441,21 +16940,14 @@ POA_Rec_Arg_Traits::_TAO_AMI_baseHandler_Direct_Proxy_Impl::~_TAO_AMI_baseHandle POA_Rec_Arg_Traits::AMI_baseHandler::AMI_baseHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Rec_Arg_Traits_AMI_baseHandler_optable); -} - -POA_Rec_Arg_Traits::AMI_baseHandler::AMI_baseHandler (const AMI_baseHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_Rec_Arg_Traits_AMI_baseHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17478,7 +16970,7 @@ const char* POA_Rec_Arg_Traits::AMI_baseHandler::_interface_repository_id () con // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -17491,7 +16983,7 @@ void POA_Rec_Arg_Traits::AMI_baseHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -17598,16 +17090,8 @@ static TAO_Rec_Arg_Traits_AMH_derived_Perfect_Hash_OpTable tao_Rec_Arg_Traits_AM POA_Rec_Arg_Traits::AMH_derived::AMH_derived () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Rec_Arg_Traits_AMH_derived_optable); -} - -POA_Rec_Arg_Traits::AMH_derived::AMH_derived (const AMH_derived& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_Rec_Arg_Traits::AMH_base (rhs) { + this->optable_ = std::addressof (tao_Rec_Arg_Traits_AMH_derived_optable); } @@ -17662,7 +17146,7 @@ POA_Rec_Arg_Traits::AMH_derived::remove_task_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17835,16 +17319,8 @@ POA_Rec_Arg_Traits::_TAO_derived_Direct_Proxy_Impl::remove_task ( POA_Rec_Arg_Traits::derived::derived () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Rec_Arg_Traits_derived_optable); -} - -POA_Rec_Arg_Traits::derived::derived (const derived& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_Rec_Arg_Traits::base (rhs) { + this->optable_ = std::addressof (tao_Rec_Arg_Traits_derived_optable); } @@ -17932,7 +17408,7 @@ void POA_Rec_Arg_Traits::derived::remove_task_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17955,7 +17431,7 @@ const char* POA_Rec_Arg_Traits::derived::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -17968,7 +17444,7 @@ void POA_Rec_Arg_Traits::derived::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -18165,17 +17641,8 @@ POA_Rec_Arg_Traits::_TAO_AMI_derivedHandler_Direct_Proxy_Impl::remove_task_excep POA_Rec_Arg_Traits::AMI_derivedHandler::AMI_derivedHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Rec_Arg_Traits_AMI_derivedHandler_optable); -} - -POA_Rec_Arg_Traits::AMI_derivedHandler::AMI_derivedHandler (const AMI_derivedHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_Rec_Arg_Traits::AMI_baseHandler (rhs) { + this->optable_ = std::addressof (tao_Rec_Arg_Traits_AMI_derivedHandler_optable); } @@ -18327,7 +17794,7 @@ void POA_Rec_Arg_Traits::AMI_derivedHandler::remove_task_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -18351,7 +17818,7 @@ const char* POA_Rec_Arg_Traits::AMI_derivedHandler::_interface_repository_id () // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -18364,7 +17831,7 @@ void POA_Rec_Arg_Traits::AMI_derivedHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -18472,15 +17939,8 @@ static TAO_call_test_AMH_iTest_Perfect_Hash_OpTable tao_call_test_AMH_iTest_opta POA_call_test::AMH_iTest::AMH_iTest () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_call_test_AMH_iTest_optable); -} - -POA_call_test::AMH_iTest::AMH_iTest (const AMH_iTest& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_call_test_AMH_iTest_optable); } @@ -18535,7 +17995,7 @@ POA_call_test::AMH_iTest::do_op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -18708,15 +18168,8 @@ POA_call_test::_TAO_iTest_Direct_Proxy_Impl::do_op ( POA_call_test::iTest::iTest () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_call_test_iTest_optable); -} - -POA_call_test::iTest::iTest (const iTest& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_call_test_iTest_optable); } @@ -18804,7 +18257,7 @@ void POA_call_test::iTest::do_op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -18826,7 +18279,7 @@ const char* POA_call_test::iTest::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -18839,7 +18292,7 @@ void POA_call_test::iTest::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -19036,16 +18489,8 @@ POA_call_test::_TAO_AMI_iTestHandler_Direct_Proxy_Impl::do_op_excep ( POA_call_test::AMI_iTestHandler::AMI_iTestHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_call_test_AMI_iTestHandler_optable); -} - -POA_call_test::AMI_iTestHandler::AMI_iTestHandler (const AMI_iTestHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_call_test_AMI_iTestHandler_optable); } @@ -19197,7 +18642,7 @@ void POA_call_test::AMI_iTestHandler::do_op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -19220,7 +18665,7 @@ const char* POA_call_test::AMI_iTestHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -19233,7 +18678,7 @@ void POA_call_test::AMI_iTestHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -19362,15 +18807,8 @@ static TAO_call_attribute_AMH_iBar_Perfect_Hash_OpTable tao_call_attribute_AMH_i POA_call_attribute::AMH_iBar::AMH_iBar () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_call_attribute_AMH_iBar_optable); -} - -POA_call_attribute::AMH_iBar::AMH_iBar (const AMH_iBar& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_call_attribute_AMH_iBar_optable); } @@ -19466,7 +18904,7 @@ POA_call_attribute::AMH_iBar::_set_call_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -19682,15 +19120,8 @@ POA_call_attribute::_TAO_iBar_Direct_Proxy_Impl::_set_call ( POA_call_attribute::iBar::iBar () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_call_attribute_iBar_optable); -} - -POA_call_attribute::iBar::iBar (const iBar& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_call_attribute_iBar_optable); } @@ -19856,7 +19287,7 @@ void POA_call_attribute::iBar::_set_call_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -19878,7 +19309,7 @@ const char* POA_call_attribute::iBar::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -19891,7 +19322,7 @@ void POA_call_attribute::iBar::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -20170,16 +19601,8 @@ POA_call_attribute::_TAO_AMI_iBarHandler_Direct_Proxy_Impl::set_call_excep ( POA_call_attribute::AMI_iBarHandler::AMI_iBarHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_call_attribute_AMI_iBarHandler_optable); -} - -POA_call_attribute::AMI_iBarHandler::AMI_iBarHandler (const AMI_iBarHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_call_attribute_AMI_iBarHandler_optable); } @@ -20493,7 +19916,7 @@ void POA_call_attribute::AMI_iBarHandler::set_call_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -20516,7 +19939,7 @@ const char* POA_call_attribute::AMI_iBarHandler::_interface_repository_id () con // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -20529,7 +19952,7 @@ void POA_call_attribute::AMI_iBarHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/interfaceS.h b/tests/IDL_Test/interfaceS.h index 4bb0136..87f54ce 100644 --- a/tests/IDL_Test/interfaceS.h +++ b/tests/IDL_Test/interfaceS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_INTERFACES_FQKJMG_H_ -#define _TAO_IDL_INTERFACES_FQKJMG_H_ +#ifndef _TAO_IDL_INTERFACES_QI1KM0_H_ +#define _TAO_IDL_INTERFACES_QI1KM0_H_ #include /**/ "ace/pre.h" @@ -1883,7 +1883,7 @@ class TAO_IDL_TEST_STUB_Export POA_Base typedef ::Base_ptr _stub_ptr_type; typedef ::Base_var _stub_var_type; - POA_Base (const POA_Base& rhs); + POA_Base (const POA_Base& rhs) = default; virtual ~POA_Base () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2006,7 +2006,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_BaseHandler typedef ::AMI_BaseHandler_ptr _stub_ptr_type; typedef ::AMI_BaseHandler_var _stub_var_type; - POA_AMI_BaseHandler (const POA_AMI_BaseHandler& rhs); + POA_AMI_BaseHandler (const POA_AMI_BaseHandler& rhs) = default; virtual ~POA_AMI_BaseHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2159,7 +2159,7 @@ class TAO_IDL_TEST_STUB_Export POA_Derived typedef ::Derived_ptr _stub_ptr_type; typedef ::Derived_var _stub_var_type; - POA_Derived (const POA_Derived& rhs); + POA_Derived (const POA_Derived& rhs) = default; virtual ~POA_Derived () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2231,7 +2231,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_DerivedHandler typedef ::AMI_DerivedHandler_ptr _stub_ptr_type; typedef ::AMI_DerivedHandler_var _stub_var_type; - POA_AMI_DerivedHandler (const POA_AMI_DerivedHandler& rhs); + POA_AMI_DerivedHandler (const POA_AMI_DerivedHandler& rhs) = default; virtual ~POA_AMI_DerivedHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2340,7 +2340,7 @@ class TAO_IDL_TEST_STUB_Export POA_foostep typedef ::foostep_ptr _stub_ptr_type; typedef ::foostep_var _stub_var_type; - POA_foostep (const POA_foostep& rhs); + POA_foostep (const POA_foostep& rhs) = default; virtual ~POA_foostep () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2437,7 +2437,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_foostepHandler typedef ::AMI_foostepHandler_ptr _stub_ptr_type; typedef ::AMI_foostepHandler_var _stub_var_type; - POA_AMI_foostepHandler (const POA_AMI_foostepHandler& rhs); + POA_AMI_foostepHandler (const POA_AMI_foostepHandler& rhs) = default; virtual ~POA_AMI_foostepHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2556,7 +2556,7 @@ class TAO_IDL_TEST_STUB_Export POA_mother typedef ::mother_ptr _stub_ptr_type; typedef ::mother_var _stub_var_type; - POA_mother (const POA_mother& rhs); + POA_mother (const POA_mother& rhs) = default; virtual ~POA_mother () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2627,7 +2627,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_motherHandler typedef ::AMI_motherHandler_ptr _stub_ptr_type; typedef ::AMI_motherHandler_var _stub_var_type; - POA_AMI_motherHandler (const POA_AMI_motherHandler& rhs); + POA_AMI_motherHandler (const POA_AMI_motherHandler& rhs) = default; virtual ~POA_AMI_motherHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2712,7 +2712,7 @@ class TAO_IDL_TEST_STUB_Export POA_father typedef ::father_ptr _stub_ptr_type; typedef ::father_var _stub_var_type; - POA_father (const POA_father& rhs); + POA_father (const POA_father& rhs) = default; virtual ~POA_father () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2783,7 +2783,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_fatherHandler typedef ::AMI_fatherHandler_ptr _stub_ptr_type; typedef ::AMI_fatherHandler_var _stub_var_type; - POA_AMI_fatherHandler (const POA_AMI_fatherHandler& rhs); + POA_AMI_fatherHandler (const POA_AMI_fatherHandler& rhs) = default; virtual ~POA_AMI_fatherHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2871,7 +2871,7 @@ class TAO_IDL_TEST_STUB_Export POA_child typedef ::child_ptr _stub_ptr_type; typedef ::child_var _stub_var_type; - POA_child (const POA_child& rhs); + POA_child (const POA_child& rhs) = default; virtual ~POA_child () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2945,7 +2945,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_childHandler typedef ::AMI_childHandler_ptr _stub_ptr_type; typedef ::AMI_childHandler_var _stub_var_type; - POA_AMI_childHandler (const POA_AMI_childHandler& rhs); + POA_AMI_childHandler (const POA_AMI_childHandler& rhs) = default; virtual ~POA_AMI_childHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3031,7 +3031,7 @@ class TAO_IDL_TEST_STUB_Export POA__cxx_try typedef ::_cxx_try_ptr _stub_ptr_type; typedef ::_cxx_try_var _stub_var_type; - POA__cxx_try (const POA__cxx_try& rhs); + POA__cxx_try (const POA__cxx_try& rhs) = default; virtual ~POA__cxx_try () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3102,7 +3102,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI__cxx_tryHandler typedef ::AMI__cxx_tryHandler_ptr _stub_ptr_type; typedef ::AMI__cxx_tryHandler_var _stub_var_type; - POA_AMI__cxx_tryHandler (const POA_AMI__cxx_tryHandler& rhs); + POA_AMI__cxx_tryHandler (const POA_AMI__cxx_tryHandler& rhs) = default; virtual ~POA_AMI__cxx_tryHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3214,7 +3214,7 @@ class TAO_IDL_TEST_STUB_Export POA_later_user typedef ::later_user_ptr _stub_ptr_type; typedef ::later_user_var _stub_var_type; - POA_later_user (const POA_later_user& rhs); + POA_later_user (const POA_later_user& rhs) = default; virtual ~POA_later_user () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3342,7 +3342,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_later_userHandler typedef ::AMI_later_userHandler_ptr _stub_ptr_type; typedef ::AMI_later_userHandler_var _stub_var_type; - POA_AMI_later_userHandler (const POA_AMI_later_userHandler& rhs); + POA_AMI_later_userHandler (const POA_AMI_later_userHandler& rhs) = default; virtual ~POA_AMI_later_userHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3496,7 +3496,7 @@ class TAO_IDL_TEST_STUB_Export POA_later typedef ::later_ptr _stub_ptr_type; typedef ::later_var _stub_var_type; - POA_later (const POA_later& rhs); + POA_later (const POA_later& rhs) = default; virtual ~POA_later () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3567,7 +3567,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_laterHandler typedef ::AMI_laterHandler_ptr _stub_ptr_type; typedef ::AMI_laterHandler_var _stub_var_type; - POA_AMI_laterHandler (const POA_AMI_laterHandler& rhs); + POA_AMI_laterHandler (const POA_AMI_laterHandler& rhs) = default; virtual ~POA_AMI_laterHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3652,7 +3652,7 @@ class TAO_IDL_TEST_STUB_Export POA_Begin typedef ::Begin_ptr _stub_ptr_type; typedef ::Begin_var _stub_var_type; - POA_Begin (const POA_Begin& rhs); + POA_Begin (const POA_Begin& rhs) = default; virtual ~POA_Begin () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3723,7 +3723,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_BeginHandler typedef ::AMI_BeginHandler_ptr _stub_ptr_type; typedef ::AMI_BeginHandler_var _stub_var_type; - POA_AMI_BeginHandler (const POA_AMI_BeginHandler& rhs); + POA_AMI_BeginHandler (const POA_AMI_BeginHandler& rhs) = default; virtual ~POA_AMI_BeginHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3809,7 +3809,7 @@ class TAO_IDL_TEST_STUB_Export POA_Middle typedef ::Middle_ptr _stub_ptr_type; typedef ::Middle_var _stub_var_type; - POA_Middle (const POA_Middle& rhs); + POA_Middle (const POA_Middle& rhs) = default; virtual ~POA_Middle () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3881,7 +3881,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_MiddleHandler typedef ::AMI_MiddleHandler_ptr _stub_ptr_type; typedef ::AMI_MiddleHandler_var _stub_var_type; - POA_AMI_MiddleHandler (const POA_AMI_MiddleHandler& rhs); + POA_AMI_MiddleHandler (const POA_AMI_MiddleHandler& rhs) = default; virtual ~POA_AMI_MiddleHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3967,7 +3967,7 @@ class TAO_IDL_TEST_STUB_Export POA_End typedef ::End_ptr _stub_ptr_type; typedef ::End_var _stub_var_type; - POA_End (const POA_End& rhs); + POA_End (const POA_End& rhs) = default; virtual ~POA_End () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4039,7 +4039,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_EndHandler typedef ::AMI_EndHandler_ptr _stub_ptr_type; typedef ::AMI_EndHandler_var _stub_var_type; - POA_AMI_EndHandler (const POA_AMI_EndHandler& rhs); + POA_AMI_EndHandler (const POA_AMI_EndHandler& rhs) = default; virtual ~POA_AMI_EndHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4149,7 +4149,7 @@ class TAO_IDL_TEST_STUB_Export POA_Client typedef ::Client_ptr _stub_ptr_type; typedef ::Client_var _stub_var_type; - POA_Client (const POA_Client& rhs); + POA_Client (const POA_Client& rhs) = default; virtual ~POA_Client () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4272,7 +4272,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_ClientHandler typedef ::AMI_ClientHandler_ptr _stub_ptr_type; typedef ::AMI_ClientHandler_var _stub_var_type; - POA_AMI_ClientHandler (const POA_AMI_ClientHandler& rhs); + POA_AMI_ClientHandler (const POA_AMI_ClientHandler& rhs) = default; virtual ~POA_AMI_ClientHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4474,7 +4474,7 @@ class TAO_IDL_TEST_STUB_Export POA_AttributeTester typedef ::AttributeTester_ptr _stub_ptr_type; typedef ::AttributeTester_var _stub_var_type; - POA_AttributeTester (const POA_AttributeTester& rhs); + POA_AttributeTester (const POA_AttributeTester& rhs) = default; virtual ~POA_AttributeTester () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4649,7 +4649,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_AttributeTesterHandler typedef ::AMI_AttributeTesterHandler_ptr _stub_ptr_type; typedef ::AMI_AttributeTesterHandler_var _stub_var_type; - POA_AMI_AttributeTesterHandler (const POA_AMI_AttributeTesterHandler& rhs); + POA_AMI_AttributeTesterHandler (const POA_AMI_AttributeTesterHandler& rhs) = default; virtual ~POA_AMI_AttributeTesterHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4888,7 +4888,7 @@ class TAO_IDL_TEST_STUB_Export ParameterTester typedef ::ParamMod::ParameterTester_ptr _stub_ptr_type; typedef ::ParamMod::ParameterTester_var _stub_var_type; - ParameterTester (const ParameterTester& rhs); + ParameterTester (const ParameterTester& rhs) = default; virtual ~ParameterTester () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4990,7 +4990,7 @@ class TAO_IDL_TEST_STUB_Export AMI_ParameterTesterHandler typedef ::ParamMod::AMI_ParameterTesterHandler_ptr _stub_ptr_type; typedef ::ParamMod::AMI_ParameterTesterHandler_var _stub_var_type; - AMI_ParameterTesterHandler (const AMI_ParameterTesterHandler& rhs); + AMI_ParameterTesterHandler (const AMI_ParameterTesterHandler& rhs) = default; virtual ~AMI_ParameterTesterHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5117,7 +5117,7 @@ class TAO_IDL_TEST_STUB_Export POA_A typedef ::A_ptr _stub_ptr_type; typedef ::A_var _stub_var_type; - POA_A (const POA_A& rhs); + POA_A (const POA_A& rhs) = default; virtual ~POA_A () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5188,7 +5188,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_AHandler typedef ::AMI_AHandler_ptr _stub_ptr_type; typedef ::AMI_AHandler_var _stub_var_type; - POA_AMI_AHandler (const POA_AMI_AHandler& rhs); + POA_AMI_AHandler (const POA_AMI_AHandler& rhs) = default; virtual ~POA_AMI_AHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5291,7 +5291,7 @@ class TAO_IDL_TEST_STUB_Export A typedef ::M::A_ptr _stub_ptr_type; typedef ::M::A_var _stub_var_type; - A (const A& rhs); + A (const A& rhs) = default; virtual ~A () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5362,7 +5362,7 @@ class TAO_IDL_TEST_STUB_Export AMI_AHandler typedef ::M::AMI_AHandler_ptr _stub_ptr_type; typedef ::M::AMI_AHandler_var _stub_var_type; - AMI_AHandler (const AMI_AHandler& rhs); + AMI_AHandler (const AMI_AHandler& rhs) = default; virtual ~AMI_AHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5471,7 +5471,7 @@ class TAO_IDL_TEST_STUB_Export if1 typedef ::i1::if1_ptr _stub_ptr_type; typedef ::i1::if1_var _stub_var_type; - if1 (const if1& rhs); + if1 (const if1& rhs) = default; virtual ~if1 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5568,7 +5568,7 @@ class TAO_IDL_TEST_STUB_Export AMI_if1Handler typedef ::i1::AMI_if1Handler_ptr _stub_ptr_type; typedef ::i1::AMI_if1Handler_var _stub_var_type; - AMI_if1Handler (const AMI_if1Handler& rhs); + AMI_if1Handler (const AMI_if1Handler& rhs) = default; virtual ~AMI_if1Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5712,7 +5712,7 @@ class TAO_IDL_TEST_STUB_Export if2 typedef ::i2::if2_ptr _stub_ptr_type; typedef ::i2::if2_var _stub_var_type; - if2 (const if2& rhs); + if2 (const if2& rhs) = default; virtual ~if2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5810,7 +5810,7 @@ class TAO_IDL_TEST_STUB_Export AMI_if2Handler typedef ::i2::AMI_if2Handler_ptr _stub_ptr_type; typedef ::i2::AMI_if2Handler_var _stub_var_type; - AMI_if2Handler (const AMI_if2Handler& rhs); + AMI_if2Handler (const AMI_if2Handler& rhs) = default; virtual ~AMI_if2Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5942,7 +5942,7 @@ class TAO_IDL_TEST_STUB_Export if3 typedef ::i2::if3_ptr _stub_ptr_type; typedef ::i2::if3_var _stub_var_type; - if3 (const if3& rhs); + if3 (const if3& rhs) = default; virtual ~if3 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6040,7 +6040,7 @@ class TAO_IDL_TEST_STUB_Export AMI_if3Handler typedef ::i2::AMI_if3Handler_ptr _stub_ptr_type; typedef ::i2::AMI_if3Handler_var _stub_var_type; - AMI_if3Handler (const AMI_if3Handler& rhs); + AMI_if3Handler (const AMI_if3Handler& rhs) = default; virtual ~AMI_if3Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6171,7 +6171,7 @@ class TAO_IDL_TEST_STUB_Export base typedef ::redefs::base_ptr _stub_ptr_type; typedef ::redefs::base_var _stub_var_type; - base (const base& rhs); + base (const base& rhs) = default; virtual ~base () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6242,7 +6242,7 @@ class TAO_IDL_TEST_STUB_Export AMI_baseHandler typedef ::redefs::AMI_baseHandler_ptr _stub_ptr_type; typedef ::redefs::AMI_baseHandler_var _stub_var_type; - AMI_baseHandler (const AMI_baseHandler& rhs); + AMI_baseHandler (const AMI_baseHandler& rhs) = default; virtual ~AMI_baseHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6328,7 +6328,7 @@ class TAO_IDL_TEST_STUB_Export derived typedef ::redefs::derived_ptr _stub_ptr_type; typedef ::redefs::derived_var _stub_var_type; - derived (const derived& rhs); + derived (const derived& rhs) = default; virtual ~derived () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6400,7 +6400,7 @@ class TAO_IDL_TEST_STUB_Export AMI_derivedHandler typedef ::redefs::AMI_derivedHandler_ptr _stub_ptr_type; typedef ::redefs::AMI_derivedHandler_var _stub_var_type; - AMI_derivedHandler (const AMI_derivedHandler& rhs); + AMI_derivedHandler (const AMI_derivedHandler& rhs) = default; virtual ~AMI_derivedHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6497,7 +6497,7 @@ class TAO_IDL_TEST_STUB_Export base typedef ::Rec_Arg_Traits::base_ptr _stub_ptr_type; typedef ::Rec_Arg_Traits::base_var _stub_var_type; - base (const base& rhs); + base (const base& rhs) = default; virtual ~base () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6568,7 +6568,7 @@ class TAO_IDL_TEST_STUB_Export AMI_baseHandler typedef ::Rec_Arg_Traits::AMI_baseHandler_ptr _stub_ptr_type; typedef ::Rec_Arg_Traits::AMI_baseHandler_var _stub_var_type; - AMI_baseHandler (const AMI_baseHandler& rhs); + AMI_baseHandler (const AMI_baseHandler& rhs) = default; virtual ~AMI_baseHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6667,7 +6667,7 @@ class TAO_IDL_TEST_STUB_Export derived typedef ::Rec_Arg_Traits::derived_ptr _stub_ptr_type; typedef ::Rec_Arg_Traits::derived_var _stub_var_type; - derived (const derived& rhs); + derived (const derived& rhs) = default; virtual ~derived () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6765,7 +6765,7 @@ class TAO_IDL_TEST_STUB_Export AMI_derivedHandler typedef ::Rec_Arg_Traits::AMI_derivedHandler_ptr _stub_ptr_type; typedef ::Rec_Arg_Traits::AMI_derivedHandler_var _stub_var_type; - AMI_derivedHandler (const AMI_derivedHandler& rhs); + AMI_derivedHandler (const AMI_derivedHandler& rhs) = default; virtual ~AMI_derivedHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6908,7 +6908,7 @@ class TAO_IDL_TEST_STUB_Export iTest typedef ::call_test::iTest_ptr _stub_ptr_type; typedef ::call_test::iTest_var _stub_var_type; - iTest (const iTest& rhs); + iTest (const iTest& rhs) = default; virtual ~iTest () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -7005,7 +7005,7 @@ class TAO_IDL_TEST_STUB_Export AMI_iTestHandler typedef ::call_test::AMI_iTestHandler_ptr _stub_ptr_type; typedef ::call_test::AMI_iTestHandler_var _stub_var_type; - AMI_iTestHandler (const AMI_iTestHandler& rhs); + AMI_iTestHandler (const AMI_iTestHandler& rhs) = default; virtual ~AMI_iTestHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -7160,7 +7160,7 @@ class TAO_IDL_TEST_STUB_Export iBar typedef ::call_attribute::iBar_ptr _stub_ptr_type; typedef ::call_attribute::iBar_var _stub_var_type; - iBar (const iBar& rhs); + iBar (const iBar& rhs) = default; virtual ~iBar () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -7283,7 +7283,7 @@ class TAO_IDL_TEST_STUB_Export AMI_iBarHandler typedef ::call_attribute::AMI_iBarHandler_ptr _stub_ptr_type; typedef ::call_attribute::AMI_iBarHandler_var _stub_var_type; - AMI_iBarHandler (const AMI_iBarHandler& rhs); + AMI_iBarHandler (const AMI_iBarHandler& rhs) = default; virtual ~AMI_iBarHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/keywordsC.h b/tests/IDL_Test/keywordsC.h index a0ea6ff..44d6ffe 100644 --- a/tests/IDL_Test/keywordsC.h +++ b/tests/IDL_Test/keywordsC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_KEYWORDSC_W8W3SM_H_ -#define _TAO_IDL_KEYWORDSC_W8W3SM_H_ +#ifndef _TAO_IDL_KEYWORDSC_EHWKII_H_ +#define _TAO_IDL_KEYWORDSC_EHWKII_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/keywordsS.cpp b/tests/IDL_Test/keywordsS.cpp index 0357394..61755c2 100644 --- a/tests/IDL_Test/keywordsS.cpp +++ b/tests/IDL_Test/keywordsS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_KEYWORDSS_SKN4SF_CPP_ -#define _TAO_IDL_KEYWORDSS_SKN4SF_CPP_ +#ifndef _TAO_IDL_KEYWORDSS_ARIBVS_CPP_ +#define _TAO_IDL_KEYWORDSS_ARIBVS_CPP_ #include "keywordsS.h" @@ -147,15 +147,8 @@ static TAO_AMH_Testing_Perfect_Hash_OpTable tao_AMH_Testing_optable; POA_AMH_Testing::POA_AMH_Testing () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_Testing_optable); -} - -POA_AMH_Testing::POA_AMH_Testing (const POA_AMH_Testing& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_Testing_optable); } @@ -258,7 +251,7 @@ POA_AMH_Testing::bar_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -455,15 +448,8 @@ _TAO_Testing_Direct_Proxy_Impl::bar ( POA_Testing::POA_Testing () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Testing_optable); -} - -POA_Testing::POA_Testing (const POA_Testing& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Testing_optable); } @@ -624,7 +610,7 @@ void POA_Testing::bar_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -646,7 +632,7 @@ const char* POA_Testing::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -659,7 +645,7 @@ void POA_Testing::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -929,16 +915,8 @@ _TAO_AMI_TestingHandler_Direct_Proxy_Impl::bar_excep ( POA_AMI_TestingHandler::POA_AMI_TestingHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_TestingHandler_optable); -} - -POA_AMI_TestingHandler::POA_AMI_TestingHandler (const POA_AMI_TestingHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_TestingHandler_optable); } @@ -1219,7 +1197,7 @@ void POA_AMI_TestingHandler::bar_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1242,7 +1220,7 @@ const char* POA_AMI_TestingHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1255,7 +1233,7 @@ void POA_AMI_TestingHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/keywordsS.h b/tests/IDL_Test/keywordsS.h index a57595c..cf82540 100644 --- a/tests/IDL_Test/keywordsS.h +++ b/tests/IDL_Test/keywordsS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_KEYWORDSS_SKN4SF_H_ -#define _TAO_IDL_KEYWORDSS_SKN4SF_H_ +#ifndef _TAO_IDL_KEYWORDSS_ARIBVS_H_ +#define _TAO_IDL_KEYWORDSS_ARIBVS_H_ #include /**/ "ace/pre.h" @@ -281,7 +281,7 @@ class TAO_IDL_TEST_STUB_Export POA_Testing typedef ::Testing_ptr _stub_ptr_type; typedef ::Testing_var _stub_var_type; - POA_Testing (const POA_Testing& rhs); + POA_Testing (const POA_Testing& rhs) = default; virtual ~POA_Testing () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -404,7 +404,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_TestingHandler typedef ::AMI_TestingHandler_ptr _stub_ptr_type; typedef ::AMI_TestingHandler_var _stub_var_type; - POA_AMI_TestingHandler (const POA_AMI_TestingHandler& rhs); + POA_AMI_TestingHandler (const POA_AMI_TestingHandler& rhs) = default; virtual ~POA_AMI_TestingHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/loader_constC.h b/tests/IDL_Test/loader_constC.h index 2859702..b21cbb6 100644 --- a/tests/IDL_Test/loader_constC.h +++ b/tests/IDL_Test/loader_constC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_LOADER_CONSTC_LVYM9C_H_ -#define _TAO_IDL_LOADER_CONSTC_LVYM9C_H_ +#ifndef _TAO_IDL_LOADER_CONSTC_NQYTVZ_H_ +#define _TAO_IDL_LOADER_CONSTC_NQYTVZ_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/loader_constS.cpp b/tests/IDL_Test/loader_constS.cpp index 0e89d92..db7bfad 100644 --- a/tests/IDL_Test/loader_constS.cpp +++ b/tests/IDL_Test/loader_constS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_LOADER_CONSTS_LVYM9C_CPP_ -#define _TAO_IDL_LOADER_CONSTS_LVYM9C_CPP_ +#ifndef _TAO_IDL_LOADER_CONSTS_NQYTVZ_CPP_ +#define _TAO_IDL_LOADER_CONSTS_NQYTVZ_CPP_ #include "loader_constS.h" diff --git a/tests/IDL_Test/loader_constS.h b/tests/IDL_Test/loader_constS.h index 265f6eb..a25b434 100644 --- a/tests/IDL_Test/loader_constS.h +++ b/tests/IDL_Test/loader_constS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_LOADER_CONSTS_LVYM9C_H_ -#define _TAO_IDL_LOADER_CONSTS_LVYM9C_H_ +#ifndef _TAO_IDL_LOADER_CONSTS_NQYTVZ_H_ +#define _TAO_IDL_LOADER_CONSTS_NQYTVZ_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/moduleA.h b/tests/IDL_Test/moduleA.h index cf0da44..37b6a07 100644 --- a/tests/IDL_Test/moduleA.h +++ b/tests/IDL_Test/moduleA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_MODULEA_JSKROZ_H_ -#define _TAO_IDL_MODULEA_JSKROZ_H_ +#ifndef _TAO_IDL_MODULEA_V1X91F_H_ +#define _TAO_IDL_MODULEA_V1X91F_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/moduleC.h b/tests/IDL_Test/moduleC.h index 61eb48d..b1e2e6b 100644 --- a/tests/IDL_Test/moduleC.h +++ b/tests/IDL_Test/moduleC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_MODULEC_JSKROZ_H_ -#define _TAO_IDL_MODULEC_JSKROZ_H_ +#ifndef _TAO_IDL_MODULEC_V1X91F_H_ +#define _TAO_IDL_MODULEC_V1X91F_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/moduleS.cpp b/tests/IDL_Test/moduleS.cpp index 0342520..e193a83 100644 --- a/tests/IDL_Test/moduleS.cpp +++ b/tests/IDL_Test/moduleS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_MODULES_GZJBXD_CPP_ -#define _TAO_IDL_MODULES_GZJBXD_CPP_ +#ifndef _TAO_IDL_MODULES_JRHHG0_CPP_ +#define _TAO_IDL_MODULES_JRHHG0_CPP_ #include "moduleS.h" @@ -168,15 +168,8 @@ static TAO_mod1_mod2_AMH_ex1_Perfect_Hash_OpTable tao_mod1_mod2_AMH_ex1_optable; POA_mod1::mod2::AMH_ex1::AMH_ex1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod1_mod2_AMH_ex1_optable); -} - -POA_mod1::mod2::AMH_ex1::AMH_ex1 (const AMH_ex1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_mod1_mod2_AMH_ex1_optable); } @@ -359,7 +352,7 @@ POA_mod1::mod2::AMH_ex1::m1_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -622,15 +615,8 @@ POA_mod1::mod2::_TAO_ex1_Direct_Proxy_Impl::m1 ( POA_mod1::mod2::ex1::ex1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod1_mod2_ex1_optable); -} - -POA_mod1::mod2::ex1::ex1 (const ex1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_mod1_mod2_ex1_optable); } @@ -977,7 +963,7 @@ void POA_mod1::mod2::ex1::m1_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -999,7 +985,7 @@ const char* POA_mod1::mod2::ex1::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1012,7 +998,7 @@ void POA_mod1::mod2::ex1::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1469,16 +1455,8 @@ POA_mod1::mod2::_TAO_AMI_ex1Handler_Direct_Proxy_Impl::m1_excep ( POA_mod1::mod2::AMI_ex1Handler::AMI_ex1Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod1_mod2_AMI_ex1Handler_optable); -} - -POA_mod1::mod2::AMI_ex1Handler::AMI_ex1Handler (const AMI_ex1Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_mod1_mod2_AMI_ex1Handler_optable); } @@ -2148,7 +2126,7 @@ void POA_mod1::mod2::AMI_ex1Handler::m1_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2171,7 +2149,7 @@ const char* POA_mod1::mod2::AMI_ex1Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2184,7 +2162,7 @@ void POA_mod1::mod2::AMI_ex1Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2318,16 +2296,8 @@ static TAO_mod1_mod2_AMH_ex2_Perfect_Hash_OpTable tao_mod1_mod2_AMH_ex2_optable; POA_mod1::mod2::AMH_ex2::AMH_ex2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod1_mod2_AMH_ex2_optable); -} - -POA_mod1::mod2::AMH_ex2::AMH_ex2 (const AMH_ex2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_mod1::mod2::AMH_ex1 (rhs) { + this->optable_ = std::addressof (tao_mod1_mod2_AMH_ex2_optable); } @@ -2471,7 +2441,7 @@ POA_mod1::mod2::AMH_ex2::m2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2717,16 +2687,8 @@ POA_mod1::mod2::_TAO_ex2_Direct_Proxy_Impl::m2 ( POA_mod1::mod2::ex2::ex2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod1_mod2_ex2_optable); -} - -POA_mod1::mod2::ex2::ex2 (const ex2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_mod1::mod2::ex1 (rhs) { + this->optable_ = std::addressof (tao_mod1_mod2_ex2_optable); } @@ -3000,7 +2962,7 @@ void POA_mod1::mod2::ex2::m2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3023,7 +2985,7 @@ const char* POA_mod1::mod2::ex2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3036,7 +2998,7 @@ void POA_mod1::mod2::ex2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3424,17 +3386,8 @@ POA_mod1::mod2::_TAO_AMI_ex2Handler_Direct_Proxy_Impl::m2_excep ( POA_mod1::mod2::AMI_ex2Handler::AMI_ex2Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mod1_mod2_AMI_ex2Handler_optable); -} - -POA_mod1::mod2::AMI_ex2Handler::AMI_ex2Handler (const AMI_ex2Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_mod1::mod2::AMI_ex1Handler (rhs) { + this->optable_ = std::addressof (tao_mod1_mod2_AMI_ex2Handler_optable); } @@ -3943,7 +3896,7 @@ void POA_mod1::mod2::AMI_ex2Handler::m2_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3967,7 +3920,7 @@ const char* POA_mod1::mod2::AMI_ex2Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3980,7 +3933,7 @@ void POA_mod1::mod2::AMI_ex2Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/moduleS.h b/tests/IDL_Test/moduleS.h index cdce805..c1455a2 100644 --- a/tests/IDL_Test/moduleS.h +++ b/tests/IDL_Test/moduleS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_MODULES_GZJBXD_H_ -#define _TAO_IDL_MODULES_GZJBXD_H_ +#ifndef _TAO_IDL_MODULES_JRHHG0_H_ +#define _TAO_IDL_MODULES_JRHHG0_H_ #include /**/ "ace/pre.h" @@ -320,7 +320,7 @@ namespace POA_mod1 typedef ::mod1::mod2::ex1_ptr _stub_ptr_type; typedef ::mod1::mod2::ex1_var _stub_var_type; - ex1 (const ex1& rhs); + ex1 (const ex1& rhs) = default; virtual ~ex1 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -496,7 +496,7 @@ namespace POA_mod1 typedef ::mod1::mod2::AMI_ex1Handler_ptr _stub_ptr_type; typedef ::mod1::mod2::AMI_ex1Handler_var _stub_var_type; - AMI_ex1Handler (const AMI_ex1Handler& rhs); + AMI_ex1Handler (const AMI_ex1Handler& rhs) = default; virtual ~AMI_ex1Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -755,7 +755,7 @@ class TAO_IDL_TEST_STUB_Export ex2 typedef ::mod1::mod2::ex2_ptr _stub_ptr_type; typedef ::mod1::mod2::ex2_var _stub_var_type; - ex2 (const ex2& rhs); + ex2 (const ex2& rhs) = default; virtual ~ex2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -908,7 +908,7 @@ class TAO_IDL_TEST_STUB_Export AMI_ex2Handler typedef ::mod1::mod2::AMI_ex2Handler_ptr _stub_ptr_type; typedef ::mod1::mod2::AMI_ex2Handler_var _stub_var_type; - AMI_ex2Handler (const AMI_ex2Handler& rhs); + AMI_ex2Handler (const AMI_ex2Handler& rhs) = default; virtual ~AMI_ex2Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/nested_scopeC.h b/tests/IDL_Test/nested_scopeC.h index 0558648..317c9c4 100644 --- a/tests/IDL_Test/nested_scopeC.h +++ b/tests/IDL_Test/nested_scopeC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_NESTED_SCOPEC_UEBHAL_H_ -#define _TAO_IDL_NESTED_SCOPEC_UEBHAL_H_ +#ifndef _TAO_IDL_NESTED_SCOPEC_VT24PN_H_ +#define _TAO_IDL_NESTED_SCOPEC_VT24PN_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/nested_scopeS.cpp b/tests/IDL_Test/nested_scopeS.cpp index 0ee3a3a..9d755e8 100644 --- a/tests/IDL_Test/nested_scopeS.cpp +++ b/tests/IDL_Test/nested_scopeS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_NESTED_SCOPES_FWGQFV_CPP_ -#define _TAO_IDL_NESTED_SCOPES_FWGQFV_CPP_ +#ifndef _TAO_IDL_NESTED_SCOPES_HBUUXT_CPP_ +#define _TAO_IDL_NESTED_SCOPES_HBUUXT_CPP_ #include "nested_scopeS.h" @@ -145,20 +145,14 @@ static TAO_i_skip_i_hump_AMH_i_skip_Perfect_Hash_OpTable tao_i_skip_i_hump_AMH_i POA_i_skip::i_hump::AMH_i_skip::AMH_i_skip () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_i_skip_i_hump_AMH_i_skip_optable); -} - -POA_i_skip::i_hump::AMH_i_skip::AMH_i_skip (const AMH_i_skip& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_i_skip_i_hump_AMH_i_skip_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -309,20 +303,14 @@ POA_i_skip::i_hump::_TAO_i_skip_Direct_Proxy_Impl::~_TAO_i_skip_Direct_Proxy_Imp POA_i_skip::i_hump::i_skip::i_skip () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_i_skip_i_hump_i_skip_optable); -} - -POA_i_skip::i_hump::i_skip::i_skip (const i_skip& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_i_skip_i_hump_i_skip_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -344,7 +332,7 @@ const char* POA_i_skip::i_hump::i_skip::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -357,7 +345,7 @@ void POA_i_skip::i_hump::i_skip::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -483,21 +471,14 @@ POA_i_skip::i_hump::_TAO_AMI_i_skipHandler_Direct_Proxy_Impl::~_TAO_AMI_i_skipHa POA_i_skip::i_hump::AMI_i_skipHandler::AMI_i_skipHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_i_skip_i_hump_AMI_i_skipHandler_optable); -} - -POA_i_skip::i_hump::AMI_i_skipHandler::AMI_i_skipHandler (const AMI_i_skipHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_i_skip_i_hump_AMI_i_skipHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -520,7 +501,7 @@ const char* POA_i_skip::i_hump::AMI_i_skipHandler::_interface_repository_id () c // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -533,7 +514,7 @@ void POA_i_skip::i_hump::AMI_i_skipHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -641,20 +622,14 @@ static TAO_AMH_bloo_Perfect_Hash_OpTable tao_AMH_bloo_optable; POA_AMH_bloo::POA_AMH_bloo () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_bloo_optable); -} - -POA_AMH_bloo::POA_AMH_bloo (const POA_AMH_bloo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_AMH_bloo_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -805,20 +780,14 @@ _TAO_bloo_Direct_Proxy_Impl::~_TAO_bloo_Direct_Proxy_Impl () POA_bloo::POA_bloo () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_bloo_optable); -} - -POA_bloo::POA_bloo (const POA_bloo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_bloo_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -840,7 +809,7 @@ const char* POA_bloo::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -853,7 +822,7 @@ void POA_bloo::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -979,21 +948,14 @@ _TAO_AMI_blooHandler_Direct_Proxy_Impl::~_TAO_AMI_blooHandler_Direct_Proxy_Impl POA_AMI_blooHandler::POA_AMI_blooHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_blooHandler_optable); -} - -POA_AMI_blooHandler::POA_AMI_blooHandler (const POA_AMI_blooHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_blooHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1016,7 +978,7 @@ const char* POA_AMI_blooHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1029,7 +991,7 @@ void POA_AMI_blooHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1137,20 +1099,14 @@ static TAO_bug_1985_a_b_AMH_something_Perfect_Hash_OpTable tao_bug_1985_a_b_AMH_ POA_bug_1985_a::b::AMH_something::AMH_something () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_bug_1985_a_b_AMH_something_optable); -} - -POA_bug_1985_a::b::AMH_something::AMH_something (const AMH_something& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_bug_1985_a_b_AMH_something_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1301,20 +1257,14 @@ POA_bug_1985_a::b::_TAO_something_Direct_Proxy_Impl::~_TAO_something_Direct_Prox POA_bug_1985_a::b::something::something () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_bug_1985_a_b_something_optable); -} - -POA_bug_1985_a::b::something::something (const something& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_bug_1985_a_b_something_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1336,7 +1286,7 @@ const char* POA_bug_1985_a::b::something::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1349,7 +1299,7 @@ void POA_bug_1985_a::b::something::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1475,21 +1425,14 @@ POA_bug_1985_a::b::_TAO_AMI_somethingHandler_Direct_Proxy_Impl::~_TAO_AMI_someth POA_bug_1985_a::b::AMI_somethingHandler::AMI_somethingHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_bug_1985_a_b_AMI_somethingHandler_optable); -} - -POA_bug_1985_a::b::AMI_somethingHandler::AMI_somethingHandler (const AMI_somethingHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_bug_1985_a_b_AMI_somethingHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1512,7 +1455,7 @@ const char* POA_bug_1985_a::b::AMI_somethingHandler::_interface_repository_id () // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1525,7 +1468,7 @@ void POA_bug_1985_a::b::AMI_somethingHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1633,21 +1576,14 @@ static TAO_bug_1985_c_d_AMH_something_Perfect_Hash_OpTable tao_bug_1985_c_d_AMH_ POA_bug_1985_c::d::AMH_something::AMH_something () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_bug_1985_c_d_AMH_something_optable); -} - -POA_bug_1985_c::d::AMH_something::AMH_something (const AMH_something& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_bug_1985_a::b::AMH_something (rhs) -{ + this->optable_ = std::addressof (tao_bug_1985_c_d_AMH_something_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1799,21 +1735,14 @@ POA_bug_1985_c::d::_TAO_something_Direct_Proxy_Impl::~_TAO_something_Direct_Prox POA_bug_1985_c::d::something::something () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_bug_1985_c_d_something_optable); -} - -POA_bug_1985_c::d::something::something (const something& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_bug_1985_a::b::something (rhs) -{ + this->optable_ = std::addressof (tao_bug_1985_c_d_something_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1836,7 +1765,7 @@ const char* POA_bug_1985_c::d::something::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1849,7 +1778,7 @@ void POA_bug_1985_c::d::something::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1975,22 +1904,14 @@ POA_bug_1985_c::d::_TAO_AMI_somethingHandler_Direct_Proxy_Impl::~_TAO_AMI_someth POA_bug_1985_c::d::AMI_somethingHandler::AMI_somethingHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_bug_1985_c_d_AMI_somethingHandler_optable); -} - -POA_bug_1985_c::d::AMI_somethingHandler::AMI_somethingHandler (const AMI_somethingHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_bug_1985_a::b::AMI_somethingHandler (rhs) -{ + this->optable_ = std::addressof (tao_bug_1985_c_d_AMI_somethingHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2014,7 +1935,7 @@ const char* POA_bug_1985_c::d::AMI_somethingHandler::_interface_repository_id () // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2027,7 +1948,7 @@ void POA_bug_1985_c::d::AMI_somethingHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2135,20 +2056,14 @@ static TAO_Negotiator_AMH_UAV_Negotiator_Perfect_Hash_OpTable tao_Negotiator_AMH POA_Negotiator::AMH_UAV_Negotiator::AMH_UAV_Negotiator () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Negotiator_AMH_UAV_Negotiator_optable); -} - -POA_Negotiator::AMH_UAV_Negotiator::AMH_UAV_Negotiator (const AMH_UAV_Negotiator& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_Negotiator_AMH_UAV_Negotiator_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2299,20 +2214,14 @@ POA_Negotiator::_TAO_UAV_Negotiator_Direct_Proxy_Impl::~_TAO_UAV_Negotiator_Dire POA_Negotiator::UAV_Negotiator::UAV_Negotiator () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Negotiator_UAV_Negotiator_optable); -} - -POA_Negotiator::UAV_Negotiator::UAV_Negotiator (const UAV_Negotiator& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_Negotiator_UAV_Negotiator_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2334,7 +2243,7 @@ const char* POA_Negotiator::UAV_Negotiator::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2347,7 +2256,7 @@ void POA_Negotiator::UAV_Negotiator::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2473,21 +2382,14 @@ POA_Negotiator::_TAO_AMI_UAV_NegotiatorHandler_Direct_Proxy_Impl::~_TAO_AMI_UAV_ POA_Negotiator::AMI_UAV_NegotiatorHandler::AMI_UAV_NegotiatorHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Negotiator_AMI_UAV_NegotiatorHandler_optable); -} - -POA_Negotiator::AMI_UAV_NegotiatorHandler::AMI_UAV_NegotiatorHandler (const AMI_UAV_NegotiatorHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_Negotiator_AMI_UAV_NegotiatorHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2510,7 +2412,7 @@ const char* POA_Negotiator::AMI_UAV_NegotiatorHandler::_interface_repository_id // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2523,7 +2425,7 @@ void POA_Negotiator::AMI_UAV_NegotiatorHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2630,16 +2532,8 @@ static TAO_Negotiator_AMH_UAV_Negotiator_Factory_Perfect_Hash_OpTable tao_Negoti POA_Negotiator::AMH_UAV_Negotiator_Factory::AMH_UAV_Negotiator_Factory () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Negotiator_AMH_UAV_Negotiator_Factory_optable); -} - -POA_Negotiator::AMH_UAV_Negotiator_Factory::AMH_UAV_Negotiator_Factory (const AMH_UAV_Negotiator_Factory& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_Negotiator::AMH_UAV_Negotiator (rhs) { + this->optable_ = std::addressof (tao_Negotiator_AMH_UAV_Negotiator_Factory_optable); } @@ -2694,7 +2588,7 @@ POA_Negotiator::AMH_UAV_Negotiator_Factory::make_negotiator_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2868,16 +2762,8 @@ POA_Negotiator::_TAO_UAV_Negotiator_Factory_Direct_Proxy_Impl::make_negotiator ( POA_Negotiator::UAV_Negotiator_Factory::UAV_Negotiator_Factory () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Negotiator_UAV_Negotiator_Factory_optable); -} - -POA_Negotiator::UAV_Negotiator_Factory::UAV_Negotiator_Factory (const UAV_Negotiator_Factory& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_Negotiator::UAV_Negotiator (rhs) { + this->optable_ = std::addressof (tao_Negotiator_UAV_Negotiator_Factory_optable); } @@ -2971,7 +2857,7 @@ void POA_Negotiator::UAV_Negotiator_Factory::make_negotiator_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2994,7 +2880,7 @@ const char* POA_Negotiator::UAV_Negotiator_Factory::_interface_repository_id () // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3007,7 +2893,7 @@ void POA_Negotiator::UAV_Negotiator_Factory::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3212,17 +3098,8 @@ POA_Negotiator::_TAO_AMI_UAV_Negotiator_FactoryHandler_Direct_Proxy_Impl::make_n POA_Negotiator::AMI_UAV_Negotiator_FactoryHandler::AMI_UAV_Negotiator_FactoryHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Negotiator_AMI_UAV_Negotiator_FactoryHandler_optable); -} - -POA_Negotiator::AMI_UAV_Negotiator_FactoryHandler::AMI_UAV_Negotiator_FactoryHandler (const AMI_UAV_Negotiator_FactoryHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_Negotiator::AMI_UAV_NegotiatorHandler (rhs) { + this->optable_ = std::addressof (tao_Negotiator_AMI_UAV_Negotiator_FactoryHandler_optable); } @@ -3391,7 +3268,7 @@ void POA_Negotiator::AMI_UAV_Negotiator_FactoryHandler::make_negotiator_excep_sk // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3415,7 +3292,7 @@ const char* POA_Negotiator::AMI_UAV_Negotiator_FactoryHandler::_interface_reposi // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3428,7 +3305,7 @@ void POA_Negotiator::AMI_UAV_Negotiator_FactoryHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3536,15 +3413,8 @@ static TAO_Wow_bug_2125_AMH_MyInterface_Perfect_Hash_OpTable tao_Wow_bug_2125_AM POA_Wow::bug_2125::AMH_MyInterface::AMH_MyInterface () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Wow_bug_2125_AMH_MyInterface_optable); -} - -POA_Wow::bug_2125::AMH_MyInterface::AMH_MyInterface (const AMH_MyInterface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Wow_bug_2125_AMH_MyInterface_optable); } @@ -3599,7 +3469,7 @@ POA_Wow::bug_2125::AMH_MyInterface::op2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3772,15 +3642,8 @@ POA_Wow::bug_2125::_TAO_MyInterface_Direct_Proxy_Impl::op2 ( POA_Wow::bug_2125::MyInterface::MyInterface () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Wow_bug_2125_MyInterface_optable); -} - -POA_Wow::bug_2125::MyInterface::MyInterface (const MyInterface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Wow_bug_2125_MyInterface_optable); } @@ -3872,7 +3735,7 @@ void POA_Wow::bug_2125::MyInterface::op2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3894,7 +3757,7 @@ const char* POA_Wow::bug_2125::MyInterface::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3907,7 +3770,7 @@ void POA_Wow::bug_2125::MyInterface::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4104,16 +3967,8 @@ POA_Wow::bug_2125::_TAO_AMI_MyInterfaceHandler_Direct_Proxy_Impl::op2_excep ( POA_Wow::bug_2125::AMI_MyInterfaceHandler::AMI_MyInterfaceHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Wow_bug_2125_AMI_MyInterfaceHandler_optable); -} - -POA_Wow::bug_2125::AMI_MyInterfaceHandler::AMI_MyInterfaceHandler (const AMI_MyInterfaceHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_Wow_bug_2125_AMI_MyInterfaceHandler_optable); } @@ -4273,7 +4128,7 @@ void POA_Wow::bug_2125::AMI_MyInterfaceHandler::op2_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4296,7 +4151,7 @@ const char* POA_Wow::bug_2125::AMI_MyInterfaceHandler::_interface_repository_id // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4309,7 +4164,7 @@ void POA_Wow::bug_2125::AMI_MyInterfaceHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/nested_scopeS.h b/tests/IDL_Test/nested_scopeS.h index 9297ea8..c72d281 100644 --- a/tests/IDL_Test/nested_scopeS.h +++ b/tests/IDL_Test/nested_scopeS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_NESTED_SCOPES_FWGQFV_H_ -#define _TAO_IDL_NESTED_SCOPES_FWGQFV_H_ +#ifndef _TAO_IDL_NESTED_SCOPES_KKIBCL_H_ +#define _TAO_IDL_NESTED_SCOPES_KKIBCL_H_ #include /**/ "ace/pre.h" @@ -805,7 +805,7 @@ namespace POA_i_skip typedef ::i_skip::i_hump::i_skip_ptr _stub_ptr_type; typedef ::i_skip::i_hump::i_skip_var _stub_var_type; - i_skip (const i_skip& rhs); + i_skip (const i_skip& rhs) = default; virtual ~i_skip () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -876,7 +876,7 @@ namespace POA_i_skip typedef ::i_skip::i_hump::AMI_i_skipHandler_ptr _stub_ptr_type; typedef ::i_skip::i_hump::AMI_i_skipHandler_var _stub_var_type; - AMI_i_skipHandler (const AMI_i_skipHandler& rhs); + AMI_i_skipHandler (const AMI_i_skipHandler& rhs) = default; virtual ~AMI_i_skipHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1117,7 +1117,7 @@ class TAO_IDL_TEST_STUB_Export POA_bloo typedef ::bloo_ptr _stub_ptr_type; typedef ::bloo_var _stub_var_type; - POA_bloo (const POA_bloo& rhs); + POA_bloo (const POA_bloo& rhs) = default; virtual ~POA_bloo () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1188,7 +1188,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_blooHandler typedef ::AMI_blooHandler_ptr _stub_ptr_type; typedef ::AMI_blooHandler_var _stub_var_type; - POA_AMI_blooHandler (const POA_AMI_blooHandler& rhs); + POA_AMI_blooHandler (const POA_AMI_blooHandler& rhs) = default; virtual ~POA_AMI_blooHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1333,7 +1333,7 @@ namespace POA_bug_1985_a typedef ::bug_1985_a::b::something_ptr _stub_ptr_type; typedef ::bug_1985_a::b::something_var _stub_var_type; - something (const something& rhs); + something (const something& rhs) = default; virtual ~something () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1404,7 +1404,7 @@ namespace POA_bug_1985_a typedef ::bug_1985_a::b::AMI_somethingHandler_ptr _stub_ptr_type; typedef ::bug_1985_a::b::AMI_somethingHandler_var _stub_var_type; - AMI_somethingHandler (const AMI_somethingHandler& rhs); + AMI_somethingHandler (const AMI_somethingHandler& rhs) = default; virtual ~AMI_somethingHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1514,7 +1514,7 @@ namespace POA_bug_1985_c typedef ::bug_1985_c::d::something_ptr _stub_ptr_type; typedef ::bug_1985_c::d::something_var _stub_var_type; - something (const something& rhs); + something (const something& rhs) = default; virtual ~something () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1586,7 +1586,7 @@ namespace POA_bug_1985_c typedef ::bug_1985_c::d::AMI_somethingHandler_ptr _stub_ptr_type; typedef ::bug_1985_c::d::AMI_somethingHandler_var _stub_var_type; - AMI_somethingHandler (const AMI_somethingHandler& rhs); + AMI_somethingHandler (const AMI_somethingHandler& rhs) = default; virtual ~AMI_somethingHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1689,7 +1689,7 @@ class TAO_IDL_TEST_STUB_Export UAV_Negotiator typedef ::Negotiator::UAV_Negotiator_ptr _stub_ptr_type; typedef ::Negotiator::UAV_Negotiator_var _stub_var_type; - UAV_Negotiator (const UAV_Negotiator& rhs); + UAV_Negotiator (const UAV_Negotiator& rhs) = default; virtual ~UAV_Negotiator () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1760,7 +1760,7 @@ class TAO_IDL_TEST_STUB_Export AMI_UAV_NegotiatorHandler typedef ::Negotiator::AMI_UAV_NegotiatorHandler_ptr _stub_ptr_type; typedef ::Negotiator::AMI_UAV_NegotiatorHandler_var _stub_var_type; - AMI_UAV_NegotiatorHandler (const AMI_UAV_NegotiatorHandler& rhs); + AMI_UAV_NegotiatorHandler (const AMI_UAV_NegotiatorHandler& rhs) = default; virtual ~AMI_UAV_NegotiatorHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1859,7 +1859,7 @@ class TAO_IDL_TEST_STUB_Export UAV_Negotiator_Factory typedef ::Negotiator::UAV_Negotiator_Factory_ptr _stub_ptr_type; typedef ::Negotiator::UAV_Negotiator_Factory_var _stub_var_type; - UAV_Negotiator_Factory (const UAV_Negotiator_Factory& rhs); + UAV_Negotiator_Factory (const UAV_Negotiator_Factory& rhs) = default; virtual ~UAV_Negotiator_Factory () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1958,7 +1958,7 @@ class TAO_IDL_TEST_STUB_Export AMI_UAV_Negotiator_FactoryHandler typedef ::Negotiator::AMI_UAV_Negotiator_FactoryHandler_ptr _stub_ptr_type; typedef ::Negotiator::AMI_UAV_Negotiator_FactoryHandler_var _stub_var_type; - AMI_UAV_Negotiator_FactoryHandler (const AMI_UAV_Negotiator_FactoryHandler& rhs); + AMI_UAV_Negotiator_FactoryHandler (const AMI_UAV_Negotiator_FactoryHandler& rhs) = default; virtual ~AMI_UAV_Negotiator_FactoryHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2132,7 +2132,7 @@ namespace POA_Wow typedef ::Wow::bug_2125::MyInterface_ptr _stub_ptr_type; typedef ::Wow::bug_2125::MyInterface_var _stub_var_type; - MyInterface (const MyInterface& rhs); + MyInterface (const MyInterface& rhs) = default; virtual ~MyInterface () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2229,7 +2229,7 @@ namespace POA_Wow typedef ::Wow::bug_2125::AMI_MyInterfaceHandler_ptr _stub_ptr_type; typedef ::Wow::bug_2125::AMI_MyInterfaceHandler_var _stub_var_type; - AMI_MyInterfaceHandler (const AMI_MyInterfaceHandler& rhs); + AMI_MyInterfaceHandler (const AMI_MyInterfaceHandler& rhs) = default; virtual ~AMI_MyInterfaceHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/old_arrayC.h b/tests/IDL_Test/old_arrayC.h index d2e2493..e63b8e6 100644 --- a/tests/IDL_Test/old_arrayC.h +++ b/tests/IDL_Test/old_arrayC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_OLD_ARRAYC_96BS6W_H_ -#define _TAO_IDL_OLD_ARRAYC_96BS6W_H_ +#ifndef _TAO_IDL_OLD_ARRAYC_83TSLI_H_ +#define _TAO_IDL_OLD_ARRAYC_83TSLI_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/old_arrayS.cpp b/tests/IDL_Test/old_arrayS.cpp index 0c6d375..f559a28 100644 --- a/tests/IDL_Test/old_arrayS.cpp +++ b/tests/IDL_Test/old_arrayS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_OLD_ARRAYS_QMCRXB_CPP_ -#define _TAO_IDL_OLD_ARRAYS_QMCRXB_CPP_ +#ifndef _TAO_IDL_OLD_ARRAYS_QJXBZR_CPP_ +#define _TAO_IDL_OLD_ARRAYS_QJXBZR_CPP_ #include "old_arrayS.h" @@ -169,15 +169,8 @@ static TAO_OldArray_AMH_A_i_Perfect_Hash_OpTable tao_OldArray_AMH_A_i_optable; POA_OldArray::AMH_A_i::AMH_A_i () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldArray_AMH_A_i_optable); -} - -POA_OldArray::AMH_A_i::AMH_A_i (const AMH_A_i& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldArray_AMH_A_i_optable); } @@ -435,7 +428,7 @@ POA_OldArray::AMH_A_i::_set_attribute_array_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -729,15 +722,8 @@ POA_OldArray::_TAO_A_i_Direct_Proxy_Impl::_set_attribute_array ( POA_OldArray::A_i::A_i () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldArray_A_i_optable); -} - -POA_OldArray::A_i::A_i (const A_i& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldArray_A_i_optable); } @@ -1218,7 +1204,7 @@ void POA_OldArray::A_i::_set_attribute_array_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1240,7 +1226,7 @@ const char* POA_OldArray::A_i::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1253,7 +1239,7 @@ void POA_OldArray::A_i::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1809,16 +1795,8 @@ POA_OldArray::_TAO_AMI_A_iHandler_Direct_Proxy_Impl::set_attribute_array_excep ( POA_OldArray::AMI_A_iHandler::AMI_A_iHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldArray_AMI_A_iHandler_optable); -} - -POA_OldArray::AMI_A_iHandler::AMI_A_iHandler (const AMI_A_iHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_OldArray_AMI_A_iHandler_optable); } @@ -2672,7 +2650,7 @@ void POA_OldArray::AMI_A_iHandler::set_attribute_array_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2695,7 +2673,7 @@ const char* POA_OldArray::AMI_A_iHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2708,7 +2686,7 @@ void POA_OldArray::AMI_A_iHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/old_arrayS.h b/tests/IDL_Test/old_arrayS.h index a5d3463..f3ea198 100644 --- a/tests/IDL_Test/old_arrayS.h +++ b/tests/IDL_Test/old_arrayS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_OLD_ARRAYS_ULJLZH_H_ -#define _TAO_IDL_OLD_ARRAYS_ULJLZH_H_ +#ifndef _TAO_IDL_OLD_ARRAYS_QJXBZR_H_ +#define _TAO_IDL_OLD_ARRAYS_QJXBZR_H_ #include /**/ "ace/pre.h" @@ -405,7 +405,7 @@ class TAO_IDL_TEST_STUB_Export A_i typedef ::OldArray::A_i_ptr _stub_ptr_type; typedef ::OldArray::A_i_var _stub_var_type; - A_i (const A_i& rhs); + A_i (const A_i& rhs) = default; virtual ~A_i () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -621,7 +621,7 @@ class TAO_IDL_TEST_STUB_Export AMI_A_iHandler typedef ::OldArray::AMI_A_iHandler_ptr _stub_ptr_type; typedef ::OldArray::AMI_A_iHandler_var _stub_var_type; - AMI_A_iHandler (const AMI_A_iHandler& rhs); + AMI_A_iHandler (const AMI_A_iHandler& rhs) = default; virtual ~AMI_A_iHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/old_constantsC.h b/tests/IDL_Test/old_constantsC.h index 17c6363..b41ceaf 100644 --- a/tests/IDL_Test/old_constantsC.h +++ b/tests/IDL_Test/old_constantsC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_OLD_CONSTANTSC_ICAMQB_H_ -#define _TAO_IDL_OLD_CONSTANTSC_ICAMQB_H_ +#ifndef _TAO_IDL_OLD_CONSTANTSC_BWAXPF_H_ +#define _TAO_IDL_OLD_CONSTANTSC_BWAXPF_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/old_constantsS.cpp b/tests/IDL_Test/old_constantsS.cpp index e181a6c..36d13db 100644 --- a/tests/IDL_Test/old_constantsS.cpp +++ b/tests/IDL_Test/old_constantsS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_OLD_CONSTANTSS_7JW5LT_CPP_ -#define _TAO_IDL_OLD_CONSTANTSS_7JW5LT_CPP_ +#ifndef _TAO_IDL_OLD_CONSTANTSS_CRO6VQ_CPP_ +#define _TAO_IDL_OLD_CONSTANTSS_CRO6VQ_CPP_ #include "old_constantsS.h" @@ -145,15 +145,8 @@ static TAO_OldConstants_M_AMH_A_Perfect_Hash_OpTable tao_OldConstants_M_AMH_A_op POA_OldConstants::M::AMH_A::AMH_A () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldConstants_M_AMH_A_optable); -} - -POA_OldConstants::M::AMH_A::AMH_A (const AMH_A& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldConstants_M_AMH_A_optable); } @@ -211,7 +204,7 @@ POA_OldConstants::M::AMH_A::foo_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -387,15 +380,8 @@ POA_OldConstants::M::_TAO_A_Direct_Proxy_Impl::foo ( POA_OldConstants::M::A::A () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldConstants_M_A_optable); -} - -POA_OldConstants::M::A::A (const A& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldConstants_M_A_optable); } @@ -511,7 +497,7 @@ void POA_OldConstants::M::A::foo_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -533,7 +519,7 @@ const char* POA_OldConstants::M::A::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -546,7 +532,7 @@ void POA_OldConstants::M::A::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -757,16 +743,8 @@ POA_OldConstants::M::_TAO_AMI_AHandler_Direct_Proxy_Impl::foo_excep ( POA_OldConstants::M::AMI_AHandler::AMI_AHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldConstants_M_AMI_AHandler_optable); -} - -POA_OldConstants::M::AMI_AHandler::AMI_AHandler (const AMI_AHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_OldConstants_M_AMI_AHandler_optable); } @@ -961,7 +939,7 @@ void POA_OldConstants::M::AMI_AHandler::foo_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -984,7 +962,7 @@ const char* POA_OldConstants::M::AMI_AHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -997,7 +975,7 @@ void POA_OldConstants::M::AMI_AHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/old_constantsS.h b/tests/IDL_Test/old_constantsS.h index 22626ae..5a95d3c 100644 --- a/tests/IDL_Test/old_constantsS.h +++ b/tests/IDL_Test/old_constantsS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_OLD_CONSTANTSS_7JW5LT_H_ -#define _TAO_IDL_OLD_CONSTANTSS_7JW5LT_H_ +#ifndef _TAO_IDL_OLD_CONSTANTSS_BWAXPF_H_ +#define _TAO_IDL_OLD_CONSTANTSS_BWAXPF_H_ #include /**/ "ace/pre.h" @@ -267,7 +267,7 @@ namespace POA_OldConstants typedef ::OldConstants::M::A_ptr _stub_ptr_type; typedef ::OldConstants::M::A_var _stub_var_type; - A (const A& rhs); + A (const A& rhs) = default; virtual ~A () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -369,7 +369,7 @@ namespace POA_OldConstants typedef ::OldConstants::M::AMI_AHandler_ptr _stub_ptr_type; typedef ::OldConstants::M::AMI_AHandler_var _stub_var_type; - AMI_AHandler (const AMI_AHandler& rhs); + AMI_AHandler (const AMI_AHandler& rhs) = default; virtual ~AMI_AHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/old_sequenceC.h b/tests/IDL_Test/old_sequenceC.h index 8d0f226..7aee611 100644 --- a/tests/IDL_Test/old_sequenceC.h +++ b/tests/IDL_Test/old_sequenceC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_OLD_SEQUENCEC_COTJLE_H_ -#define _TAO_IDL_OLD_SEQUENCEC_COTJLE_H_ +#ifndef _TAO_IDL_OLD_SEQUENCEC_ECIDAX_H_ +#define _TAO_IDL_OLD_SEQUENCEC_ECIDAX_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/old_sequenceS.cpp b/tests/IDL_Test/old_sequenceS.cpp index d3f3e1d..befa951 100644 --- a/tests/IDL_Test/old_sequenceS.cpp +++ b/tests/IDL_Test/old_sequenceS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_OLD_SEQUENCES_F0AFK7_CPP_ -#define _TAO_IDL_OLD_SEQUENCES_F0AFK7_CPP_ +#ifndef _TAO_IDL_OLD_SEQUENCES_TLLC9D_CPP_ +#define _TAO_IDL_OLD_SEQUENCES_TLLC9D_CPP_ #include "old_sequenceS.h" @@ -166,15 +166,8 @@ static TAO_AMH_TestSeq_Perfect_Hash_OpTable tao_AMH_TestSeq_optable; POA_AMH_TestSeq::POA_AMH_TestSeq () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_TestSeq_optable); -} - -POA_AMH_TestSeq::POA_AMH_TestSeq (const POA_AMH_TestSeq& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_TestSeq_optable); } @@ -270,7 +263,7 @@ POA_AMH_TestSeq::_set_fattr_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -486,15 +479,8 @@ _TAO_TestSeq_Direct_Proxy_Impl::_set_fattr ( POA_TestSeq::POA_TestSeq () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_TestSeq_optable); -} - -POA_TestSeq::POA_TestSeq (const POA_TestSeq& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_TestSeq_optable); } @@ -652,7 +638,7 @@ void POA_TestSeq::_set_fattr_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -674,7 +660,7 @@ const char* POA_TestSeq::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -687,7 +673,7 @@ void POA_TestSeq::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -965,16 +951,8 @@ _TAO_AMI_TestSeqHandler_Direct_Proxy_Impl::set_fattr_excep ( POA_AMI_TestSeqHandler::POA_AMI_TestSeqHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_TestSeqHandler_optable); -} - -POA_AMI_TestSeqHandler::POA_AMI_TestSeqHandler (const POA_AMI_TestSeqHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_TestSeqHandler_optable); } @@ -1272,7 +1250,7 @@ void POA_AMI_TestSeqHandler::set_fattr_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1295,7 +1273,7 @@ const char* POA_AMI_TestSeqHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1308,7 +1286,7 @@ void POA_AMI_TestSeqHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/old_sequenceS.h b/tests/IDL_Test/old_sequenceS.h index 3f5cd6c..4dee4bf 100644 --- a/tests/IDL_Test/old_sequenceS.h +++ b/tests/IDL_Test/old_sequenceS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_OLD_SEQUENCES_F0AFK7_H_ -#define _TAO_IDL_OLD_SEQUENCES_F0AFK7_H_ +#ifndef _TAO_IDL_OLD_SEQUENCES_TLLC9D_H_ +#define _TAO_IDL_OLD_SEQUENCES_TLLC9D_H_ #include /**/ "ace/pre.h" @@ -378,7 +378,7 @@ class TAO_IDL_TEST_STUB_Export POA_TestSeq typedef ::TestSeq_ptr _stub_ptr_type; typedef ::TestSeq_var _stub_var_type; - POA_TestSeq (const POA_TestSeq& rhs); + POA_TestSeq (const POA_TestSeq& rhs) = default; virtual ~POA_TestSeq () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -501,7 +501,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_TestSeqHandler typedef ::AMI_TestSeqHandler_ptr _stub_ptr_type; typedef ::AMI_TestSeqHandler_var _stub_var_type; - POA_AMI_TestSeqHandler (const POA_AMI_TestSeqHandler& rhs); + POA_AMI_TestSeqHandler (const POA_AMI_TestSeqHandler& rhs) = default; virtual ~POA_AMI_TestSeqHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/old_structC.h b/tests/IDL_Test/old_structC.h index f9963eb..36009c1 100644 --- a/tests/IDL_Test/old_structC.h +++ b/tests/IDL_Test/old_structC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_OLD_STRUCTC_7KUITK_H_ -#define _TAO_IDL_OLD_STRUCTC_7KUITK_H_ +#ifndef _TAO_IDL_OLD_STRUCTC_FK4Z6H_H_ +#define _TAO_IDL_OLD_STRUCTC_FK4Z6H_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/old_structS.cpp b/tests/IDL_Test/old_structS.cpp index dd5a04f..e0a61ee 100644 --- a/tests/IDL_Test/old_structS.cpp +++ b/tests/IDL_Test/old_structS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_OLD_STRUCTS_5BDSW2_CPP_ -#define _TAO_IDL_OLD_STRUCTS_5BDSW2_CPP_ +#ifndef _TAO_IDL_OLD_STRUCTS_BDAOBU_CPP_ +#define _TAO_IDL_OLD_STRUCTS_BDAOBU_CPP_ #include "old_structS.h" @@ -145,15 +145,8 @@ static TAO_AMH_foo1_Perfect_Hash_OpTable tao_AMH_foo1_optable; POA_AMH_foo1::POA_AMH_foo1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_foo1_optable); -} - -POA_AMH_foo1::POA_AMH_foo1 (const POA_AMH_foo1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_foo1_optable); } @@ -208,7 +201,7 @@ POA_AMH_foo1::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -383,15 +376,8 @@ _TAO_foo1_Direct_Proxy_Impl::op ( POA_foo1::POA_foo1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_foo1_optable); -} - -POA_foo1::POA_foo1 (const POA_foo1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_foo1_optable); } @@ -490,7 +476,7 @@ void POA_foo1::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -512,7 +498,7 @@ const char* POA_foo1::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -525,7 +511,7 @@ void POA_foo1::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -734,16 +720,8 @@ _TAO_AMI_foo1Handler_Direct_Proxy_Impl::op_excep ( POA_AMI_foo1Handler::POA_AMI_foo1Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_foo1Handler_optable); -} - -POA_AMI_foo1Handler::POA_AMI_foo1Handler (const POA_AMI_foo1Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_foo1Handler_optable); } @@ -913,7 +891,7 @@ void POA_AMI_foo1Handler::op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -936,7 +914,7 @@ const char* POA_AMI_foo1Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -949,7 +927,7 @@ void POA_AMI_foo1Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1060,16 +1038,8 @@ static TAO_AMH_foo2_Perfect_Hash_OpTable tao_AMH_foo2_optable; POA_AMH_foo2::POA_AMH_foo2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_foo2_optable); -} - -POA_AMH_foo2::POA_AMH_foo2 (const POA_AMH_foo2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_AMH_foo1 (rhs) { + this->optable_ = std::addressof (tao_AMH_foo2_optable); } @@ -1172,7 +1142,7 @@ POA_AMH_foo2::op3_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1374,16 +1344,8 @@ _TAO_foo2_Direct_Proxy_Impl::op3 ( POA_foo2::POA_foo2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_foo2_optable); -} - -POA_foo2::POA_foo2 (const POA_foo2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_foo1 (rhs) { + this->optable_ = std::addressof (tao_foo2_optable); } @@ -1565,7 +1527,7 @@ void POA_foo2::op3_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1588,7 +1550,7 @@ const char* POA_foo2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1601,7 +1563,7 @@ void POA_foo2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1911,17 +1873,8 @@ _TAO_AMI_foo2Handler_Direct_Proxy_Impl::op3_excep ( POA_AMI_foo2Handler::POA_AMI_foo2Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_foo2Handler_optable); -} - -POA_AMI_foo2Handler::POA_AMI_foo2Handler (const POA_AMI_foo2Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_AMI_foo1Handler (rhs) { + this->optable_ = std::addressof (tao_AMI_foo2Handler_optable); } @@ -2245,7 +2198,7 @@ void POA_AMI_foo2Handler::op3_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2269,7 +2222,7 @@ const char* POA_AMI_foo2Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2282,7 +2235,7 @@ void POA_AMI_foo2Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/old_structS.h b/tests/IDL_Test/old_structS.h index dd78d12..325d7c7 100644 --- a/tests/IDL_Test/old_structS.h +++ b/tests/IDL_Test/old_structS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_OLD_STRUCTS_JHLG9R_H_ -#define _TAO_IDL_OLD_STRUCTS_JHLG9R_H_ +#ifndef _TAO_IDL_OLD_STRUCTS_BDAOBU_H_ +#define _TAO_IDL_OLD_STRUCTS_BDAOBU_H_ #include /**/ "ace/pre.h" @@ -383,7 +383,7 @@ class TAO_IDL_TEST_STUB_Export POA_foo1 typedef ::foo1_ptr _stub_ptr_type; typedef ::foo1_var _stub_var_type; - POA_foo1 (const POA_foo1& rhs); + POA_foo1 (const POA_foo1& rhs) = default; virtual ~POA_foo1 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -483,7 +483,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_foo1Handler typedef ::AMI_foo1Handler_ptr _stub_ptr_type; typedef ::AMI_foo1Handler_var _stub_var_type; - POA_AMI_foo1Handler (const POA_AMI_foo1Handler& rhs); + POA_AMI_foo1Handler (const POA_AMI_foo1Handler& rhs) = default; virtual ~POA_AMI_foo1Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -630,7 +630,7 @@ class TAO_IDL_TEST_STUB_Export POA_foo2 typedef ::foo2_ptr _stub_ptr_type; typedef ::foo2_var _stub_var_type; - POA_foo2 (const POA_foo2& rhs); + POA_foo2 (const POA_foo2& rhs) = default; virtual ~POA_foo2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -758,7 +758,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_foo2Handler typedef ::AMI_foo2Handler_ptr _stub_ptr_type; typedef ::AMI_foo2Handler_var _stub_var_type; - POA_AMI_foo2Handler (const POA_AMI_foo2Handler& rhs); + POA_AMI_foo2Handler (const POA_AMI_foo2Handler& rhs) = default; virtual ~POA_AMI_foo2Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/old_union2C.h b/tests/IDL_Test/old_union2C.h index c49fa64..93a4d44 100644 --- a/tests/IDL_Test/old_union2C.h +++ b/tests/IDL_Test/old_union2C.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_OLD_UNION2C_GUYCB4_H_ -#define _TAO_IDL_OLD_UNION2C_GUYCB4_H_ +#ifndef _TAO_IDL_OLD_UNION2C_DUPZQF_H_ +#define _TAO_IDL_OLD_UNION2C_DUPZQF_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/old_union2S.cpp b/tests/IDL_Test/old_union2S.cpp index 8ad9bba..985126d 100644 --- a/tests/IDL_Test/old_union2S.cpp +++ b/tests/IDL_Test/old_union2S.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_OLD_UNION2S_GUYCB4_CPP_ -#define _TAO_IDL_OLD_UNION2S_GUYCB4_CPP_ +#ifndef _TAO_IDL_OLD_UNION2S_DUPZQF_CPP_ +#define _TAO_IDL_OLD_UNION2S_DUPZQF_CPP_ #include "old_union2S.h" diff --git a/tests/IDL_Test/old_union2S.h b/tests/IDL_Test/old_union2S.h index 6c06aff..4eca0b2 100644 --- a/tests/IDL_Test/old_union2S.h +++ b/tests/IDL_Test/old_union2S.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_OLD_UNION2S_GUYCB4_H_ -#define _TAO_IDL_OLD_UNION2S_GUYCB4_H_ +#ifndef _TAO_IDL_OLD_UNION2S_DUPZQF_H_ +#define _TAO_IDL_OLD_UNION2S_DUPZQF_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/old_unionC.h b/tests/IDL_Test/old_unionC.h index 694c6cd..abe6644 100644 --- a/tests/IDL_Test/old_unionC.h +++ b/tests/IDL_Test/old_unionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_OLD_UNIONC_RGEHBJ_H_ -#define _TAO_IDL_OLD_UNIONC_RGEHBJ_H_ +#ifndef _TAO_IDL_OLD_UNIONC_PHIPSF_H_ +#define _TAO_IDL_OLD_UNIONC_PHIPSF_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/old_unionS.cpp b/tests/IDL_Test/old_unionS.cpp index 98a1ae8..3320869 100644 --- a/tests/IDL_Test/old_unionS.cpp +++ b/tests/IDL_Test/old_unionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_OLD_UNIONS_33RY42_CPP_ -#define _TAO_IDL_OLD_UNIONS_33RY42_CPP_ +#ifndef _TAO_IDL_OLD_UNIONS_PGS0QJ_CPP_ +#define _TAO_IDL_OLD_UNIONS_PGS0QJ_CPP_ #include "old_unionS.h" @@ -145,15 +145,8 @@ static TAO_OldUnion_AMH_a_Perfect_Hash_OpTable tao_OldUnion_AMH_a_optable; POA_OldUnion::AMH_a::AMH_a () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldUnion_AMH_a_optable); -} - -POA_OldUnion::AMH_a::AMH_a (const AMH_a& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldUnion_AMH_a_optable); } @@ -208,7 +201,7 @@ POA_OldUnion::AMH_a::opA_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -382,15 +375,8 @@ POA_OldUnion::_TAO_a_Direct_Proxy_Impl::opA ( POA_OldUnion::a::a () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldUnion_a_optable); -} - -POA_OldUnion::a::a (const a& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldUnion_a_optable); } @@ -484,7 +470,7 @@ void POA_OldUnion::a::opA_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -506,7 +492,7 @@ const char* POA_OldUnion::a::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -519,7 +505,7 @@ void POA_OldUnion::a::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -724,16 +710,8 @@ POA_OldUnion::_TAO_AMI_aHandler_Direct_Proxy_Impl::opA_excep ( POA_OldUnion::AMI_aHandler::AMI_aHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldUnion_AMI_aHandler_optable); -} - -POA_OldUnion::AMI_aHandler::AMI_aHandler (const AMI_aHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_OldUnion_AMI_aHandler_optable); } @@ -902,7 +880,7 @@ void POA_OldUnion::AMI_aHandler::opA_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -925,7 +903,7 @@ const char* POA_OldUnion::AMI_aHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -938,7 +916,7 @@ void POA_OldUnion::AMI_aHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/old_unionS.h b/tests/IDL_Test/old_unionS.h index 027fbe6..b1aae8c 100644 --- a/tests/IDL_Test/old_unionS.h +++ b/tests/IDL_Test/old_unionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_OLD_UNIONS_33RY42_H_ -#define _TAO_IDL_OLD_UNIONS_33RY42_H_ +#ifndef _TAO_IDL_OLD_UNIONS_PHIPSF_H_ +#define _TAO_IDL_OLD_UNIONS_PHIPSF_H_ #include /**/ "ace/pre.h" @@ -274,7 +274,7 @@ class TAO_IDL_TEST_STUB_Export a typedef ::OldUnion::a_ptr _stub_ptr_type; typedef ::OldUnion::a_var _stub_var_type; - a (const a& rhs); + a (const a& rhs) = default; virtual ~a () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -372,7 +372,7 @@ class TAO_IDL_TEST_STUB_Export AMI_aHandler typedef ::OldUnion::AMI_aHandler_ptr _stub_ptr_type; typedef ::OldUnion::AMI_aHandler_var _stub_var_type; - AMI_aHandler (const AMI_aHandler& rhs); + AMI_aHandler (const AMI_aHandler& rhs) = default; virtual ~AMI_aHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/paramsC.h b/tests/IDL_Test/paramsC.h index fc1965e..970e508 100644 --- a/tests/IDL_Test/paramsC.h +++ b/tests/IDL_Test/paramsC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_PARAMSC_ZSGKYD_H_ -#define _TAO_IDL_PARAMSC_ZSGKYD_H_ +#ifndef _TAO_IDL_PARAMSC_YAOVH8_H_ +#define _TAO_IDL_PARAMSC_YAOVH8_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/paramsS.cpp b/tests/IDL_Test/paramsS.cpp index 8e73907..3b3ff65 100644 --- a/tests/IDL_Test/paramsS.cpp +++ b/tests/IDL_Test/paramsS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_PARAMSS_3ZPUER_CPP_ -#define _TAO_IDL_PARAMSS_3ZPUER_CPP_ +#ifndef _TAO_IDL_PARAMSS_UTWMUC_CPP_ +#define _TAO_IDL_PARAMSS_UTWMUC_CPP_ #include "paramsS.h" @@ -144,15 +144,8 @@ static TAO_foo_bar_AMH_fooBar_Perfect_Hash_OpTable tao_foo_bar_AMH_fooBar_optabl POA_foo::bar::AMH_fooBar::AMH_fooBar () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_foo_bar_AMH_fooBar_optable); -} - -POA_foo::bar::AMH_fooBar::AMH_fooBar (const AMH_fooBar& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_foo_bar_AMH_fooBar_optable); } @@ -210,7 +203,7 @@ POA_foo::bar::AMH_fooBar::getDate_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -385,15 +378,8 @@ POA_foo::bar::_TAO_fooBar_Direct_Proxy_Impl::getDate ( POA_foo::bar::fooBar::fooBar () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_foo_bar_fooBar_optable); -} - -POA_foo::bar::fooBar::fooBar (const fooBar& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_foo_bar_fooBar_optable); } @@ -509,7 +495,7 @@ void POA_foo::bar::fooBar::getDate_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -531,7 +517,7 @@ const char* POA_foo::bar::fooBar::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -544,7 +530,7 @@ void POA_foo::bar::fooBar::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -755,16 +741,8 @@ POA_foo::bar::_TAO_AMI_fooBarHandler_Direct_Proxy_Impl::getDate_excep ( POA_foo::bar::AMI_fooBarHandler::AMI_fooBarHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_foo_bar_AMI_fooBarHandler_optable); -} - -POA_foo::bar::AMI_fooBarHandler::AMI_fooBarHandler (const AMI_fooBarHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_foo_bar_AMI_fooBarHandler_optable); } @@ -959,7 +937,7 @@ void POA_foo::bar::AMI_fooBarHandler::getDate_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -982,7 +960,7 @@ const char* POA_foo::bar::AMI_fooBarHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -995,7 +973,7 @@ void POA_foo::bar::AMI_fooBarHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/paramsS.h b/tests/IDL_Test/paramsS.h index 163c703..cf93867 100644 --- a/tests/IDL_Test/paramsS.h +++ b/tests/IDL_Test/paramsS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_PARAMSS_3ZPUER_H_ -#define _TAO_IDL_PARAMSS_3ZPUER_H_ +#ifndef _TAO_IDL_PARAMSS_UTWMUC_H_ +#define _TAO_IDL_PARAMSS_UTWMUC_H_ #include /**/ "ace/pre.h" @@ -253,7 +253,7 @@ namespace POA_foo typedef ::foo::bar::fooBar_ptr _stub_ptr_type; typedef ::foo::bar::fooBar_var _stub_var_type; - fooBar (const fooBar& rhs); + fooBar (const fooBar& rhs) = default; virtual ~fooBar () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -355,7 +355,7 @@ namespace POA_foo typedef ::foo::bar::AMI_fooBarHandler_ptr _stub_ptr_type; typedef ::foo::bar::AMI_fooBarHandler_var _stub_var_type; - AMI_fooBarHandler (const AMI_fooBarHandler& rhs); + AMI_fooBarHandler (const AMI_fooBarHandler& rhs) = default; virtual ~AMI_fooBarHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/pragmaA.h b/tests/IDL_Test/pragmaA.h index 78a83e3..cc3e207 100644 --- a/tests/IDL_Test/pragmaA.h +++ b/tests/IDL_Test/pragmaA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_PRAGMAA_YSKYIW_H_ -#define _TAO_IDL_PRAGMAA_YSKYIW_H_ +#ifndef _TAO_IDL_PRAGMAA_RJG6JT_H_ +#define _TAO_IDL_PRAGMAA_RJG6JT_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/pragmaC.h b/tests/IDL_Test/pragmaC.h index 0af9796..aac329f 100644 --- a/tests/IDL_Test/pragmaC.h +++ b/tests/IDL_Test/pragmaC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_PRAGMAC_YSKYIW_H_ -#define _TAO_IDL_PRAGMAC_YSKYIW_H_ +#ifndef _TAO_IDL_PRAGMAC_RJG6JT_H_ +#define _TAO_IDL_PRAGMAC_RJG6JT_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/pragmaS.cpp b/tests/IDL_Test/pragmaS.cpp index 8580758..7b6187a 100644 --- a/tests/IDL_Test/pragmaS.cpp +++ b/tests/IDL_Test/pragmaS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_PRAGMAS_E8NRKZ_CPP_ -#define _TAO_IDL_PRAGMAS_E8NRKZ_CPP_ +#ifndef _TAO_IDL_PRAGMAS_NZNUBS_CPP_ +#define _TAO_IDL_PRAGMAS_NZNUBS_CPP_ #include "pragmaS.h" @@ -145,20 +145,14 @@ static TAO_AMH_hello_Perfect_Hash_OpTable tao_AMH_hello_optable; POA_AMH_hello::POA_AMH_hello () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_hello_optable); -} - -POA_AMH_hello::POA_AMH_hello (const POA_AMH_hello& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_AMH_hello_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -309,20 +303,14 @@ _TAO_hello_Direct_Proxy_Impl::~_TAO_hello_Direct_Proxy_Impl () POA_hello::POA_hello () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_hello_optable); -} - -POA_hello::POA_hello (const POA_hello& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_hello_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -344,7 +332,7 @@ const char* POA_hello::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -357,7 +345,7 @@ void POA_hello::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -483,21 +471,14 @@ _TAO_AMI_helloHandler_Direct_Proxy_Impl::~_TAO_AMI_helloHandler_Direct_Proxy_Imp POA_AMI_helloHandler::POA_AMI_helloHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_helloHandler_optable); -} - -POA_AMI_helloHandler::POA_AMI_helloHandler (const POA_AMI_helloHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_helloHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -520,7 +501,7 @@ const char* POA_AMI_helloHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -533,7 +514,7 @@ void POA_AMI_helloHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -641,20 +622,14 @@ static TAO_AMH_goodbye_Perfect_Hash_OpTable tao_AMH_goodbye_optable; POA_AMH_goodbye::POA_AMH_goodbye () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_goodbye_optable); -} - -POA_AMH_goodbye::POA_AMH_goodbye (const POA_AMH_goodbye& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_AMH_goodbye_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -805,20 +780,14 @@ _TAO_goodbye_Direct_Proxy_Impl::~_TAO_goodbye_Direct_Proxy_Impl () POA_goodbye::POA_goodbye () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_goodbye_optable); -} - -POA_goodbye::POA_goodbye (const POA_goodbye& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_goodbye_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -840,7 +809,7 @@ const char* POA_goodbye::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -853,7 +822,7 @@ void POA_goodbye::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -979,21 +948,14 @@ _TAO_AMI_goodbyeHandler_Direct_Proxy_Impl::~_TAO_AMI_goodbyeHandler_Direct_Proxy POA_AMI_goodbyeHandler::POA_AMI_goodbyeHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_goodbyeHandler_optable); -} - -POA_AMI_goodbyeHandler::POA_AMI_goodbyeHandler (const POA_AMI_goodbyeHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_goodbyeHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1016,7 +978,7 @@ const char* POA_AMI_goodbyeHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1029,7 +991,7 @@ void POA_AMI_goodbyeHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1137,20 +1099,14 @@ static TAO_salutation_AMH_sayonara_Perfect_Hash_OpTable tao_salutation_AMH_sayon POA_salutation::AMH_sayonara::AMH_sayonara () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_salutation_AMH_sayonara_optable); -} - -POA_salutation::AMH_sayonara::AMH_sayonara (const AMH_sayonara& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_salutation_AMH_sayonara_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1301,20 +1257,14 @@ POA_salutation::_TAO_sayonara_Direct_Proxy_Impl::~_TAO_sayonara_Direct_Proxy_Imp POA_salutation::sayonara::sayonara () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_salutation_sayonara_optable); -} - -POA_salutation::sayonara::sayonara (const sayonara& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_salutation_sayonara_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1336,7 +1286,7 @@ const char* POA_salutation::sayonara::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1349,7 +1299,7 @@ void POA_salutation::sayonara::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1475,21 +1425,14 @@ POA_salutation::_TAO_AMI_sayonaraHandler_Direct_Proxy_Impl::~_TAO_AMI_sayonaraHa POA_salutation::AMI_sayonaraHandler::AMI_sayonaraHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_salutation_AMI_sayonaraHandler_optable); -} - -POA_salutation::AMI_sayonaraHandler::AMI_sayonaraHandler (const AMI_sayonaraHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_salutation_AMI_sayonaraHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1512,7 +1455,7 @@ const char* POA_salutation::AMI_sayonaraHandler::_interface_repository_id () con // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1525,7 +1468,7 @@ void POA_salutation::AMI_sayonaraHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1633,20 +1576,14 @@ static TAO_AMH_ciao_Perfect_Hash_OpTable tao_AMH_ciao_optable; POA_AMH_ciao::POA_AMH_ciao () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_ciao_optable); -} - -POA_AMH_ciao::POA_AMH_ciao (const POA_AMH_ciao& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_AMH_ciao_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1797,20 +1734,14 @@ _TAO_ciao_Direct_Proxy_Impl::~_TAO_ciao_Direct_Proxy_Impl () POA_ciao::POA_ciao () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_ciao_optable); -} - -POA_ciao::POA_ciao (const POA_ciao& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_ciao_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1832,7 +1763,7 @@ const char* POA_ciao::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1845,7 +1776,7 @@ void POA_ciao::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1971,21 +1902,14 @@ _TAO_AMI_ciaoHandler_Direct_Proxy_Impl::~_TAO_AMI_ciaoHandler_Direct_Proxy_Impl POA_AMI_ciaoHandler::POA_AMI_ciaoHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_ciaoHandler_optable); -} - -POA_AMI_ciaoHandler::POA_AMI_ciaoHandler (const POA_AMI_ciaoHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_ciaoHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2008,7 +1932,7 @@ const char* POA_AMI_ciaoHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2021,7 +1945,7 @@ void POA_AMI_ciaoHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2129,20 +2053,14 @@ static TAO_AMH_aloha_Perfect_Hash_OpTable tao_AMH_aloha_optable; POA_AMH_aloha::POA_AMH_aloha () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMH_aloha_optable); -} - -POA_AMH_aloha::POA_AMH_aloha (const POA_AMH_aloha& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_AMH_aloha_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2293,20 +2211,14 @@ _TAO_aloha_Direct_Proxy_Impl::~_TAO_aloha_Direct_Proxy_Impl () POA_aloha::POA_aloha () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_aloha_optable); -} - -POA_aloha::POA_aloha (const POA_aloha& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_aloha_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2328,7 +2240,7 @@ const char* POA_aloha::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2341,7 +2253,7 @@ void POA_aloha::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2467,21 +2379,14 @@ _TAO_AMI_alohaHandler_Direct_Proxy_Impl::~_TAO_AMI_alohaHandler_Direct_Proxy_Imp POA_AMI_alohaHandler::POA_AMI_alohaHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AMI_alohaHandler_optable); -} - -POA_AMI_alohaHandler::POA_AMI_alohaHandler (const POA_AMI_alohaHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AMI_alohaHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2504,7 +2409,7 @@ const char* POA_AMI_alohaHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2517,7 +2422,7 @@ void POA_AMI_alohaHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/pragmaS.h b/tests/IDL_Test/pragmaS.h index 410a318..280509a 100644 --- a/tests/IDL_Test/pragmaS.h +++ b/tests/IDL_Test/pragmaS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_PRAGMAS_U4M6H4_H_ -#define _TAO_IDL_PRAGMAS_U4M6H4_H_ +#ifndef _TAO_IDL_PRAGMAS_NZNUBS_H_ +#define _TAO_IDL_PRAGMAS_NZNUBS_H_ #include /**/ "ace/pre.h" @@ -448,7 +448,7 @@ class TAO_IDL_TEST_STUB_Export POA_hello typedef ::hello_ptr _stub_ptr_type; typedef ::hello_var _stub_var_type; - POA_hello (const POA_hello& rhs); + POA_hello (const POA_hello& rhs) = default; virtual ~POA_hello () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -519,7 +519,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_helloHandler typedef ::AMI_helloHandler_ptr _stub_ptr_type; typedef ::AMI_helloHandler_var _stub_var_type; - POA_AMI_helloHandler (const POA_AMI_helloHandler& rhs); + POA_AMI_helloHandler (const POA_AMI_helloHandler& rhs) = default; virtual ~POA_AMI_helloHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -604,7 +604,7 @@ class TAO_IDL_TEST_STUB_Export POA_goodbye typedef ::goodbye_ptr _stub_ptr_type; typedef ::goodbye_var _stub_var_type; - POA_goodbye (const POA_goodbye& rhs); + POA_goodbye (const POA_goodbye& rhs) = default; virtual ~POA_goodbye () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -675,7 +675,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_goodbyeHandler typedef ::AMI_goodbyeHandler_ptr _stub_ptr_type; typedef ::AMI_goodbyeHandler_var _stub_var_type; - POA_AMI_goodbyeHandler (const POA_AMI_goodbyeHandler& rhs); + POA_AMI_goodbyeHandler (const POA_AMI_goodbyeHandler& rhs) = default; virtual ~POA_AMI_goodbyeHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -778,7 +778,7 @@ class TAO_IDL_TEST_STUB_Export sayonara typedef ::salutation::sayonara_ptr _stub_ptr_type; typedef ::salutation::sayonara_var _stub_var_type; - sayonara (const sayonara& rhs); + sayonara (const sayonara& rhs) = default; virtual ~sayonara () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -849,7 +849,7 @@ class TAO_IDL_TEST_STUB_Export AMI_sayonaraHandler typedef ::salutation::AMI_sayonaraHandler_ptr _stub_ptr_type; typedef ::salutation::AMI_sayonaraHandler_var _stub_var_type; - AMI_sayonaraHandler (const AMI_sayonaraHandler& rhs); + AMI_sayonaraHandler (const AMI_sayonaraHandler& rhs) = default; virtual ~AMI_sayonaraHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -940,7 +940,7 @@ class TAO_IDL_TEST_STUB_Export POA_ciao typedef ::ciao_ptr _stub_ptr_type; typedef ::ciao_var _stub_var_type; - POA_ciao (const POA_ciao& rhs); + POA_ciao (const POA_ciao& rhs) = default; virtual ~POA_ciao () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1011,7 +1011,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_ciaoHandler typedef ::AMI_ciaoHandler_ptr _stub_ptr_type; typedef ::AMI_ciaoHandler_var _stub_var_type; - POA_AMI_ciaoHandler (const POA_AMI_ciaoHandler& rhs); + POA_AMI_ciaoHandler (const POA_AMI_ciaoHandler& rhs) = default; virtual ~POA_AMI_ciaoHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1096,7 +1096,7 @@ class TAO_IDL_TEST_STUB_Export POA_aloha typedef ::aloha_ptr _stub_ptr_type; typedef ::aloha_var _stub_var_type; - POA_aloha (const POA_aloha& rhs); + POA_aloha (const POA_aloha& rhs) = default; virtual ~POA_aloha () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1167,7 +1167,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_alohaHandler typedef ::AMI_alohaHandler_ptr _stub_ptr_type; typedef ::AMI_alohaHandler_var _stub_var_type; - POA_AMI_alohaHandler (const POA_AMI_alohaHandler& rhs); + POA_AMI_alohaHandler (const POA_AMI_alohaHandler& rhs) = default; virtual ~POA_AMI_alohaHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/primtypesA.h b/tests/IDL_Test/primtypesA.h index ae5d3ea..9230e79 100644 --- a/tests/IDL_Test/primtypesA.h +++ b/tests/IDL_Test/primtypesA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_PRIMTYPESA_7UVSM2_H_ -#define _TAO_IDL_PRIMTYPESA_7UVSM2_H_ +#ifndef _TAO_IDL_PRIMTYPESA_TDP8NP_H_ +#define _TAO_IDL_PRIMTYPESA_TDP8NP_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/primtypesC.h b/tests/IDL_Test/primtypesC.h index 08ec3c7..bee5e5e 100644 --- a/tests/IDL_Test/primtypesC.h +++ b/tests/IDL_Test/primtypesC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_PRIMTYPESC_7UVSM2_H_ -#define _TAO_IDL_PRIMTYPESC_7UVSM2_H_ +#ifndef _TAO_IDL_PRIMTYPESC_TDP8NP_H_ +#define _TAO_IDL_PRIMTYPESC_TDP8NP_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/primtypesS.cpp b/tests/IDL_Test/primtypesS.cpp index 331b9d5..25bc838 100644 --- a/tests/IDL_Test/primtypesS.cpp +++ b/tests/IDL_Test/primtypesS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_PRIMTYPESS_ONZY9R_CPP_ -#define _TAO_IDL_PRIMTYPESS_ONZY9R_CPP_ +#ifndef _TAO_IDL_PRIMTYPESS_5DP4QD_CPP_ +#define _TAO_IDL_PRIMTYPESS_5DP4QD_CPP_ #include "primtypesS.h" @@ -168,15 +168,8 @@ static TAO_OldPrimTypes_AMH_ex1_Perfect_Hash_OpTable tao_OldPrimTypes_AMH_ex1_op POA_OldPrimTypes::AMH_ex1::AMH_ex1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldPrimTypes_AMH_ex1_optable); -} - -POA_OldPrimTypes::AMH_ex1::AMH_ex1 (const AMH_ex1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldPrimTypes_AMH_ex1_optable); } @@ -407,7 +400,7 @@ POA_OldPrimTypes::AMH_ex1::mtypes_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -691,15 +684,8 @@ POA_OldPrimTypes::_TAO_ex1_Direct_Proxy_Impl::mtypes ( POA_OldPrimTypes::ex1::ex1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldPrimTypes_ex1_optable); -} - -POA_OldPrimTypes::ex1::ex1 (const ex1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OldPrimTypes_ex1_optable); } @@ -1219,7 +1205,7 @@ void POA_OldPrimTypes::ex1::mtypes_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1241,7 +1227,7 @@ const char* POA_OldPrimTypes::ex1::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1254,7 +1240,7 @@ void POA_OldPrimTypes::ex1::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1733,16 +1719,8 @@ POA_OldPrimTypes::_TAO_AMI_ex1Handler_Direct_Proxy_Impl::mtypes_excep ( POA_OldPrimTypes::AMI_ex1Handler::AMI_ex1Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldPrimTypes_AMI_ex1Handler_optable); -} - -POA_OldPrimTypes::AMI_ex1Handler::AMI_ex1Handler (const AMI_ex1Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_OldPrimTypes_AMI_ex1Handler_optable); } @@ -2506,7 +2484,7 @@ void POA_OldPrimTypes::AMI_ex1Handler::mtypes_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2529,7 +2507,7 @@ const char* POA_OldPrimTypes::AMI_ex1Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2542,7 +2520,7 @@ void POA_OldPrimTypes::AMI_ex1Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2676,16 +2654,8 @@ static TAO_OldPrimTypes_AMH_ex2_Perfect_Hash_OpTable tao_OldPrimTypes_AMH_ex2_op POA_OldPrimTypes::AMH_ex2::AMH_ex2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldPrimTypes_AMH_ex2_optable); -} - -POA_OldPrimTypes::AMH_ex2::AMH_ex2 (const AMH_ex2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldPrimTypes::AMH_ex1 (rhs) { + this->optable_ = std::addressof (tao_OldPrimTypes_AMH_ex2_optable); } @@ -2818,7 +2788,7 @@ POA_OldPrimTypes::AMH_ex2::mv_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3063,16 +3033,8 @@ POA_OldPrimTypes::_TAO_ex2_Direct_Proxy_Impl::mv ( POA_OldPrimTypes::ex2::ex2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldPrimTypes_ex2_optable); -} - -POA_OldPrimTypes::ex2::ex2 (const ex2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_OldPrimTypes::ex1 (rhs) { + this->optable_ = std::addressof (tao_OldPrimTypes_ex2_optable); } @@ -3317,7 +3279,7 @@ void POA_OldPrimTypes::ex2::mv_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3340,7 +3302,7 @@ const char* POA_OldPrimTypes::ex2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3353,7 +3315,7 @@ void POA_OldPrimTypes::ex2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3741,17 +3703,8 @@ POA_OldPrimTypes::_TAO_AMI_ex2Handler_Direct_Proxy_Impl::mv_excep ( POA_OldPrimTypes::AMI_ex2Handler::AMI_ex2Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OldPrimTypes_AMI_ex2Handler_optable); -} - -POA_OldPrimTypes::AMI_ex2Handler::AMI_ex2Handler (const AMI_ex2Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_OldPrimTypes::AMI_ex1Handler (rhs) { + this->optable_ = std::addressof (tao_OldPrimTypes_AMI_ex2Handler_optable); } @@ -4236,7 +4189,7 @@ void POA_OldPrimTypes::AMI_ex2Handler::mv_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4260,7 +4213,7 @@ const char* POA_OldPrimTypes::AMI_ex2Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4273,7 +4226,7 @@ void POA_OldPrimTypes::AMI_ex2Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/primtypesS.h b/tests/IDL_Test/primtypesS.h index 8b49c37..1b56ab2 100644 --- a/tests/IDL_Test/primtypesS.h +++ b/tests/IDL_Test/primtypesS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_PRIMTYPESS_ONZY9R_H_ -#define _TAO_IDL_PRIMTYPESS_ONZY9R_H_ +#ifndef _TAO_IDL_PRIMTYPESS_5DP4QD_H_ +#define _TAO_IDL_PRIMTYPESS_5DP4QD_H_ #include /**/ "ace/pre.h" @@ -329,7 +329,7 @@ class TAO_IDL_TEST_STUB_Export ex1 typedef ::OldPrimTypes::ex1_ptr _stub_ptr_type; typedef ::OldPrimTypes::ex1_var _stub_var_type; - ex1 (const ex1& rhs); + ex1 (const ex1& rhs) = default; virtual ~ex1 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -540,7 +540,7 @@ class TAO_IDL_TEST_STUB_Export AMI_ex1Handler typedef ::OldPrimTypes::AMI_ex1Handler_ptr _stub_ptr_type; typedef ::OldPrimTypes::AMI_ex1Handler_var _stub_var_type; - AMI_ex1Handler (const AMI_ex1Handler& rhs); + AMI_ex1Handler (const AMI_ex1Handler& rhs) = default; virtual ~AMI_ex1Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -812,7 +812,7 @@ class TAO_IDL_TEST_STUB_Export ex2 typedef ::OldPrimTypes::ex2_ptr _stub_ptr_type; typedef ::OldPrimTypes::ex2_var _stub_var_type; - ex2 (const ex2& rhs); + ex2 (const ex2& rhs) = default; virtual ~ex2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -964,7 +964,7 @@ class TAO_IDL_TEST_STUB_Export AMI_ex2Handler typedef ::OldPrimTypes::AMI_ex2Handler_ptr _stub_ptr_type; typedef ::OldPrimTypes::AMI_ex2Handler_var _stub_var_type; - AMI_ex2Handler (const AMI_ex2Handler& rhs); + AMI_ex2Handler (const AMI_ex2Handler& rhs) = default; virtual ~AMI_ex2Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/reopen_include1C.h b/tests/IDL_Test/reopen_include1C.h index 9d587dc..9712c2a 100644 --- a/tests/IDL_Test/reopen_include1C.h +++ b/tests/IDL_Test/reopen_include1C.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_REOPEN_INCLUDE1C_JBYRBC_H_ -#define _TAO_IDL_REOPEN_INCLUDE1C_JBYRBC_H_ +#ifndef _TAO_IDL_REOPEN_INCLUDE1C_FBFACW_H_ +#define _TAO_IDL_REOPEN_INCLUDE1C_FBFACW_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/reopen_include1S.cpp b/tests/IDL_Test/reopen_include1S.cpp index 4d5be55..eabfea7 100644 --- a/tests/IDL_Test/reopen_include1S.cpp +++ b/tests/IDL_Test/reopen_include1S.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_REOPEN_INCLUDE1S_JBYRBC_CPP_ -#define _TAO_IDL_REOPEN_INCLUDE1S_JBYRBC_CPP_ +#ifndef _TAO_IDL_REOPEN_INCLUDE1S_0Q89V0_CPP_ +#define _TAO_IDL_REOPEN_INCLUDE1S_0Q89V0_CPP_ #include "reopen_include1S.h" @@ -145,15 +145,8 @@ static TAO_A_B_AMH_X1_Perfect_Hash_OpTable tao_A_B_AMH_X1_optable; POA_A::B::AMH_X1::AMH_X1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_B_AMH_X1_optable); -} - -POA_A::B::AMH_X1::AMH_X1 (const AMH_X1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_A_B_AMH_X1_optable); } @@ -199,7 +192,7 @@ POA_A::B::AMH_X1::getX1_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -372,15 +365,8 @@ POA_A::B::_TAO_X1_Direct_Proxy_Impl::getX1 ( POA_A::B::X1::X1 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_B_X1_optable); -} - -POA_A::B::X1::X1 (const X1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_A_B_X1_optable); } @@ -469,7 +455,7 @@ void POA_A::B::X1::getX1_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -491,7 +477,7 @@ const char* POA_A::B::X1::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -504,7 +490,7 @@ void POA_A::B::X1::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -709,16 +695,8 @@ POA_A::B::_TAO_AMI_X1Handler_Direct_Proxy_Impl::getX1_excep ( POA_A::B::AMI_X1Handler::AMI_X1Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_B_AMI_X1Handler_optable); -} - -POA_A::B::AMI_X1Handler::AMI_X1Handler (const AMI_X1Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_A_B_AMI_X1Handler_optable); } @@ -895,7 +873,7 @@ void POA_A::B::AMI_X1Handler::getX1_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -918,7 +896,7 @@ const char* POA_A::B::AMI_X1Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -931,7 +909,7 @@ void POA_A::B::AMI_X1Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/reopen_include1S.h b/tests/IDL_Test/reopen_include1S.h index b46edc4..39d2824 100644 --- a/tests/IDL_Test/reopen_include1S.h +++ b/tests/IDL_Test/reopen_include1S.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_REOPEN_INCLUDE1S_JBYRBC_H_ -#define _TAO_IDL_REOPEN_INCLUDE1S_JBYRBC_H_ +#ifndef _TAO_IDL_REOPEN_INCLUDE1S_0Q89V0_H_ +#define _TAO_IDL_REOPEN_INCLUDE1S_0Q89V0_H_ #include /**/ "ace/pre.h" @@ -249,7 +249,7 @@ namespace POA_A typedef ::A::B::X1_ptr _stub_ptr_type; typedef ::A::B::X1_var _stub_var_type; - X1 (const X1& rhs); + X1 (const X1& rhs) = default; virtual ~X1 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -346,7 +346,7 @@ namespace POA_A typedef ::A::B::AMI_X1Handler_ptr _stub_ptr_type; typedef ::A::B::AMI_X1Handler_var _stub_var_type; - AMI_X1Handler (const AMI_X1Handler& rhs); + AMI_X1Handler (const AMI_X1Handler& rhs) = default; virtual ~AMI_X1Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/reopen_include2C.h b/tests/IDL_Test/reopen_include2C.h index 026442a..2ba7914 100644 --- a/tests/IDL_Test/reopen_include2C.h +++ b/tests/IDL_Test/reopen_include2C.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_REOPEN_INCLUDE2C_RTGQ84_H_ -#define _TAO_IDL_REOPEN_INCLUDE2C_RTGQ84_H_ +#ifndef _TAO_IDL_REOPEN_INCLUDE2C_LTV0PX_H_ +#define _TAO_IDL_REOPEN_INCLUDE2C_LTV0PX_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/reopen_include2S.cpp b/tests/IDL_Test/reopen_include2S.cpp index 5616db9..4caa5a2 100644 --- a/tests/IDL_Test/reopen_include2S.cpp +++ b/tests/IDL_Test/reopen_include2S.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_REOPEN_INCLUDE2S_XX2PBZ_CPP_ -#define _TAO_IDL_REOPEN_INCLUDE2S_XX2PBZ_CPP_ +#ifndef _TAO_IDL_REOPEN_INCLUDE2S_LTV0PX_CPP_ +#define _TAO_IDL_REOPEN_INCLUDE2S_LTV0PX_CPP_ #include "reopen_include2S.h" @@ -145,15 +145,8 @@ static TAO_A_B_AMH_X2_Perfect_Hash_OpTable tao_A_B_AMH_X2_optable; POA_A::B::AMH_X2::AMH_X2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_B_AMH_X2_optable); -} - -POA_A::B::AMH_X2::AMH_X2 (const AMH_X2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_A_B_AMH_X2_optable); } @@ -199,7 +192,7 @@ POA_A::B::AMH_X2::getX2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -372,15 +365,8 @@ POA_A::B::_TAO_X2_Direct_Proxy_Impl::getX2 ( POA_A::B::X2::X2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_B_X2_optable); -} - -POA_A::B::X2::X2 (const X2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_A_B_X2_optable); } @@ -469,7 +455,7 @@ void POA_A::B::X2::getX2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -491,7 +477,7 @@ const char* POA_A::B::X2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -504,7 +490,7 @@ void POA_A::B::X2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -709,16 +695,8 @@ POA_A::B::_TAO_AMI_X2Handler_Direct_Proxy_Impl::getX2_excep ( POA_A::B::AMI_X2Handler::AMI_X2Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_B_AMI_X2Handler_optable); -} - -POA_A::B::AMI_X2Handler::AMI_X2Handler (const AMI_X2Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_A_B_AMI_X2Handler_optable); } @@ -895,7 +873,7 @@ void POA_A::B::AMI_X2Handler::getX2_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -918,7 +896,7 @@ const char* POA_A::B::AMI_X2Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -931,7 +909,7 @@ void POA_A::B::AMI_X2Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/reopen_include2S.h b/tests/IDL_Test/reopen_include2S.h index 4459cbd..9373915 100644 --- a/tests/IDL_Test/reopen_include2S.h +++ b/tests/IDL_Test/reopen_include2S.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_REOPEN_INCLUDE2S_RTGQ84_H_ -#define _TAO_IDL_REOPEN_INCLUDE2S_RTGQ84_H_ +#ifndef _TAO_IDL_REOPEN_INCLUDE2S_LTV0PX_H_ +#define _TAO_IDL_REOPEN_INCLUDE2S_LTV0PX_H_ #include /**/ "ace/pre.h" @@ -262,7 +262,7 @@ namespace POA_A typedef ::A::B::X2_ptr _stub_ptr_type; typedef ::A::B::X2_var _stub_var_type; - X2 (const X2& rhs); + X2 (const X2& rhs) = default; virtual ~X2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -359,7 +359,7 @@ namespace POA_A typedef ::A::B::AMI_X2Handler_ptr _stub_ptr_type; typedef ::A::B::AMI_X2Handler_var _stub_var_type; - AMI_X2Handler (const AMI_X2Handler& rhs); + AMI_X2Handler (const AMI_X2Handler& rhs) = default; virtual ~AMI_X2Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/reopened_modulesC.h b/tests/IDL_Test/reopened_modulesC.h index 228eb3f..01d57bf 100644 --- a/tests/IDL_Test/reopened_modulesC.h +++ b/tests/IDL_Test/reopened_modulesC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_REOPENED_MODULESC_UFLKBM_H_ -#define _TAO_IDL_REOPENED_MODULESC_UFLKBM_H_ +#ifndef _TAO_IDL_REOPENED_MODULESC_FMGWZT_H_ +#define _TAO_IDL_REOPENED_MODULESC_FMGWZT_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/reopened_modulesS.cpp b/tests/IDL_Test/reopened_modulesS.cpp index 39ea9c1..75d7ed3 100644 --- a/tests/IDL_Test/reopened_modulesS.cpp +++ b/tests/IDL_Test/reopened_modulesS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_REOPENED_MODULESS_XZOVV8_CPP_ -#define _TAO_IDL_REOPENED_MODULESS_XZOVV8_CPP_ +#ifndef _TAO_IDL_REOPENED_MODULESS_D4MKHR_CPP_ +#define _TAO_IDL_REOPENED_MODULESS_D4MKHR_CPP_ #include "reopened_modulesS.h" @@ -145,20 +145,14 @@ static TAO_AA_BB_AMH_x1_Perfect_Hash_OpTable tao_AA_BB_AMH_x1_optable; POA_AA::BB::AMH_x1::AMH_x1 () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AA_BB_AMH_x1_optable); -} - -POA_AA::BB::AMH_x1::AMH_x1 (const AMH_x1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_AA_BB_AMH_x1_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -309,20 +303,14 @@ POA_AA::BB::_TAO_x1_Direct_Proxy_Impl::~_TAO_x1_Direct_Proxy_Impl () POA_AA::BB::x1::x1 () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AA_BB_x1_optable); -} - -POA_AA::BB::x1::x1 (const x1& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_AA_BB_x1_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -344,7 +332,7 @@ const char* POA_AA::BB::x1::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -357,7 +345,7 @@ void POA_AA::BB::x1::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -483,21 +471,14 @@ POA_AA::BB::_TAO_AMI_x1Handler_Direct_Proxy_Impl::~_TAO_AMI_x1Handler_Direct_Pro POA_AA::BB::AMI_x1Handler::AMI_x1Handler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_AA_BB_AMI_x1Handler_optable); -} - -POA_AA::BB::AMI_x1Handler::AMI_x1Handler (const AMI_x1Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_AA_BB_AMI_x1Handler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -520,7 +501,7 @@ const char* POA_AA::BB::AMI_x1Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -533,7 +514,7 @@ void POA_AA::BB::AMI_x1Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -644,15 +625,8 @@ static TAO_AA_BB_CC_AMH_x2_Perfect_Hash_OpTable tao_AA_BB_CC_AMH_x2_optable; POA_AA::BB::CC::AMH_x2::AMH_x2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AA_BB_CC_AMH_x2_optable); -} - -POA_AA::BB::CC::AMH_x2::AMH_x2 (const AMH_x2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AA_BB_CC_AMH_x2_optable); } @@ -803,7 +777,7 @@ POA_AA::BB::CC::AMH_x2::op3_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1023,15 +997,8 @@ POA_AA::BB::CC::_TAO_x2_Direct_Proxy_Impl::op3 ( POA_AA::BB::CC::x2::x2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AA_BB_CC_x2_optable); -} - -POA_AA::BB::CC::x2::x2 (const x2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AA_BB_CC_x2_optable); } @@ -1305,7 +1272,7 @@ void POA_AA::BB::CC::x2::op3_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1327,7 +1294,7 @@ const char* POA_AA::BB::CC::x2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1340,7 +1307,7 @@ void POA_AA::BB::CC::x2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1701,16 +1668,8 @@ POA_AA::BB::CC::_TAO_AMI_x2Handler_Direct_Proxy_Impl::op3_excep ( POA_AA::BB::CC::AMI_x2Handler::AMI_x2Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AA_BB_CC_AMI_x2Handler_optable); -} - -POA_AA::BB::CC::AMI_x2Handler::AMI_x2Handler (const AMI_x2Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AA_BB_CC_AMI_x2Handler_optable); } @@ -2200,7 +2159,7 @@ void POA_AA::BB::CC::AMI_x2Handler::op3_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2223,7 +2182,7 @@ const char* POA_AA::BB::CC::AMI_x2Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2236,7 +2195,7 @@ void POA_AA::BB::CC::AMI_x2Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2365,15 +2324,8 @@ static TAO_dot_AMH_Person_Perfect_Hash_OpTable tao_dot_AMH_Person_optable; POA_dot::AMH_Person::AMH_Person () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_dot_AMH_Person_optable); -} - -POA_dot::AMH_Person::AMH_Person (const AMH_Person& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_dot_AMH_Person_optable); } @@ -2469,7 +2421,7 @@ POA_dot::AMH_Person::_set_someParty_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2685,15 +2637,8 @@ POA_dot::_TAO_Person_Direct_Proxy_Impl::_set_someParty ( POA_dot::Person::Person () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_dot_Person_optable); -} - -POA_dot::Person::Person (const Person& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_dot_Person_optable); } @@ -2859,7 +2804,7 @@ void POA_dot::Person::_set_someParty_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2881,7 +2826,7 @@ const char* POA_dot::Person::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2894,7 +2839,7 @@ void POA_dot::Person::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3173,16 +3118,8 @@ POA_dot::_TAO_AMI_PersonHandler_Direct_Proxy_Impl::set_someParty_excep ( POA_dot::AMI_PersonHandler::AMI_PersonHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_dot_AMI_PersonHandler_optable); -} - -POA_dot::AMI_PersonHandler::AMI_PersonHandler (const AMI_PersonHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_dot_AMI_PersonHandler_optable); } @@ -3496,7 +3433,7 @@ void POA_dot::AMI_PersonHandler::set_someParty_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3519,7 +3456,7 @@ const char* POA_dot::AMI_PersonHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3532,7 +3469,7 @@ void POA_dot::AMI_PersonHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3661,15 +3598,8 @@ static TAO_dot_AMH_Party_Perfect_Hash_OpTable tao_dot_AMH_Party_optable; POA_dot::AMH_Party::AMH_Party () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_dot_AMH_Party_optable); -} - -POA_dot::AMH_Party::AMH_Party (const AMH_Party& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_dot_AMH_Party_optable); } @@ -3765,7 +3695,7 @@ POA_dot::AMH_Party::_set_somePerson_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3981,15 +3911,8 @@ POA_dot::_TAO_Party_Direct_Proxy_Impl::_set_somePerson ( POA_dot::Party::Party () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_dot_Party_optable); -} - -POA_dot::Party::Party (const Party& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_dot_Party_optable); } @@ -4155,7 +4078,7 @@ void POA_dot::Party::_set_somePerson_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4177,7 +4100,7 @@ const char* POA_dot::Party::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4190,7 +4113,7 @@ void POA_dot::Party::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4469,16 +4392,8 @@ POA_dot::_TAO_AMI_PartyHandler_Direct_Proxy_Impl::set_somePerson_excep ( POA_dot::AMI_PartyHandler::AMI_PartyHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_dot_AMI_PartyHandler_optable); -} - -POA_dot::AMI_PartyHandler::AMI_PartyHandler (const AMI_PartyHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_dot_AMI_PartyHandler_optable); } @@ -4792,7 +4707,7 @@ void POA_dot::AMI_PartyHandler::set_somePerson_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4815,7 +4730,7 @@ const char* POA_dot::AMI_PartyHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4828,7 +4743,7 @@ void POA_dot::AMI_PartyHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4935,15 +4850,8 @@ static TAO_AMH_OpHolder_Perfect_Hash_OpTable tao_AMH_OpHolder_optable; POA_AMH_OpHolder::POA_AMH_OpHolder () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_OpHolder_optable); -} - -POA_AMH_OpHolder::POA_AMH_OpHolder (const POA_AMH_OpHolder& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_OpHolder_optable); } @@ -5001,7 +4909,7 @@ POA_AMH_OpHolder::Operation_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -5175,15 +5083,8 @@ _TAO_OpHolder_Direct_Proxy_Impl::Operation ( POA_OpHolder::POA_OpHolder () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_OpHolder_optable); -} - -POA_OpHolder::POA_OpHolder (const POA_OpHolder& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_OpHolder_optable); } @@ -5285,7 +5186,7 @@ void POA_OpHolder::Operation_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -5307,7 +5208,7 @@ const char* POA_OpHolder::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -5320,7 +5221,7 @@ void POA_OpHolder::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -5527,16 +5428,8 @@ _TAO_AMI_OpHolderHandler_Direct_Proxy_Impl::Operation_excep ( POA_AMI_OpHolderHandler::POA_AMI_OpHolderHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_OpHolderHandler_optable); -} - -POA_AMI_OpHolderHandler::POA_AMI_OpHolderHandler (const POA_AMI_OpHolderHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_OpHolderHandler_optable); } @@ -5706,7 +5599,7 @@ void POA_AMI_OpHolderHandler::Operation_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -5729,7 +5622,7 @@ const char* POA_AMI_OpHolderHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -5742,7 +5635,7 @@ void POA_AMI_OpHolderHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -5850,15 +5743,8 @@ static TAO_com_AMH_IFace_Perfect_Hash_OpTable tao_com_AMH_IFace_optable; POA_com::AMH_IFace::AMH_IFace () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_com_AMH_IFace_optable); -} - -POA_com::AMH_IFace::AMH_IFace (const AMH_IFace& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_com_AMH_IFace_optable); } @@ -5904,7 +5790,7 @@ POA_com::AMH_IFace::getInfo_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6077,15 +5963,8 @@ POA_com::_TAO_IFace_Direct_Proxy_Impl::getInfo ( POA_com::IFace::IFace () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_com_IFace_optable); -} - -POA_com::IFace::IFace (const IFace& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_com_IFace_optable); } @@ -6170,7 +6049,7 @@ void POA_com::IFace::getInfo_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6192,7 +6071,7 @@ const char* POA_com::IFace::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -6205,7 +6084,7 @@ void POA_com::IFace::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -6411,16 +6290,8 @@ POA_com::_TAO_AMI_IFaceHandler_Direct_Proxy_Impl::getInfo_excep ( POA_com::AMI_IFaceHandler::AMI_IFaceHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_com_AMI_IFaceHandler_optable); -} - -POA_com::AMI_IFaceHandler::AMI_IFaceHandler (const AMI_IFaceHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_com_AMI_IFaceHandler_optable); } @@ -6589,7 +6460,7 @@ void POA_com::AMI_IFaceHandler::getInfo_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6612,7 +6483,7 @@ const char* POA_com::AMI_IFaceHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -6625,7 +6496,7 @@ void POA_com::AMI_IFaceHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -6733,20 +6604,14 @@ static TAO_Y_AMH_Z_Perfect_Hash_OpTable tao_Y_AMH_Z_optable; POA_Y::AMH_Z::AMH_Z () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Y_AMH_Z_optable); -} - -POA_Y::AMH_Z::AMH_Z (const AMH_Z& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_Y_AMH_Z_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6897,20 +6762,14 @@ POA_Y::_TAO_Z_Direct_Proxy_Impl::~_TAO_Z_Direct_Proxy_Impl () POA_Y::Z::Z () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Y_Z_optable); -} - -POA_Y::Z::Z (const Z& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_Y_Z_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -6932,7 +6791,7 @@ const char* POA_Y::Z::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -6945,7 +6804,7 @@ void POA_Y::Z::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -7071,21 +6930,14 @@ POA_Y::_TAO_AMI_ZHandler_Direct_Proxy_Impl::~_TAO_AMI_ZHandler_Direct_Proxy_Impl POA_Y::AMI_ZHandler::AMI_ZHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Y_AMI_ZHandler_optable); -} - -POA_Y::AMI_ZHandler::AMI_ZHandler (const AMI_ZHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_Y_AMI_ZHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7108,7 +6960,7 @@ const char* POA_Y::AMI_ZHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -7121,7 +6973,7 @@ void POA_Y::AMI_ZHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -7228,16 +7080,8 @@ static TAO_X_AMH_BI_Perfect_Hash_OpTable tao_X_AMH_BI_optable; POA_X::AMH_BI::AMH_BI () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_X_AMH_BI_optable); -} - -POA_X::AMH_BI::AMH_BI (const AMH_BI& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_Y::AMH_Z (rhs) { + this->optable_ = std::addressof (tao_X_AMH_BI_optable); } @@ -7283,7 +7127,7 @@ POA_X::AMH_BI::method_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7455,16 +7299,8 @@ POA_X::_TAO_BI_Direct_Proxy_Impl::method ( POA_X::BI::BI () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_X_BI_optable); -} - -POA_X::BI::BI (const BI& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_Y::Z (rhs) { + this->optable_ = std::addressof (tao_X_BI_optable); } @@ -7544,7 +7380,7 @@ void POA_X::BI::method_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7567,7 +7403,7 @@ const char* POA_X::BI::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -7580,7 +7416,7 @@ void POA_X::BI::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -7776,17 +7612,8 @@ POA_X::_TAO_AMI_BIHandler_Direct_Proxy_Impl::method_excep ( POA_X::AMI_BIHandler::AMI_BIHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_X_AMI_BIHandler_optable); -} - -POA_X::AMI_BIHandler::AMI_BIHandler (const AMI_BIHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_Y::AMI_ZHandler (rhs) { + this->optable_ = std::addressof (tao_X_AMI_BIHandler_optable); } @@ -7975,7 +7802,7 @@ void POA_X::AMI_BIHandler::method_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -7999,7 +7826,7 @@ const char* POA_X::AMI_BIHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -8012,7 +7839,7 @@ void POA_X::AMI_BIHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -8120,15 +7947,8 @@ static TAO_XX_AMH_blah_intfc_Perfect_Hash_OpTable tao_XX_AMH_blah_intfc_optable; POA_XX::AMH_blah_intfc::AMH_blah_intfc () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_XX_AMH_blah_intfc_optable); -} - -POA_XX::AMH_blah_intfc::AMH_blah_intfc (const AMH_blah_intfc& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_XX_AMH_blah_intfc_optable); } @@ -8174,7 +7994,7 @@ POA_XX::AMH_blah_intfc::op1_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -8346,15 +8166,8 @@ POA_XX::_TAO_blah_intfc_Direct_Proxy_Impl::op1 ( POA_XX::blah_intfc::blah_intfc () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_XX_blah_intfc_optable); -} - -POA_XX::blah_intfc::blah_intfc (const blah_intfc& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_XX_blah_intfc_optable); } @@ -8425,7 +8238,7 @@ void POA_XX::blah_intfc::op1_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -8447,7 +8260,7 @@ const char* POA_XX::blah_intfc::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -8460,7 +8273,7 @@ void POA_XX::blah_intfc::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -8657,16 +8470,8 @@ POA_XX::_TAO_AMI_blah_intfcHandler_Direct_Proxy_Impl::op1_excep ( POA_XX::AMI_blah_intfcHandler::AMI_blah_intfcHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_XX_AMI_blah_intfcHandler_optable); -} - -POA_XX::AMI_blah_intfcHandler::AMI_blah_intfcHandler (const AMI_blah_intfcHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_XX_AMI_blah_intfcHandler_optable); } @@ -8818,7 +8623,7 @@ void POA_XX::AMI_blah_intfcHandler::op1_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -8841,7 +8646,7 @@ const char* POA_XX::AMI_blah_intfcHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -8854,7 +8659,7 @@ void POA_XX::AMI_blah_intfcHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -8964,16 +8769,8 @@ static TAO_XX_AMH_blah0_Perfect_Hash_OpTable tao_XX_AMH_blah0_optable; POA_XX::AMH_blah0::AMH_blah0 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_XX_AMH_blah0_optable); -} - -POA_XX::AMH_blah0::AMH_blah0 (const AMH_blah0& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_XX::AMH_blah_intfc (rhs) { + this->optable_ = std::addressof (tao_XX_AMH_blah0_optable); } @@ -9019,7 +8816,7 @@ POA_XX::AMH_blah0::op0_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -9194,16 +8991,8 @@ POA_XX::_TAO_blah0_Direct_Proxy_Impl::op0 ( POA_XX::blah0::blah0 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_XX_blah0_optable); -} - -POA_XX::blah0::blah0 (const blah0& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_XX::blah_intfc (rhs) { + this->optable_ = std::addressof (tao_XX_blah0_optable); } @@ -9274,7 +9063,7 @@ void POA_XX::blah0::op0_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -9297,7 +9086,7 @@ const char* POA_XX::blah0::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -9310,7 +9099,7 @@ void POA_XX::blah0::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -9529,17 +9318,8 @@ POA_XX::_TAO_AMI_blah0Handler_Direct_Proxy_Impl::op0_excep ( POA_XX::AMI_blah0Handler::AMI_blah0Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_XX_AMI_blah0Handler_optable); -} - -POA_XX::AMI_blah0Handler::AMI_blah0Handler (const AMI_blah0Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_XX::AMI_blah_intfcHandler (rhs) { + this->optable_ = std::addressof (tao_XX_AMI_blah0Handler_optable); } @@ -9691,7 +9471,7 @@ void POA_XX::AMI_blah0Handler::op0_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -9715,7 +9495,7 @@ const char* POA_XX::AMI_blah0Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -9728,7 +9508,7 @@ void POA_XX::AMI_blah0Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -9836,20 +9616,14 @@ static TAO_frag_AMH_frag_iface_Perfect_Hash_OpTable tao_frag_AMH_frag_iface_opta POA_frag::AMH_frag_iface::AMH_frag_iface () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_frag_AMH_frag_iface_optable); -} - -POA_frag::AMH_frag_iface::AMH_frag_iface (const AMH_frag_iface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_frag_AMH_frag_iface_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -10000,20 +9774,14 @@ POA_frag::_TAO_frag_iface_Direct_Proxy_Impl::~_TAO_frag_iface_Direct_Proxy_Impl POA_frag::frag_iface::frag_iface () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_frag_frag_iface_optable); -} - -POA_frag::frag_iface::frag_iface (const frag_iface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_frag_frag_iface_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -10035,7 +9803,7 @@ const char* POA_frag::frag_iface::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -10048,7 +9816,7 @@ void POA_frag::frag_iface::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -10174,21 +9942,14 @@ POA_frag::_TAO_AMI_frag_ifaceHandler_Direct_Proxy_Impl::~_TAO_AMI_frag_ifaceHand POA_frag::AMI_frag_ifaceHandler::AMI_frag_ifaceHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_frag_AMI_frag_ifaceHandler_optable); -} - -POA_frag::AMI_frag_ifaceHandler::AMI_frag_ifaceHandler (const AMI_frag_ifaceHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_frag_AMI_frag_ifaceHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -10211,7 +9972,7 @@ const char* POA_frag::AMI_frag_ifaceHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -10224,7 +9985,7 @@ void POA_frag::AMI_frag_ifaceHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -10332,15 +10093,8 @@ static TAO_AMH_gather_Perfect_Hash_OpTable tao_AMH_gather_optable; POA_AMH_gather::POA_AMH_gather () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_gather_optable); -} - -POA_AMH_gather::POA_AMH_gather (const POA_AMH_gather& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_gather_optable); } @@ -10398,7 +10152,7 @@ POA_AMH_gather::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -10574,15 +10328,8 @@ _TAO_gather_Direct_Proxy_Impl::op ( POA_gather::POA_gather () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_gather_optable); -} - -POA_gather::POA_gather (const POA_gather& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_gather_optable); } @@ -10690,7 +10437,7 @@ void POA_gather::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -10712,7 +10459,7 @@ const char* POA_gather::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -10725,7 +10472,7 @@ void POA_gather::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -10937,16 +10684,8 @@ _TAO_AMI_gatherHandler_Direct_Proxy_Impl::op_excep ( POA_AMI_gatherHandler::POA_AMI_gatherHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_gatherHandler_optable); -} - -POA_AMI_gatherHandler::POA_AMI_gatherHandler (const POA_AMI_gatherHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_gatherHandler_optable); } @@ -11125,7 +10864,7 @@ void POA_AMI_gatherHandler::op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -11148,7 +10887,7 @@ const char* POA_AMI_gatherHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -11161,7 +10900,7 @@ void POA_AMI_gatherHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -11269,15 +11008,8 @@ static TAO_foo_AMH_obj_Perfect_Hash_OpTable tao_foo_AMH_obj_optable; POA_foo::AMH_obj::AMH_obj () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_foo_AMH_obj_optable); -} - -POA_foo::AMH_obj::AMH_obj (const AMH_obj& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_foo_AMH_obj_optable); } @@ -11332,7 +11064,7 @@ POA_foo::AMH_obj::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -11505,15 +11237,8 @@ POA_foo::_TAO_obj_Direct_Proxy_Impl::op ( POA_foo::obj::obj () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_foo_obj_optable); -} - -POA_foo::obj::obj (const obj& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_foo_obj_optable); } @@ -11601,7 +11326,7 @@ void POA_foo::obj::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -11623,7 +11348,7 @@ const char* POA_foo::obj::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -11636,7 +11361,7 @@ void POA_foo::obj::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -11834,16 +11559,8 @@ POA_foo::_TAO_AMI_objHandler_Direct_Proxy_Impl::op_excep ( POA_foo::AMI_objHandler::AMI_objHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_foo_AMI_objHandler_optable); -} - -POA_foo::AMI_objHandler::AMI_objHandler (const AMI_objHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_foo_AMI_objHandler_optable); } @@ -11995,7 +11712,7 @@ void POA_foo::AMI_objHandler::op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -12018,7 +11735,7 @@ const char* POA_foo::AMI_objHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -12031,7 +11748,7 @@ void POA_foo::AMI_objHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -12143,17 +11860,8 @@ static TAO_A_B_AMH_X3_Perfect_Hash_OpTable tao_A_B_AMH_X3_optable; POA_A::B::AMH_X3::AMH_X3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_B_AMH_X3_optable); -} - -POA_A::B::AMH_X3::AMH_X3 (const AMH_X3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_A::B::AMH_X1 (rhs), - POA_A::B::AMH_X2 (rhs) { + this->optable_ = std::addressof (tao_A_B_AMH_X3_optable); } @@ -12238,7 +11946,7 @@ POA_A::B::AMH_X3::getX3_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -12439,17 +12147,8 @@ POA_A::B::_TAO_X3_Direct_Proxy_Impl::getX3 ( POA_A::B::X3::X3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_B_X3_optable); -} - -POA_A::B::X3::X3 (const X3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_A::B::X1 (rhs), - POA_A::B::X2 (rhs) { + this->optable_ = std::addressof (tao_A_B_X3_optable); } @@ -12620,7 +12319,7 @@ void POA_A::B::X3::getX3_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -12644,7 +12343,7 @@ const char* POA_A::B::X3::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -12657,7 +12356,7 @@ void POA_A::B::X3::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -12966,18 +12665,8 @@ POA_A::B::_TAO_AMI_X3Handler_Direct_Proxy_Impl::getX3_excep ( POA_A::B::AMI_X3Handler::AMI_X3Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_B_AMI_X3Handler_optable); -} - -POA_A::B::AMI_X3Handler::AMI_X3Handler (const AMI_X3Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_A::B::AMI_X1Handler (rhs), - POA_A::B::AMI_X2Handler (rhs) { + this->optable_ = std::addressof (tao_A_B_AMI_X3Handler_optable); } @@ -13324,7 +13013,7 @@ void POA_A::B::AMI_X3Handler::getX3_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -13349,7 +13038,7 @@ const char* POA_A::B::AMI_X3Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -13362,7 +13051,7 @@ void POA_A::B::AMI_X3Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -13491,15 +13180,8 @@ static TAO_mA_AMH_A_Perfect_Hash_OpTable tao_mA_AMH_A_optable; POA_mA::AMH_A::AMH_A () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mA_AMH_A_optable); -} - -POA_mA::AMH_A::AMH_A (const AMH_A& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_mA_AMH_A_optable); } @@ -13595,7 +13277,7 @@ POA_mA::AMH_A::_set_theB_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -13811,15 +13493,8 @@ POA_mA::_TAO_A_Direct_Proxy_Impl::_set_theB ( POA_mA::A::A () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mA_A_optable); -} - -POA_mA::A::A (const A& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_mA_A_optable); } @@ -13985,7 +13660,7 @@ void POA_mA::A::_set_theB_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -14007,7 +13682,7 @@ const char* POA_mA::A::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -14020,7 +13695,7 @@ void POA_mA::A::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -14299,16 +13974,8 @@ POA_mA::_TAO_AMI_AHandler_Direct_Proxy_Impl::set_theB_excep ( POA_mA::AMI_AHandler::AMI_AHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mA_AMI_AHandler_optable); -} - -POA_mA::AMI_AHandler::AMI_AHandler (const AMI_AHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_mA_AMI_AHandler_optable); } @@ -14622,7 +14289,7 @@ void POA_mA::AMI_AHandler::set_theB_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -14645,7 +14312,7 @@ const char* POA_mA::AMI_AHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -14658,7 +14325,7 @@ void POA_mA::AMI_AHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -14789,16 +14456,8 @@ static TAO_mB_AMH_B_Perfect_Hash_OpTable tao_mB_AMH_B_optable; POA_mB::AMH_B::AMH_B () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mB_AMH_B_optable); -} - -POA_mB::AMH_B::AMH_B (const AMH_B& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_mA::AMH_A (rhs) { + this->optable_ = std::addressof (tao_mB_AMH_B_optable); } @@ -14894,7 +14553,7 @@ POA_mB::AMH_B::_set_theA_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -15113,16 +14772,8 @@ POA_mB::_TAO_B_Direct_Proxy_Impl::_set_theA ( POA_mB::B::B () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mB_B_optable); -} - -POA_mB::B::B (const B& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_mA::A (rhs) { + this->optable_ = std::addressof (tao_mB_B_optable); } @@ -15288,7 +14939,7 @@ void POA_mB::B::_set_theA_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -15311,7 +14962,7 @@ const char* POA_mB::B::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -15324,7 +14975,7 @@ void POA_mB::B::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -15626,17 +15277,8 @@ POA_mB::_TAO_AMI_BHandler_Direct_Proxy_Impl::set_theA_excep ( POA_mB::AMI_BHandler::AMI_BHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_mB_AMI_BHandler_optable); -} - -POA_mB::AMI_BHandler::AMI_BHandler (const AMI_BHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_mA::AMI_AHandler (rhs) { + this->optable_ = std::addressof (tao_mB_AMI_BHandler_optable); } @@ -15950,7 +15592,7 @@ void POA_mB::AMI_BHandler::set_theA_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -15974,7 +15616,7 @@ const char* POA_mB::AMI_BHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -15987,7 +15629,7 @@ void POA_mB::AMI_BHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -16120,22 +15762,14 @@ static TAO_mC_AMH_C_Perfect_Hash_OpTable tao_mC_AMH_C_optable; POA_mC::AMH_C::AMH_C () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_mC_AMH_C_optable); -} - -POA_mC::AMH_C::AMH_C (const AMH_C& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_mA::AMH_A (rhs), - POA_mB::AMH_B (rhs) -{ + this->optable_ = std::addressof (tao_mC_AMH_C_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16313,22 +15947,14 @@ POA_mC::_TAO_C_Direct_Proxy_Impl::~_TAO_C_Direct_Proxy_Impl () POA_mC::C::C () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_mC_C_optable); -} - -POA_mC::C::C (const C& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_mA::A (rhs), - POA_mB::B (rhs) -{ + this->optable_ = std::addressof (tao_mC_C_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16352,7 +15978,7 @@ const char* POA_mC::C::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -16365,7 +15991,7 @@ void POA_mC::C::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -16521,23 +16147,14 @@ POA_mC::_TAO_AMI_CHandler_Direct_Proxy_Impl::~_TAO_AMI_CHandler_Direct_Proxy_Imp POA_mC::AMI_CHandler::AMI_CHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_mC_AMI_CHandler_optable); -} - -POA_mC::AMI_CHandler::AMI_CHandler (const AMI_CHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_mA::AMI_AHandler (rhs), - POA_mB::AMI_BHandler (rhs) -{ + this->optable_ = std::addressof (tao_mC_AMI_CHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16562,7 +16179,7 @@ const char* POA_mC::AMI_CHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -16575,7 +16192,7 @@ void POA_mC::AMI_CHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -16681,22 +16298,15 @@ static TAO_Schmoik_AMH_foo_Perfect_Hash_OpTable tao_Schmoik_AMH_foo_optable; POA_Schmoik::AMH_foo::AMH_foo () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Schmoik_AMH_foo_optable); -} - -POA_Schmoik::AMH_foo::AMH_foo (const AMH_foo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Schmoik_AMH_foo_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16845,22 +16455,15 @@ POA_Schmoik::_TAO_foo_Direct_Proxy_Impl::~_TAO_foo_Direct_Proxy_Impl () POA_Schmoik::foo::foo () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Schmoik_foo_optable); -} - -POA_Schmoik::foo::foo (const foo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Schmoik_foo_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -16882,7 +16485,7 @@ const char* POA_Schmoik::foo::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -16895,7 +16498,7 @@ void POA_Schmoik::foo::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -17021,21 +16624,14 @@ POA_Schmoik::_TAO_AMI_fooHandler_Direct_Proxy_Impl::~_TAO_AMI_fooHandler_Direct_ POA_Schmoik::AMI_fooHandler::AMI_fooHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Schmoik_AMI_fooHandler_optable); -} - -POA_Schmoik::AMI_fooHandler::AMI_fooHandler (const AMI_fooHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_Schmoik_AMI_fooHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17058,7 +16654,7 @@ const char* POA_Schmoik::AMI_fooHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -17071,7 +16667,7 @@ void POA_Schmoik::AMI_fooHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -17179,20 +16775,14 @@ static TAO_Thwoik_AMH_TestType_Perfect_Hash_OpTable tao_Thwoik_AMH_TestType_opta POA_Thwoik::AMH_TestType::AMH_TestType () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Thwoik_AMH_TestType_optable); -} - -POA_Thwoik::AMH_TestType::AMH_TestType (const AMH_TestType& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_Thwoik_AMH_TestType_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17343,20 +16933,14 @@ POA_Thwoik::_TAO_TestType_Direct_Proxy_Impl::~_TAO_TestType_Direct_Proxy_Impl () POA_Thwoik::TestType::TestType () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Thwoik_TestType_optable); -} - -POA_Thwoik::TestType::TestType (const TestType& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_Thwoik_TestType_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17378,7 +16962,7 @@ const char* POA_Thwoik::TestType::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -17391,7 +16975,7 @@ void POA_Thwoik::TestType::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -17517,21 +17101,14 @@ POA_Thwoik::_TAO_AMI_TestTypeHandler_Direct_Proxy_Impl::~_TAO_AMI_TestTypeHandle POA_Thwoik::AMI_TestTypeHandler::AMI_TestTypeHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_Thwoik_AMI_TestTypeHandler_optable); -} - -POA_Thwoik::AMI_TestTypeHandler::AMI_TestTypeHandler (const AMI_TestTypeHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_Thwoik_AMI_TestTypeHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17554,7 +17131,7 @@ const char* POA_Thwoik::AMI_TestTypeHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -17567,7 +17144,7 @@ void POA_Thwoik::AMI_TestTypeHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -17675,20 +17252,14 @@ static TAO_A_mod_AMH_Foo_Perfect_Hash_OpTable tao_A_mod_AMH_Foo_optable; POA_A_mod::AMH_Foo::AMH_Foo () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_A_mod_AMH_Foo_optable); -} - -POA_A_mod::AMH_Foo::AMH_Foo (const AMH_Foo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_A_mod_AMH_Foo_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17839,20 +17410,14 @@ POA_A_mod::_TAO_Foo_Direct_Proxy_Impl::~_TAO_Foo_Direct_Proxy_Impl () POA_A_mod::Foo::Foo () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_A_mod_Foo_optable); -} - -POA_A_mod::Foo::Foo (const Foo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_A_mod_Foo_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -17874,7 +17439,7 @@ const char* POA_A_mod::Foo::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -17887,7 +17452,7 @@ void POA_A_mod::Foo::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -18013,21 +17578,14 @@ POA_A_mod::_TAO_AMI_FooHandler_Direct_Proxy_Impl::~_TAO_AMI_FooHandler_Direct_Pr POA_A_mod::AMI_FooHandler::AMI_FooHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_A_mod_AMI_FooHandler_optable); -} - -POA_A_mod::AMI_FooHandler::AMI_FooHandler (const AMI_FooHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_A_mod_AMI_FooHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -18050,7 +17608,7 @@ const char* POA_A_mod::AMI_FooHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -18063,7 +17621,7 @@ void POA_A_mod::AMI_FooHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -18171,21 +17729,14 @@ static TAO_A_mod_B_mod_AMH_Foo_Perfect_Hash_OpTable tao_A_mod_B_mod_AMH_Foo_opta POA_A_mod::B_mod::AMH_Foo::AMH_Foo () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_A_mod_B_mod_AMH_Foo_optable); -} - -POA_A_mod::B_mod::AMH_Foo::AMH_Foo (const AMH_Foo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_A_mod::AMH_Foo (rhs) -{ + this->optable_ = std::addressof (tao_A_mod_B_mod_AMH_Foo_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -18337,21 +17888,14 @@ POA_A_mod::B_mod::_TAO_Foo_Direct_Proxy_Impl::~_TAO_Foo_Direct_Proxy_Impl () POA_A_mod::B_mod::Foo::Foo () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_A_mod_B_mod_Foo_optable); -} - -POA_A_mod::B_mod::Foo::Foo (const Foo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_A_mod::Foo (rhs) -{ + this->optable_ = std::addressof (tao_A_mod_B_mod_Foo_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -18374,7 +17918,7 @@ const char* POA_A_mod::B_mod::Foo::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -18387,7 +17931,7 @@ void POA_A_mod::B_mod::Foo::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -18513,22 +18057,14 @@ POA_A_mod::B_mod::_TAO_AMI_FooHandler_Direct_Proxy_Impl::~_TAO_AMI_FooHandler_Di POA_A_mod::B_mod::AMI_FooHandler::AMI_FooHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_A_mod_B_mod_AMI_FooHandler_optable); -} - -POA_A_mod::B_mod::AMI_FooHandler::AMI_FooHandler (const AMI_FooHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_A_mod::AMI_FooHandler (rhs) -{ + this->optable_ = std::addressof (tao_A_mod_B_mod_AMI_FooHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -18552,7 +18088,7 @@ const char* POA_A_mod::B_mod::AMI_FooHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -18565,7 +18101,7 @@ void POA_A_mod::B_mod::AMI_FooHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/reopened_modulesS.h b/tests/IDL_Test/reopened_modulesS.h index 4cc109a..524116f 100644 --- a/tests/IDL_Test/reopened_modulesS.h +++ b/tests/IDL_Test/reopened_modulesS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_REOPENED_MODULESS_EXMHEC_H_ -#define _TAO_IDL_REOPENED_MODULESS_EXMHEC_H_ +#ifndef _TAO_IDL_REOPENED_MODULESS_ZMWZ9E_H_ +#define _TAO_IDL_REOPENED_MODULESS_ZMWZ9E_H_ #include /**/ "ace/pre.h" @@ -1599,7 +1599,7 @@ namespace POA_AA typedef ::AA::BB::x1_ptr _stub_ptr_type; typedef ::AA::BB::x1_var _stub_var_type; - x1 (const x1& rhs); + x1 (const x1& rhs) = default; virtual ~x1 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1670,7 +1670,7 @@ namespace POA_AA typedef ::AA::BB::AMI_x1Handler_ptr _stub_ptr_type; typedef ::AA::BB::AMI_x1Handler_var _stub_var_type; - AMI_x1Handler (const AMI_x1Handler& rhs); + AMI_x1Handler (const AMI_x1Handler& rhs) = default; virtual ~AMI_x1Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1824,7 +1824,7 @@ namespace POA_AA typedef ::AA::BB::CC::x2_ptr _stub_ptr_type; typedef ::AA::BB::CC::x2_var _stub_var_type; - x2 (const x2& rhs); + x2 (const x2& rhs) = default; virtual ~x2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1973,7 +1973,7 @@ namespace POA_AA typedef ::AA::BB::CC::AMI_x2Handler_ptr _stub_ptr_type; typedef ::AA::BB::CC::AMI_x2Handler_var _stub_var_type; - AMI_x2Handler (const AMI_x2Handler& rhs); + AMI_x2Handler (const AMI_x2Handler& rhs) = default; virtual ~AMI_x2Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2206,7 +2206,7 @@ class TAO_IDL_TEST_STUB_Export Person typedef ::dot::Person_ptr _stub_ptr_type; typedef ::dot::Person_var _stub_var_type; - Person (const Person& rhs); + Person (const Person& rhs) = default; virtual ~Person () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2329,7 +2329,7 @@ class TAO_IDL_TEST_STUB_Export AMI_PersonHandler typedef ::dot::AMI_PersonHandler_ptr _stub_ptr_type; typedef ::dot::AMI_PersonHandler_var _stub_var_type; - AMI_PersonHandler (const AMI_PersonHandler& rhs); + AMI_PersonHandler (const AMI_PersonHandler& rhs) = default; virtual ~AMI_PersonHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2518,7 +2518,7 @@ class TAO_IDL_TEST_STUB_Export Party typedef ::dot::Party_ptr _stub_ptr_type; typedef ::dot::Party_var _stub_var_type; - Party (const Party& rhs); + Party (const Party& rhs) = default; virtual ~Party () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2641,7 +2641,7 @@ class TAO_IDL_TEST_STUB_Export AMI_PartyHandler typedef ::dot::AMI_PartyHandler_ptr _stub_ptr_type; typedef ::dot::AMI_PartyHandler_var _stub_var_type; - AMI_PartyHandler (const AMI_PartyHandler& rhs); + AMI_PartyHandler (const AMI_PartyHandler& rhs) = default; virtual ~AMI_PartyHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2849,7 +2849,7 @@ class TAO_IDL_TEST_STUB_Export POA_OpHolder typedef ::OpHolder_ptr _stub_ptr_type; typedef ::OpHolder_var _stub_var_type; - POA_OpHolder (const POA_OpHolder& rhs); + POA_OpHolder (const POA_OpHolder& rhs) = default; virtual ~POA_OpHolder () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -2950,7 +2950,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_OpHolderHandler typedef ::AMI_OpHolderHandler_ptr _stub_ptr_type; typedef ::AMI_OpHolderHandler_var _stub_var_type; - POA_AMI_OpHolderHandler (const POA_AMI_OpHolderHandler& rhs); + POA_AMI_OpHolderHandler (const POA_AMI_OpHolderHandler& rhs) = default; virtual ~POA_AMI_OpHolderHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3112,7 +3112,7 @@ class TAO_IDL_TEST_STUB_Export IFace typedef ::com::IFace_ptr _stub_ptr_type; typedef ::com::IFace_var _stub_var_type; - IFace (const IFace& rhs); + IFace (const IFace& rhs) = default; virtual ~IFace () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3209,7 +3209,7 @@ class TAO_IDL_TEST_STUB_Export AMI_IFaceHandler typedef ::com::AMI_IFaceHandler_ptr _stub_ptr_type; typedef ::com::AMI_IFaceHandler_var _stub_var_type; - AMI_IFaceHandler (const AMI_IFaceHandler& rhs); + AMI_IFaceHandler (const AMI_IFaceHandler& rhs) = default; virtual ~AMI_IFaceHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3340,7 +3340,7 @@ class TAO_IDL_TEST_STUB_Export Z typedef ::Y::Z_ptr _stub_ptr_type; typedef ::Y::Z_var _stub_var_type; - Z (const Z& rhs); + Z (const Z& rhs) = default; virtual ~Z () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3411,7 +3411,7 @@ class TAO_IDL_TEST_STUB_Export AMI_ZHandler typedef ::Y::AMI_ZHandler_ptr _stub_ptr_type; typedef ::Y::AMI_ZHandler_var _stub_var_type; - AMI_ZHandler (const AMI_ZHandler& rhs); + AMI_ZHandler (const AMI_ZHandler& rhs) = default; virtual ~AMI_ZHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3521,7 +3521,7 @@ class TAO_IDL_TEST_STUB_Export BI typedef ::X::BI_ptr _stub_ptr_type; typedef ::X::BI_var _stub_var_type; - BI (const BI& rhs); + BI (const BI& rhs) = default; virtual ~BI () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3618,7 +3618,7 @@ class TAO_IDL_TEST_STUB_Export AMI_BIHandler typedef ::X::AMI_BIHandler_ptr _stub_ptr_type; typedef ::X::AMI_BIHandler_var _stub_var_type; - AMI_BIHandler (const AMI_BIHandler& rhs); + AMI_BIHandler (const AMI_BIHandler& rhs) = default; virtual ~AMI_BIHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3760,7 +3760,7 @@ class TAO_IDL_TEST_STUB_Export blah_intfc typedef ::XX::blah_intfc_ptr _stub_ptr_type; typedef ::XX::blah_intfc_var _stub_var_type; - blah_intfc (const blah_intfc& rhs); + blah_intfc (const blah_intfc& rhs) = default; virtual ~blah_intfc () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3856,7 +3856,7 @@ class TAO_IDL_TEST_STUB_Export AMI_blah_intfcHandler typedef ::XX::AMI_blah_intfcHandler_ptr _stub_ptr_type; typedef ::XX::AMI_blah_intfcHandler_var _stub_var_type; - AMI_blah_intfcHandler (const AMI_blah_intfcHandler& rhs); + AMI_blah_intfcHandler (const AMI_blah_intfcHandler& rhs) = default; virtual ~AMI_blah_intfcHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -3987,7 +3987,7 @@ class TAO_IDL_TEST_STUB_Export blah0 typedef ::XX::blah0_ptr _stub_ptr_type; typedef ::XX::blah0_var _stub_var_type; - blah0 (const blah0& rhs); + blah0 (const blah0& rhs) = default; virtual ~blah0 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4084,7 +4084,7 @@ class TAO_IDL_TEST_STUB_Export AMI_blah0Handler typedef ::XX::AMI_blah0Handler_ptr _stub_ptr_type; typedef ::XX::AMI_blah0Handler_var _stub_var_type; - AMI_blah0Handler (const AMI_blah0Handler& rhs); + AMI_blah0Handler (const AMI_blah0Handler& rhs) = default; virtual ~AMI_blah0Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4214,7 +4214,7 @@ class TAO_IDL_TEST_STUB_Export frag_iface typedef ::frag::frag_iface_ptr _stub_ptr_type; typedef ::frag::frag_iface_var _stub_var_type; - frag_iface (const frag_iface& rhs); + frag_iface (const frag_iface& rhs) = default; virtual ~frag_iface () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4285,7 +4285,7 @@ class TAO_IDL_TEST_STUB_Export AMI_frag_ifaceHandler typedef ::frag::AMI_frag_ifaceHandler_ptr _stub_ptr_type; typedef ::frag::AMI_frag_ifaceHandler_var _stub_var_type; - AMI_frag_ifaceHandler (const AMI_frag_ifaceHandler& rhs); + AMI_frag_ifaceHandler (const AMI_frag_ifaceHandler& rhs) = default; virtual ~AMI_frag_ifaceHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4402,7 +4402,7 @@ class TAO_IDL_TEST_STUB_Export POA_gather typedef ::gather_ptr _stub_ptr_type; typedef ::gather_var _stub_var_type; - POA_gather (const POA_gather& rhs); + POA_gather (const POA_gather& rhs) = default; virtual ~POA_gather () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4504,7 +4504,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_gatherHandler typedef ::AMI_gatherHandler_ptr _stub_ptr_type; typedef ::AMI_gatherHandler_var _stub_var_type; - POA_AMI_gatherHandler (const POA_AMI_gatherHandler& rhs); + POA_AMI_gatherHandler (const POA_AMI_gatherHandler& rhs) = default; virtual ~POA_AMI_gatherHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4656,7 +4656,7 @@ class TAO_IDL_TEST_STUB_Export obj typedef ::foo::obj_ptr _stub_ptr_type; typedef ::foo::obj_var _stub_var_type; - obj (const obj& rhs); + obj (const obj& rhs) = default; virtual ~obj () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4753,7 +4753,7 @@ class TAO_IDL_TEST_STUB_Export AMI_objHandler typedef ::foo::AMI_objHandler_ptr _stub_ptr_type; typedef ::foo::AMI_objHandler_var _stub_var_type; - AMI_objHandler (const AMI_objHandler& rhs); + AMI_objHandler (const AMI_objHandler& rhs) = default; virtual ~AMI_objHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -4916,7 +4916,7 @@ namespace POA_A typedef ::A::B::X3_ptr _stub_ptr_type; typedef ::A::B::X3_var _stub_var_type; - X3 (const X3& rhs); + X3 (const X3& rhs) = default; virtual ~X3 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5042,7 +5042,7 @@ namespace POA_A typedef ::A::B::AMI_X3Handler_ptr _stub_ptr_type; typedef ::A::B::AMI_X3Handler_var _stub_var_type; - AMI_X3Handler (const AMI_X3Handler& rhs); + AMI_X3Handler (const AMI_X3Handler& rhs) = default; virtual ~AMI_X3Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5251,7 +5251,7 @@ class TAO_IDL_TEST_STUB_Export A typedef ::mA::A_ptr _stub_ptr_type; typedef ::mA::A_var _stub_var_type; - A (const A& rhs); + A (const A& rhs) = default; virtual ~A () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5374,7 +5374,7 @@ class TAO_IDL_TEST_STUB_Export AMI_AHandler typedef ::mA::AMI_AHandler_ptr _stub_ptr_type; typedef ::mA::AMI_AHandler_var _stub_var_type; - AMI_AHandler (const AMI_AHandler& rhs); + AMI_AHandler (const AMI_AHandler& rhs) = default; virtual ~AMI_AHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5564,7 +5564,7 @@ class TAO_IDL_TEST_STUB_Export B typedef ::mB::B_ptr _stub_ptr_type; typedef ::mB::B_var _stub_var_type; - B (const B& rhs); + B (const B& rhs) = default; virtual ~B () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5688,7 +5688,7 @@ class TAO_IDL_TEST_STUB_Export AMI_BHandler typedef ::mB::AMI_BHandler_ptr _stub_ptr_type; typedef ::mB::AMI_BHandler_var _stub_var_type; - AMI_BHandler (const AMI_BHandler& rhs); + AMI_BHandler (const AMI_BHandler& rhs) = default; virtual ~AMI_BHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5853,7 +5853,7 @@ class TAO_IDL_TEST_STUB_Export C typedef ::mC::C_ptr _stub_ptr_type; typedef ::mC::C_var _stub_var_type; - C (const C& rhs); + C (const C& rhs) = default; virtual ~C () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -5925,7 +5925,7 @@ class TAO_IDL_TEST_STUB_Export AMI_CHandler typedef ::mC::AMI_CHandler_ptr _stub_ptr_type; typedef ::mC::AMI_CHandler_var _stub_var_type; - AMI_CHandler (const AMI_CHandler& rhs); + AMI_CHandler (const AMI_CHandler& rhs) = default; virtual ~AMI_CHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6022,7 +6022,7 @@ class TAO_IDL_TEST_STUB_Export foo typedef ::Schmoik::foo_ptr _stub_ptr_type; typedef ::Schmoik::foo_var _stub_var_type; - foo (const foo& rhs); + foo (const foo& rhs) = default; virtual ~foo () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6093,7 +6093,7 @@ class TAO_IDL_TEST_STUB_Export AMI_fooHandler typedef ::Schmoik::AMI_fooHandler_ptr _stub_ptr_type; typedef ::Schmoik::AMI_fooHandler_var _stub_var_type; - AMI_fooHandler (const AMI_fooHandler& rhs); + AMI_fooHandler (const AMI_fooHandler& rhs) = default; virtual ~AMI_fooHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6238,7 +6238,7 @@ class TAO_IDL_TEST_STUB_Export TestType typedef ::Thwoik::TestType_ptr _stub_ptr_type; typedef ::Thwoik::TestType_var _stub_var_type; - TestType (const TestType& rhs); + TestType (const TestType& rhs) = default; virtual ~TestType () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6309,7 +6309,7 @@ class TAO_IDL_TEST_STUB_Export AMI_TestTypeHandler typedef ::Thwoik::AMI_TestTypeHandler_ptr _stub_ptr_type; typedef ::Thwoik::AMI_TestTypeHandler_var _stub_var_type; - AMI_TestTypeHandler (const AMI_TestTypeHandler& rhs); + AMI_TestTypeHandler (const AMI_TestTypeHandler& rhs) = default; virtual ~AMI_TestTypeHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6406,7 +6406,7 @@ class TAO_IDL_TEST_STUB_Export Foo typedef ::A_mod::Foo_ptr _stub_ptr_type; typedef ::A_mod::Foo_var _stub_var_type; - Foo (const Foo& rhs); + Foo (const Foo& rhs) = default; virtual ~Foo () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6477,7 +6477,7 @@ class TAO_IDL_TEST_STUB_Export AMI_FooHandler typedef ::A_mod::AMI_FooHandler_ptr _stub_ptr_type; typedef ::A_mod::AMI_FooHandler_var _stub_var_type; - AMI_FooHandler (const AMI_FooHandler& rhs); + AMI_FooHandler (const AMI_FooHandler& rhs) = default; virtual ~AMI_FooHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6569,7 +6569,7 @@ class TAO_IDL_TEST_STUB_Export Foo typedef ::A_mod::B_mod::Foo_ptr _stub_ptr_type; typedef ::A_mod::B_mod::Foo_var _stub_var_type; - Foo (const Foo& rhs); + Foo (const Foo& rhs) = default; virtual ~Foo () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -6641,7 +6641,7 @@ class TAO_IDL_TEST_STUB_Export AMI_FooHandler typedef ::A_mod::B_mod::AMI_FooHandler_ptr _stub_ptr_type; typedef ::A_mod::B_mod::AMI_FooHandler_var _stub_var_type; - AMI_FooHandler (const AMI_FooHandler& rhs); + AMI_FooHandler (const AMI_FooHandler& rhs) = default; virtual ~AMI_FooHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/repo_id_modA.h b/tests/IDL_Test/repo_id_modA.h index 27ad5ed..609bf14 100644 --- a/tests/IDL_Test/repo_id_modA.h +++ b/tests/IDL_Test/repo_id_modA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_REPO_ID_MODA_Q5GCTR_H_ -#define _TAO_IDL_REPO_ID_MODA_Q5GCTR_H_ +#ifndef _TAO_IDL_REPO_ID_MODA_NA8F8L_H_ +#define _TAO_IDL_REPO_ID_MODA_NA8F8L_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/repo_id_modC.h b/tests/IDL_Test/repo_id_modC.h index ab897df..9d13278 100644 --- a/tests/IDL_Test/repo_id_modC.h +++ b/tests/IDL_Test/repo_id_modC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_REPO_ID_MODC_Q5GCTR_H_ -#define _TAO_IDL_REPO_ID_MODC_Q5GCTR_H_ +#ifndef _TAO_IDL_REPO_ID_MODC_NA8F8L_H_ +#define _TAO_IDL_REPO_ID_MODC_NA8F8L_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/repo_id_modS.cpp b/tests/IDL_Test/repo_id_modS.cpp index 34bbfca..f3810c9 100644 --- a/tests/IDL_Test/repo_id_modS.cpp +++ b/tests/IDL_Test/repo_id_modS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_REPO_ID_MODS_J2TZEI_CPP_ -#define _TAO_IDL_REPO_ID_MODS_J2TZEI_CPP_ +#ifndef _TAO_IDL_REPO_ID_MODS_ZTJNQ1_CPP_ +#define _TAO_IDL_REPO_ID_MODS_ZTJNQ1_CPP_ #include "repo_id_modS.h" diff --git a/tests/IDL_Test/repo_id_modS.h b/tests/IDL_Test/repo_id_modS.h index 9a790fe..69083e3 100644 --- a/tests/IDL_Test/repo_id_modS.h +++ b/tests/IDL_Test/repo_id_modS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_REPO_ID_MODS_J2TZEI_H_ -#define _TAO_IDL_REPO_ID_MODS_J2TZEI_H_ +#ifndef _TAO_IDL_REPO_ID_MODS_ZTJNQ1_H_ +#define _TAO_IDL_REPO_ID_MODS_ZTJNQ1_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/sequenceC.h b/tests/IDL_Test/sequenceC.h index 891902e..b847479 100644 --- a/tests/IDL_Test/sequenceC.h +++ b/tests/IDL_Test/sequenceC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_SEQUENCEC_0OBA4O_H_ -#define _TAO_IDL_SEQUENCEC_0OBA4O_H_ +#ifndef _TAO_IDL_SEQUENCEC_WGRZMS_H_ +#define _TAO_IDL_SEQUENCEC_WGRZMS_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/sequenceS.cpp b/tests/IDL_Test/sequenceS.cpp index 5a2328f..061d5de 100644 --- a/tests/IDL_Test/sequenceS.cpp +++ b/tests/IDL_Test/sequenceS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_SEQUENCES_HEEIJY_CPP_ -#define _TAO_IDL_SEQUENCES_HEEIJY_CPP_ +#ifndef _TAO_IDL_SEQUENCES_8649M3_CPP_ +#define _TAO_IDL_SEQUENCES_8649M3_CPP_ #include "sequenceS.h" diff --git a/tests/IDL_Test/sequenceS.h b/tests/IDL_Test/sequenceS.h index d157bf5..5319427 100644 --- a/tests/IDL_Test/sequenceS.h +++ b/tests/IDL_Test/sequenceS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_SEQUENCES_HEEIJY_H_ -#define _TAO_IDL_SEQUENCES_HEEIJY_H_ +#ifndef _TAO_IDL_SEQUENCES_8649M3_H_ +#define _TAO_IDL_SEQUENCES_8649M3_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/sequence_anonymousC.h b/tests/IDL_Test/sequence_anonymousC.h index d79df44..9649cd3 100644 --- a/tests/IDL_Test/sequence_anonymousC.h +++ b/tests/IDL_Test/sequence_anonymousC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_SEQUENCE_ANONYMOUSC_N5QQH2_H_ -#define _TAO_IDL_SEQUENCE_ANONYMOUSC_N5QQH2_H_ +#ifndef _TAO_IDL_SEQUENCE_ANONYMOUSC_SRPGDL_H_ +#define _TAO_IDL_SEQUENCE_ANONYMOUSC_SRPGDL_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/sequence_anonymousS.cpp b/tests/IDL_Test/sequence_anonymousS.cpp index 57e13ca..e66502a 100644 --- a/tests/IDL_Test/sequence_anonymousS.cpp +++ b/tests/IDL_Test/sequence_anonymousS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_SEQUENCE_ANONYMOUSS_ZOSTY0_CPP_ -#define _TAO_IDL_SEQUENCE_ANONYMOUSS_ZOSTY0_CPP_ +#ifndef _TAO_IDL_SEQUENCE_ANONYMOUSS_ZENZRK_CPP_ +#define _TAO_IDL_SEQUENCE_ANONYMOUSS_ZENZRK_CPP_ #include "sequence_anonymousS.h" @@ -144,15 +144,8 @@ static TAO_AMH_seqTest_Perfect_Hash_OpTable tao_AMH_seqTest_optable; POA_AMH_seqTest::POA_AMH_seqTest () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_seqTest_optable); -} - -POA_AMH_seqTest::POA_AMH_seqTest (const POA_AMH_seqTest& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_seqTest_optable); } @@ -207,7 +200,7 @@ POA_AMH_seqTest::send_dozen_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -379,15 +372,8 @@ _TAO_seqTest_Direct_Proxy_Impl::send_dozen ( POA_seqTest::POA_seqTest () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_seqTest_optable); -} - -POA_seqTest::POA_seqTest (const POA_seqTest& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_seqTest_optable); } @@ -471,7 +457,7 @@ void POA_seqTest::send_dozen_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -493,7 +479,7 @@ const char* POA_seqTest::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -506,7 +492,7 @@ void POA_seqTest::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -710,16 +696,8 @@ _TAO_AMI_seqTestHandler_Direct_Proxy_Impl::send_dozen_excep ( POA_AMI_seqTestHandler::POA_AMI_seqTestHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_seqTestHandler_optable); -} - -POA_AMI_seqTestHandler::POA_AMI_seqTestHandler (const POA_AMI_seqTestHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_seqTestHandler_optable); } @@ -880,7 +858,7 @@ void POA_AMI_seqTestHandler::send_dozen_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -903,7 +881,7 @@ const char* POA_AMI_seqTestHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -916,7 +894,7 @@ void POA_AMI_seqTestHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/sequence_anonymousS.h b/tests/IDL_Test/sequence_anonymousS.h index 463ea78..98c3279 100644 --- a/tests/IDL_Test/sequence_anonymousS.h +++ b/tests/IDL_Test/sequence_anonymousS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_SEQUENCE_ANONYMOUSS_ZOSTY0_H_ -#define _TAO_IDL_SEQUENCE_ANONYMOUSS_ZOSTY0_H_ +#ifndef _TAO_IDL_SEQUENCE_ANONYMOUSS_ZENZRK_H_ +#define _TAO_IDL_SEQUENCE_ANONYMOUSS_ZENZRK_H_ #include /**/ "ace/pre.h" @@ -270,7 +270,7 @@ class TAO_IDL_TEST_STUB_Export POA_seqTest typedef ::seqTest_ptr _stub_ptr_type; typedef ::seqTest_var _stub_var_type; - POA_seqTest (const POA_seqTest& rhs); + POA_seqTest (const POA_seqTest& rhs) = default; virtual ~POA_seqTest () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -368,7 +368,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_seqTestHandler typedef ::AMI_seqTestHandler_ptr _stub_ptr_type; typedef ::AMI_seqTestHandler_var _stub_var_type; - POA_AMI_seqTestHandler (const POA_AMI_seqTestHandler& rhs); + POA_AMI_seqTestHandler (const POA_AMI_seqTestHandler& rhs) = default; virtual ~POA_AMI_seqTestHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/simple2C.h b/tests/IDL_Test/simple2C.h index a9fa7dd..5a5a44f 100644 --- a/tests/IDL_Test/simple2C.h +++ b/tests/IDL_Test/simple2C.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_SIMPLE2C_AHHDAN_H_ -#define _TAO_IDL_SIMPLE2C_AHHDAN_H_ +#ifndef _TAO_IDL_SIMPLE2C_CC3KVJ_H_ +#define _TAO_IDL_SIMPLE2C_CC3KVJ_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/simple2S.cpp b/tests/IDL_Test/simple2S.cpp index ee8b396..cad8023 100644 --- a/tests/IDL_Test/simple2S.cpp +++ b/tests/IDL_Test/simple2S.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_SIMPLE2S_5KOFXD_CPP_ -#define _TAO_IDL_SIMPLE2S_5KOFXD_CPP_ +#ifndef _TAO_IDL_SIMPLE2S_Q2F42J_CPP_ +#define _TAO_IDL_SIMPLE2S_Q2F42J_CPP_ #include "simple2S.h" @@ -150,17 +150,8 @@ static TAO_AMH_simple3_Perfect_Hash_OpTable tao_AMH_simple3_optable; POA_AMH_simple3::POA_AMH_simple3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_simple3_optable); -} - -POA_AMH_simple3::POA_AMH_simple3 (const POA_AMH_simple3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_AMH_simple (rhs), - POA_AMH_simple2 (rhs) { + this->optable_ = std::addressof (tao_AMH_simple3_optable); } @@ -266,7 +257,7 @@ POA_AMH_simple3::op4_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -475,17 +466,8 @@ _TAO_simple3_Direct_Proxy_Impl::op4 ( POA_simple3::POA_simple3 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_simple3_optable); -} - -POA_simple3::POA_simple3 (const POA_simple3& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_simple (rhs), - POA_simple2 (rhs) { + this->optable_ = std::addressof (tao_simple3_optable); } @@ -723,7 +705,7 @@ void POA_simple3::op4_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -747,7 +729,7 @@ const char* POA_simple3::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -760,7 +742,7 @@ void POA_simple3::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1084,18 +1066,8 @@ _TAO_AMI_simple3Handler_Direct_Proxy_Impl::op4_excep ( POA_AMI_simple3Handler::POA_AMI_simple3Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_simple3Handler_optable); -} - -POA_AMI_simple3Handler::POA_AMI_simple3Handler (const POA_AMI_simple3Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_AMI_simpleHandler (rhs), - POA_AMI_simple2Handler (rhs) { + this->optable_ = std::addressof (tao_AMI_simple3Handler_optable); } @@ -1549,7 +1521,7 @@ void POA_AMI_simple3Handler::op4_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1574,7 +1546,7 @@ const char* POA_AMI_simple3Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1587,7 +1559,7 @@ void POA_AMI_simple3Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/simple2S.h b/tests/IDL_Test/simple2S.h index 43f9aee..647d620 100644 --- a/tests/IDL_Test/simple2S.h +++ b/tests/IDL_Test/simple2S.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_SIMPLE2S_5KOFXD_H_ -#define _TAO_IDL_SIMPLE2S_5KOFXD_H_ +#ifndef _TAO_IDL_SIMPLE2S_Q2F42J_H_ +#define _TAO_IDL_SIMPLE2S_Q2F42J_H_ #include /**/ "ace/pre.h" @@ -229,7 +229,7 @@ class TAO_IDL_TEST_STUB_Export POA_simple3 typedef ::simple3_ptr _stub_ptr_type; typedef ::simple3_var _stub_var_type; - POA_simple3 (const POA_simple3& rhs); + POA_simple3 (const POA_simple3& rhs) = default; virtual ~POA_simple3 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -365,7 +365,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_simple3Handler typedef ::AMI_simple3Handler_ptr _stub_ptr_type; typedef ::AMI_simple3Handler_var _stub_var_type; - POA_AMI_simple3Handler (const POA_AMI_simple3Handler& rhs); + POA_AMI_simple3Handler (const POA_AMI_simple3Handler& rhs) = default; virtual ~POA_AMI_simple3Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/simpleC.h b/tests/IDL_Test/simpleC.h index 9c2b933..77e0c71 100644 --- a/tests/IDL_Test/simpleC.h +++ b/tests/IDL_Test/simpleC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_SIMPLEC_KFSPCI_H_ -#define _TAO_IDL_SIMPLEC_KFSPCI_H_ +#ifndef _TAO_IDL_SIMPLEC_LDEUXJ_H_ +#define _TAO_IDL_SIMPLEC_LDEUXJ_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/simpleS.cpp b/tests/IDL_Test/simpleS.cpp index 04c90e1..3254057 100644 --- a/tests/IDL_Test/simpleS.cpp +++ b/tests/IDL_Test/simpleS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_SIMPLES_GCEHOZ_CPP_ -#define _TAO_IDL_SIMPLES_GCEHOZ_CPP_ +#ifndef _TAO_IDL_SIMPLES_8DTDO9_CPP_ +#define _TAO_IDL_SIMPLES_8DTDO9_CPP_ #include "simpleS.h" @@ -145,15 +145,8 @@ static TAO_AMH_simple_Perfect_Hash_OpTable tao_AMH_simple_optable; POA_AMH_simple::POA_AMH_simple () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_simple_optable); -} - -POA_AMH_simple::POA_AMH_simple (const POA_AMH_simple& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_AMH_simple_optable); } @@ -211,7 +204,7 @@ POA_AMH_simple::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -387,15 +380,8 @@ _TAO_simple_Direct_Proxy_Impl::op ( POA_simple::POA_simple () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_simple_optable); -} - -POA_simple::POA_simple (const POA_simple& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_simple_optable); } @@ -512,7 +498,7 @@ void POA_simple::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -534,7 +520,7 @@ const char* POA_simple::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -547,7 +533,7 @@ void POA_simple::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -759,16 +745,8 @@ _TAO_AMI_simpleHandler_Direct_Proxy_Impl::op_excep ( POA_AMI_simpleHandler::POA_AMI_simpleHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_simpleHandler_optable); -} - -POA_AMI_simpleHandler::POA_AMI_simpleHandler (const POA_AMI_simpleHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_simpleHandler_optable); } @@ -984,7 +962,7 @@ void POA_AMI_simpleHandler::op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1007,7 +985,7 @@ const char* POA_AMI_simpleHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1020,7 +998,7 @@ void POA_AMI_simpleHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1129,16 +1107,8 @@ static TAO_AMH_simple2_Perfect_Hash_OpTable tao_AMH_simple2_optable; POA_AMH_simple2::POA_AMH_simple2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMH_simple2_optable); -} - -POA_AMH_simple2::POA_AMH_simple2 (const POA_AMH_simple2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_AMH_simple (rhs) { + this->optable_ = std::addressof (tao_AMH_simple2_optable); } @@ -1196,7 +1166,7 @@ POA_AMH_simple2::op2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1374,16 +1344,8 @@ _TAO_simple2_Direct_Proxy_Impl::op2 ( POA_simple2::POA_simple2 () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_simple2_optable); -} - -POA_simple2::POA_simple2 (const POA_simple2& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - POA_simple (rhs) { + this->optable_ = std::addressof (tao_simple2_optable); } @@ -1500,7 +1462,7 @@ void POA_simple2::op2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1523,7 +1485,7 @@ const char* POA_simple2::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1536,7 +1498,7 @@ void POA_simple2::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1746,17 +1708,8 @@ _TAO_AMI_simple2Handler_Direct_Proxy_Impl::op2_excep ( POA_AMI_simple2Handler::POA_AMI_simple2Handler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_AMI_simple2Handler_optable); -} - -POA_AMI_simple2Handler::POA_AMI_simple2Handler (const POA_AMI_simple2Handler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs), - POA_AMI_simpleHandler (rhs) { + this->optable_ = std::addressof (tao_AMI_simple2Handler_optable); } @@ -1963,7 +1916,7 @@ void POA_AMI_simple2Handler::op2_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1987,7 +1940,7 @@ const char* POA_AMI_simple2Handler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2000,7 +1953,7 @@ void POA_AMI_simple2Handler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/simpleS.h b/tests/IDL_Test/simpleS.h index 4c35377..b217724 100644 --- a/tests/IDL_Test/simpleS.h +++ b/tests/IDL_Test/simpleS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_SIMPLES_GCEHOZ_H_ -#define _TAO_IDL_SIMPLES_GCEHOZ_H_ +#ifndef _TAO_IDL_SIMPLES_8DTDO9_H_ +#define _TAO_IDL_SIMPLES_8DTDO9_H_ #include /**/ "ace/pre.h" @@ -286,7 +286,7 @@ class TAO_IDL_TEST_STUB_Export POA_simple typedef ::simple_ptr _stub_ptr_type; typedef ::simple_var _stub_var_type; - POA_simple (const POA_simple& rhs); + POA_simple (const POA_simple& rhs) = default; virtual ~POA_simple () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -388,7 +388,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_simpleHandler typedef ::AMI_simpleHandler_ptr _stub_ptr_type; typedef ::AMI_simpleHandler_var _stub_var_type; - POA_AMI_simpleHandler (const POA_AMI_simpleHandler& rhs); + POA_AMI_simpleHandler (const POA_AMI_simpleHandler& rhs) = default; virtual ~POA_AMI_simpleHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -524,7 +524,7 @@ class TAO_IDL_TEST_STUB_Export POA_simple2 typedef ::simple2_ptr _stub_ptr_type; typedef ::simple2_var _stub_var_type; - POA_simple2 (const POA_simple2& rhs); + POA_simple2 (const POA_simple2& rhs) = default; virtual ~POA_simple2 () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -626,7 +626,7 @@ class TAO_IDL_TEST_STUB_Export POA_AMI_simple2Handler typedef ::AMI_simple2Handler_ptr _stub_ptr_type; typedef ::AMI_simple2Handler_var _stub_var_type; - POA_AMI_simple2Handler (const POA_AMI_simple2Handler& rhs); + POA_AMI_simple2Handler (const POA_AMI_simple2Handler& rhs) = default; virtual ~POA_AMI_simple2Handler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/string_valueC.h b/tests/IDL_Test/string_valueC.h index 08d7b4b..c1a5e3a 100644 --- a/tests/IDL_Test/string_valueC.h +++ b/tests/IDL_Test/string_valueC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_STRING_VALUEC_LU8RXW_H_ -#define _TAO_IDL_STRING_VALUEC_LU8RXW_H_ +#ifndef _TAO_IDL_STRING_VALUEC_V9SGYI_H_ +#define _TAO_IDL_STRING_VALUEC_V9SGYI_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/string_valueS.cpp b/tests/IDL_Test/string_valueS.cpp index 6ae4fc1..6a772eb 100644 --- a/tests/IDL_Test/string_valueS.cpp +++ b/tests/IDL_Test/string_valueS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_STRING_VALUES_LU8RXW_CPP_ -#define _TAO_IDL_STRING_VALUES_LU8RXW_CPP_ +#ifndef _TAO_IDL_STRING_VALUES_Y5XDKI_CPP_ +#define _TAO_IDL_STRING_VALUES_Y5XDKI_CPP_ #include "string_valueS.h" diff --git a/tests/IDL_Test/string_valueS.h b/tests/IDL_Test/string_valueS.h index 96d137c..21f5849 100644 --- a/tests/IDL_Test/string_valueS.h +++ b/tests/IDL_Test/string_valueS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_STRING_VALUES_LU8RXW_H_ -#define _TAO_IDL_STRING_VALUES_LU8RXW_H_ +#ifndef _TAO_IDL_STRING_VALUES_Y5XDKI_H_ +#define _TAO_IDL_STRING_VALUES_Y5XDKI_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/structC.h b/tests/IDL_Test/structC.h index c063f97..44717a7 100644 --- a/tests/IDL_Test/structC.h +++ b/tests/IDL_Test/structC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_STRUCTC_ZDOPLJ_H_ -#define _TAO_IDL_STRUCTC_ZDOPLJ_H_ +#ifndef _TAO_IDL_STRUCTC_4UDCDN_H_ +#define _TAO_IDL_STRUCTC_4UDCDN_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/structS.cpp b/tests/IDL_Test/structS.cpp index a8d747e..900e06f 100644 --- a/tests/IDL_Test/structS.cpp +++ b/tests/IDL_Test/structS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_STRUCTS_WAHOT1_CPP_ -#define _TAO_IDL_STRUCTS_WAHOT1_CPP_ +#ifndef _TAO_IDL_STRUCTS_PO6XK9_CPP_ +#define _TAO_IDL_STRUCTS_PO6XK9_CPP_ #include "structS.h" diff --git a/tests/IDL_Test/structS.h b/tests/IDL_Test/structS.h index 5ec3df1..b2117ad 100644 --- a/tests/IDL_Test/structS.h +++ b/tests/IDL_Test/structS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_STRUCTS_WAHOT1_H_ -#define _TAO_IDL_STRUCTS_WAHOT1_H_ +#ifndef _TAO_IDL_STRUCTS_PO6XK9_H_ +#define _TAO_IDL_STRUCTS_PO6XK9_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/typecodeA.h b/tests/IDL_Test/typecodeA.h index 74e9148..8fccdc2 100644 --- a/tests/IDL_Test/typecodeA.h +++ b/tests/IDL_Test/typecodeA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_TYPECODEA_UMN99Q_H_ -#define _TAO_IDL_TYPECODEA_UMN99Q_H_ +#ifndef _TAO_IDL_TYPECODEA_1XJBLP_H_ +#define _TAO_IDL_TYPECODEA_1XJBLP_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/typecodeC.h b/tests/IDL_Test/typecodeC.h index 14ce6e6..fcb1fe4 100644 --- a/tests/IDL_Test/typecodeC.h +++ b/tests/IDL_Test/typecodeC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_TYPECODEC_QNTPA8_H_ -#define _TAO_IDL_TYPECODEC_QNTPA8_H_ +#ifndef _TAO_IDL_TYPECODEC_MXATAN_H_ +#define _TAO_IDL_TYPECODEC_MXATAN_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/typecodeS.cpp b/tests/IDL_Test/typecodeS.cpp index e0e2c7d..be05d97 100644 --- a/tests/IDL_Test/typecodeS.cpp +++ b/tests/IDL_Test/typecodeS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_TYPECODES_QNTPA8_CPP_ -#define _TAO_IDL_TYPECODES_QNTPA8_CPP_ +#ifndef _TAO_IDL_TYPECODES_MXATAN_CPP_ +#define _TAO_IDL_TYPECODES_MXATAN_CPP_ #include "typecodeS.h" diff --git a/tests/IDL_Test/typecodeS.h b/tests/IDL_Test/typecodeS.h index 1bf8443..96fda3d 100644 --- a/tests/IDL_Test/typecodeS.h +++ b/tests/IDL_Test/typecodeS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_TYPECODES_QNTPA8_H_ -#define _TAO_IDL_TYPECODES_QNTPA8_H_ +#ifndef _TAO_IDL_TYPECODES_MXATAN_H_ +#define _TAO_IDL_TYPECODES_MXATAN_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/typedefA.h b/tests/IDL_Test/typedefA.h index 2057826..085c7ec 100644 --- a/tests/IDL_Test/typedefA.h +++ b/tests/IDL_Test/typedefA.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:767 -#ifndef _TAO_IDL_TYPEDEFA_7K49AV_H_ -#define _TAO_IDL_TYPEDEFA_7K49AV_H_ +#ifndef _TAO_IDL_TYPEDEFA_AIFYEY_H_ +#define _TAO_IDL_TYPEDEFA_AIFYEY_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/typedefC.h b/tests/IDL_Test/typedefC.h index ac228ca..ea18e3b 100644 --- a/tests/IDL_Test/typedefC.h +++ b/tests/IDL_Test/typedefC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_TYPEDEFC_7K49AV_H_ -#define _TAO_IDL_TYPEDEFC_7K49AV_H_ +#ifndef _TAO_IDL_TYPEDEFC_AIFYEY_H_ +#define _TAO_IDL_TYPEDEFC_AIFYEY_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/typedefS.cpp b/tests/IDL_Test/typedefS.cpp index 3ec8ab6..ff013e9 100644 --- a/tests/IDL_Test/typedefS.cpp +++ b/tests/IDL_Test/typedefS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_TYPEDEFS_NZ9IZB_CPP_ -#define _TAO_IDL_TYPEDEFS_NZ9IZB_CPP_ +#ifndef _TAO_IDL_TYPEDEFS_CBC3HR_CPP_ +#define _TAO_IDL_TYPEDEFS_CBC3HR_CPP_ #include "typedefS.h" @@ -147,15 +147,8 @@ static TAO_TestModule_AMH_TestInterface_Perfect_Hash_OpTable tao_TestModule_AMH_ POA_TestModule::AMH_TestInterface::AMH_TestInterface () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_TestModule_AMH_TestInterface_optable); -} - -POA_TestModule::AMH_TestInterface::AMH_TestInterface (const AMH_TestInterface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_TestModule_AMH_TestInterface_optable); } @@ -258,7 +251,7 @@ POA_TestModule::AMH_TestInterface::set_typedef_2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -455,15 +448,8 @@ POA_TestModule::_TAO_TestInterface_Direct_Proxy_Impl::set_typedef_2 ( POA_TestModule::TestInterface::TestInterface () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_TestModule_TestInterface_optable); -} - -POA_TestModule::TestInterface::TestInterface (const TestInterface& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_TestModule_TestInterface_optable); } @@ -632,7 +618,7 @@ void POA_TestModule::TestInterface::set_typedef_2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -654,7 +640,7 @@ const char* POA_TestModule::TestInterface::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -667,7 +653,7 @@ void POA_TestModule::TestInterface::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -956,16 +942,8 @@ POA_TestModule::_TAO_AMI_TestInterfaceHandler_Direct_Proxy_Impl::set_typedef_2_e POA_TestModule::AMI_TestInterfaceHandler::AMI_TestInterfaceHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_TestModule_AMI_TestInterfaceHandler_optable); -} - -POA_TestModule::AMI_TestInterfaceHandler::AMI_TestInterfaceHandler (const AMI_TestInterfaceHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_TestModule_AMI_TestInterfaceHandler_optable); } @@ -1262,7 +1240,7 @@ void POA_TestModule::AMI_TestInterfaceHandler::set_typedef_2_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1285,7 +1263,7 @@ const char* POA_TestModule::AMI_TestInterfaceHandler::_interface_repository_id ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1298,7 +1276,7 @@ void POA_TestModule::AMI_TestInterfaceHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1408,15 +1386,8 @@ static TAO_bug_2124_AMH_Foo_Perfect_Hash_OpTable tao_bug_2124_AMH_Foo_optable; POA_bug_2124::AMH_Foo::AMH_Foo () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2124_AMH_Foo_optable); -} - -POA_bug_2124::AMH_Foo::AMH_Foo (const AMH_Foo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_bug_2124_AMH_Foo_optable); } @@ -1519,7 +1490,7 @@ POA_bug_2124::AMH_Foo::op2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1716,15 +1687,8 @@ POA_bug_2124::_TAO_Foo_Direct_Proxy_Impl::op2 ( POA_bug_2124::Foo::Foo () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2124_Foo_optable); -} - -POA_bug_2124::Foo::Foo (const Foo& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_bug_2124_Foo_optable); } @@ -1893,7 +1857,7 @@ void POA_bug_2124::Foo::op2_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1915,7 +1879,7 @@ const char* POA_bug_2124::Foo::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1928,7 +1892,7 @@ void POA_bug_2124::Foo::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2217,16 +2181,8 @@ POA_bug_2124::_TAO_AMI_FooHandler_Direct_Proxy_Impl::op2_excep ( POA_bug_2124::AMI_FooHandler::AMI_FooHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2124_AMI_FooHandler_optable); -} - -POA_bug_2124::AMI_FooHandler::AMI_FooHandler (const AMI_FooHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_bug_2124_AMI_FooHandler_optable); } @@ -2523,7 +2479,7 @@ void POA_bug_2124::AMI_FooHandler::op2_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2546,7 +2502,7 @@ const char* POA_bug_2124::AMI_FooHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -2559,7 +2515,7 @@ void POA_bug_2124::AMI_FooHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -2666,15 +2622,8 @@ static TAO_bug_2122_One_AMH_Whatever_Perfect_Hash_OpTable tao_bug_2122_One_AMH_W POA_bug_2122::One::AMH_Whatever::AMH_Whatever () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2122_One_AMH_Whatever_optable); -} - -POA_bug_2122::One::AMH_Whatever::AMH_Whatever (const AMH_Whatever& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_bug_2122_One_AMH_Whatever_optable); } @@ -2729,7 +2678,7 @@ POA_bug_2122::One::AMH_Whatever::someOp_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -2901,15 +2850,8 @@ POA_bug_2122::One::_TAO_Whatever_Direct_Proxy_Impl::someOp ( POA_bug_2122::One::Whatever::Whatever () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2122_One_Whatever_optable); -} - -POA_bug_2122::One::Whatever::Whatever (const Whatever& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_bug_2122_One_Whatever_optable); } @@ -3001,7 +2943,7 @@ void POA_bug_2122::One::Whatever::someOp_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3023,7 +2965,7 @@ const char* POA_bug_2122::One::Whatever::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3036,7 +2978,7 @@ void POA_bug_2122::One::Whatever::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3232,16 +3174,8 @@ POA_bug_2122::One::_TAO_AMI_WhateverHandler_Direct_Proxy_Impl::someOp_excep ( POA_bug_2122::One::AMI_WhateverHandler::AMI_WhateverHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2122_One_AMI_WhateverHandler_optable); -} - -POA_bug_2122::One::AMI_WhateverHandler::AMI_WhateverHandler (const AMI_WhateverHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_bug_2122_One_AMI_WhateverHandler_optable); } @@ -3401,7 +3335,7 @@ void POA_bug_2122::One::AMI_WhateverHandler::someOp_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3424,7 +3358,7 @@ const char* POA_bug_2122::One::AMI_WhateverHandler::_interface_repository_id () // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3437,7 +3371,7 @@ void POA_bug_2122::One::AMI_WhateverHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -3544,15 +3478,8 @@ static TAO_bug_2122_Two_AMH_WhoCares_Perfect_Hash_OpTable tao_bug_2122_Two_AMH_W POA_bug_2122::Two::AMH_WhoCares::AMH_WhoCares () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2122_Two_AMH_WhoCares_optable); -} - -POA_bug_2122::Two::AMH_WhoCares::AMH_WhoCares (const AMH_WhoCares& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_bug_2122_Two_AMH_WhoCares_optable); } @@ -3607,7 +3534,7 @@ POA_bug_2122::Two::AMH_WhoCares::someOp_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3779,15 +3706,8 @@ POA_bug_2122::Two::_TAO_WhoCares_Direct_Proxy_Impl::someOp ( POA_bug_2122::Two::WhoCares::WhoCares () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2122_Two_WhoCares_optable); -} - -POA_bug_2122::Two::WhoCares::WhoCares (const WhoCares& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_bug_2122_Two_WhoCares_optable); } @@ -3879,7 +3799,7 @@ void POA_bug_2122::Two::WhoCares::someOp_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -3901,7 +3821,7 @@ const char* POA_bug_2122::Two::WhoCares::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -3914,7 +3834,7 @@ void POA_bug_2122::Two::WhoCares::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4110,16 +4030,8 @@ POA_bug_2122::Two::_TAO_AMI_WhoCaresHandler_Direct_Proxy_Impl::someOp_excep ( POA_bug_2122::Two::AMI_WhoCaresHandler::AMI_WhoCaresHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2122_Two_AMI_WhoCaresHandler_optable); -} - -POA_bug_2122::Two::AMI_WhoCaresHandler::AMI_WhoCaresHandler (const AMI_WhoCaresHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_bug_2122_Two_AMI_WhoCaresHandler_optable); } @@ -4279,7 +4191,7 @@ void POA_bug_2122::Two::AMI_WhoCaresHandler::someOp_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4302,7 +4214,7 @@ const char* POA_bug_2122::Two::AMI_WhoCaresHandler::_interface_repository_id () // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4315,7 +4227,7 @@ void POA_bug_2122::Two::AMI_WhoCaresHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4422,15 +4334,8 @@ static TAO_bug_2122_Three_AMH_WhoCares_Perfect_Hash_OpTable tao_bug_2122_Three_A POA_bug_2122::Three::AMH_WhoCares::AMH_WhoCares () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2122_Three_AMH_WhoCares_optable); -} - -POA_bug_2122::Three::AMH_WhoCares::AMH_WhoCares (const AMH_WhoCares& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_bug_2122_Three_AMH_WhoCares_optable); } @@ -4485,7 +4390,7 @@ POA_bug_2122::Three::AMH_WhoCares::someOp_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4657,15 +4562,8 @@ POA_bug_2122::Three::_TAO_WhoCares_Direct_Proxy_Impl::someOp ( POA_bug_2122::Three::WhoCares::WhoCares () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2122_Three_WhoCares_optable); -} - -POA_bug_2122::Three::WhoCares::WhoCares (const WhoCares& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_bug_2122_Three_WhoCares_optable); } @@ -4757,7 +4655,7 @@ void POA_bug_2122::Three::WhoCares::someOp_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -4779,7 +4677,7 @@ const char* POA_bug_2122::Three::WhoCares::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -4792,7 +4690,7 @@ void POA_bug_2122::Three::WhoCares::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -4988,16 +4886,8 @@ POA_bug_2122::Three::_TAO_AMI_WhoCaresHandler_Direct_Proxy_Impl::someOp_excep ( POA_bug_2122::Three::AMI_WhoCaresHandler::AMI_WhoCaresHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_bug_2122_Three_AMI_WhoCaresHandler_optable); -} - -POA_bug_2122::Three::AMI_WhoCaresHandler::AMI_WhoCaresHandler (const AMI_WhoCaresHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_bug_2122_Three_AMI_WhoCaresHandler_optable); } @@ -5157,7 +5047,7 @@ void POA_bug_2122::Three::AMI_WhoCaresHandler::someOp_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -5180,7 +5070,7 @@ const char* POA_bug_2122::Three::AMI_WhoCaresHandler::_interface_repository_id ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -5193,7 +5083,7 @@ void POA_bug_2122::Three::AMI_WhoCaresHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/typedefS.h b/tests/IDL_Test/typedefS.h index e428afe..0b37ba2 100644 --- a/tests/IDL_Test/typedefS.h +++ b/tests/IDL_Test/typedefS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_TYPEDEFS_RBYUFY_H_ -#define _TAO_IDL_TYPEDEFS_RBYUFY_H_ +#ifndef _TAO_IDL_TYPEDEFS_G0ARHF_H_ +#define _TAO_IDL_TYPEDEFS_G0ARHF_H_ #include /**/ "ace/pre.h" @@ -660,7 +660,7 @@ class TAO_IDL_TEST_STUB_Export TestInterface typedef ::TestModule::TestInterface_ptr _stub_ptr_type; typedef ::TestModule::TestInterface_var _stub_var_type; - TestInterface (const TestInterface& rhs); + TestInterface (const TestInterface& rhs) = default; virtual ~TestInterface () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -783,7 +783,7 @@ class TAO_IDL_TEST_STUB_Export AMI_TestInterfaceHandler typedef ::TestModule::AMI_TestInterfaceHandler_ptr _stub_ptr_type; typedef ::TestModule::AMI_TestInterfaceHandler_var _stub_var_type; - AMI_TestInterfaceHandler (const AMI_TestInterfaceHandler& rhs); + AMI_TestInterfaceHandler (const AMI_TestInterfaceHandler& rhs) = default; virtual ~AMI_TestInterfaceHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -972,7 +972,7 @@ class TAO_IDL_TEST_STUB_Export Foo typedef ::bug_2124::Foo_ptr _stub_ptr_type; typedef ::bug_2124::Foo_var _stub_var_type; - Foo (const Foo& rhs); + Foo (const Foo& rhs) = default; virtual ~Foo () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1095,7 +1095,7 @@ class TAO_IDL_TEST_STUB_Export AMI_FooHandler typedef ::bug_2124::AMI_FooHandler_ptr _stub_ptr_type; typedef ::bug_2124::AMI_FooHandler_var _stub_var_type; - AMI_FooHandler (const AMI_FooHandler& rhs); + AMI_FooHandler (const AMI_FooHandler& rhs) = default; virtual ~AMI_FooHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1277,7 +1277,7 @@ namespace POA_bug_2122 typedef ::bug_2122::One::Whatever_ptr _stub_ptr_type; typedef ::bug_2122::One::Whatever_var _stub_var_type; - Whatever (const Whatever& rhs); + Whatever (const Whatever& rhs) = default; virtual ~Whatever () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1374,7 +1374,7 @@ namespace POA_bug_2122 typedef ::bug_2122::One::AMI_WhateverHandler_ptr _stub_ptr_type; typedef ::bug_2122::One::AMI_WhateverHandler_var _stub_var_type; - AMI_WhateverHandler (const AMI_WhateverHandler& rhs); + AMI_WhateverHandler (const AMI_WhateverHandler& rhs) = default; virtual ~AMI_WhateverHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1517,7 +1517,7 @@ class TAO_IDL_TEST_STUB_Export WhoCares typedef ::bug_2122::Two::WhoCares_ptr _stub_ptr_type; typedef ::bug_2122::Two::WhoCares_var _stub_var_type; - WhoCares (const WhoCares& rhs); + WhoCares (const WhoCares& rhs) = default; virtual ~WhoCares () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1614,7 +1614,7 @@ class TAO_IDL_TEST_STUB_Export AMI_WhoCaresHandler typedef ::bug_2122::Two::AMI_WhoCaresHandler_ptr _stub_ptr_type; typedef ::bug_2122::Two::AMI_WhoCaresHandler_var _stub_var_type; - AMI_WhoCaresHandler (const AMI_WhoCaresHandler& rhs); + AMI_WhoCaresHandler (const AMI_WhoCaresHandler& rhs) = default; virtual ~AMI_WhoCaresHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1757,7 +1757,7 @@ class TAO_IDL_TEST_STUB_Export WhoCares typedef ::bug_2122::Three::WhoCares_ptr _stub_ptr_type; typedef ::bug_2122::Three::WhoCares_var _stub_var_type; - WhoCares (const WhoCares& rhs); + WhoCares (const WhoCares& rhs) = default; virtual ~WhoCares () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -1854,7 +1854,7 @@ class TAO_IDL_TEST_STUB_Export AMI_WhoCaresHandler typedef ::bug_2122::Three::AMI_WhoCaresHandler_ptr _stub_ptr_type; typedef ::bug_2122::Three::AMI_WhoCaresHandler_var _stub_var_type; - AMI_WhoCaresHandler (const AMI_WhoCaresHandler& rhs); + AMI_WhoCaresHandler (const AMI_WhoCaresHandler& rhs) = default; virtual ~AMI_WhoCaresHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/typeprefixC.h b/tests/IDL_Test/typeprefixC.h index 62d3f72..1c28c63 100644 --- a/tests/IDL_Test/typeprefixC.h +++ b/tests/IDL_Test/typeprefixC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_TYPEPREFIXC_2LYJXK_H_ -#define _TAO_IDL_TYPEPREFIXC_2LYJXK_H_ +#ifndef _TAO_IDL_TYPEPREFIXC_Z3JRYO_H_ +#define _TAO_IDL_TYPEPREFIXC_Z3JRYO_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/typeprefixS.cpp b/tests/IDL_Test/typeprefixS.cpp index 9262f7a..13f058f 100644 --- a/tests/IDL_Test/typeprefixS.cpp +++ b/tests/IDL_Test/typeprefixS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_TYPEPREFIXS_2LYJXK_CPP_ -#define _TAO_IDL_TYPEPREFIXS_2LYJXK_CPP_ +#ifndef _TAO_IDL_TYPEPREFIXS_7PPZ1N_CPP_ +#define _TAO_IDL_TYPEPREFIXS_7PPZ1N_CPP_ #include "typeprefixS.h" @@ -145,20 +145,14 @@ static TAO_A_AMH_B_Perfect_Hash_OpTable tao_A_AMH_B_optable; POA_A::AMH_B::AMH_B () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_A_AMH_B_optable); -} - -POA_A::AMH_B::AMH_B (const AMH_B& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_A_AMH_B_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -309,20 +303,14 @@ POA_A::_TAO_B_Direct_Proxy_Impl::~_TAO_B_Direct_Proxy_Impl () POA_A::B::B () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_A_B_optable); -} - -POA_A::B::B (const B& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) -{ + this->optable_ = std::addressof (tao_A_B_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -344,7 +332,7 @@ const char* POA_A::B::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -357,7 +345,7 @@ void POA_A::B::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -483,21 +471,14 @@ POA_A::_TAO_AMI_BHandler_Direct_Proxy_Impl::~_TAO_AMI_BHandler_Direct_Proxy_Impl POA_A::AMI_BHandler::AMI_BHandler () : TAO_ServantBase () { - this->optable_ = std::addressof(tao_A_AMI_BHandler_optable); -} - -POA_A::AMI_BHandler::AMI_BHandler (const AMI_BHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) -{ + this->optable_ = std::addressof (tao_A_AMI_BHandler_optable); } // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -520,7 +501,7 @@ const char* POA_A::AMI_BHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -533,7 +514,7 @@ void POA_A::AMI_BHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -641,15 +622,8 @@ static TAO_A_AMH_C_Perfect_Hash_OpTable tao_A_AMH_C_optable; POA_A::AMH_C::AMH_C () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_AMH_C_optable); -} - -POA_A::AMH_C::AMH_C (const AMH_C& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_A_AMH_C_optable); } @@ -704,7 +678,7 @@ POA_A::AMH_C::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -877,15 +851,8 @@ POA_A::_TAO_C_Direct_Proxy_Impl::op ( POA_A::C::C () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_C_optable); -} - -POA_A::C::C (const C& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_A_C_optable); } @@ -973,7 +940,7 @@ void POA_A::C::op_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -995,7 +962,7 @@ const char* POA_A::C::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1008,7 +975,7 @@ void POA_A::C::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 @@ -1206,16 +1173,8 @@ POA_A::_TAO_AMI_CHandler_Direct_Proxy_Impl::op_excep ( POA_A::AMI_CHandler::AMI_CHandler () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_A_AMI_CHandler_optable); -} - -POA_A::AMI_CHandler::AMI_CHandler (const AMI_CHandler& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs), - ::POA_Messaging::ReplyHandler (rhs) { + this->optable_ = std::addressof (tao_A_AMI_CHandler_optable); } @@ -1367,7 +1326,7 @@ void POA_A::AMI_CHandler::op_excep_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -1390,7 +1349,7 @@ const char* POA_A::AMI_CHandler::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -1403,7 +1362,7 @@ void POA_A::AMI_CHandler::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/IDL_Test/typeprefixS.h b/tests/IDL_Test/typeprefixS.h index 0061e2f..4352410 100644 --- a/tests/IDL_Test/typeprefixS.h +++ b/tests/IDL_Test/typeprefixS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_TYPEPREFIXS_2LYJXK_H_ -#define _TAO_IDL_TYPEPREFIXS_2LYJXK_H_ +#ifndef _TAO_IDL_TYPEPREFIXS_7PPZ1N_H_ +#define _TAO_IDL_TYPEPREFIXS_7PPZ1N_H_ #include /**/ "ace/pre.h" @@ -264,7 +264,7 @@ class TAO_IDL_TEST_STUB_Export B typedef ::A::B_ptr _stub_ptr_type; typedef ::A::B_var _stub_var_type; - B (const B& rhs); + B (const B& rhs) = default; virtual ~B () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -335,7 +335,7 @@ class TAO_IDL_TEST_STUB_Export AMI_BHandler typedef ::A::AMI_BHandler_ptr _stub_ptr_type; typedef ::A::AMI_BHandler_var _stub_var_type; - AMI_BHandler (const AMI_BHandler& rhs); + AMI_BHandler (const AMI_BHandler& rhs) = default; virtual ~AMI_BHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -433,7 +433,7 @@ class TAO_IDL_TEST_STUB_Export C typedef ::A::C_ptr _stub_ptr_type; typedef ::A::C_var _stub_var_type; - C (const C& rhs); + C (const C& rhs) = default; virtual ~C () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); @@ -530,7 +530,7 @@ class TAO_IDL_TEST_STUB_Export AMI_CHandler typedef ::A::AMI_CHandler_ptr _stub_ptr_type; typedef ::A::AMI_CHandler_var _stub_var_type; - AMI_CHandler (const AMI_CHandler& rhs); + AMI_CHandler (const AMI_CHandler& rhs) = default; virtual ~AMI_CHandler () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id); diff --git a/tests/IDL_Test/unionC.h b/tests/IDL_Test/unionC.h index 72f38fe..9260ae6 100644 --- a/tests/IDL_Test/unionC.h +++ b/tests/IDL_Test/unionC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_UNIONC_DOGZRO_H_ -#define _TAO_IDL_UNIONC_DOGZRO_H_ +#ifndef _TAO_IDL_UNIONC_IVWTKU_H_ +#define _TAO_IDL_UNIONC_IVWTKU_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/unionS.cpp b/tests/IDL_Test/unionS.cpp index ec6fc65..b003479 100644 --- a/tests/IDL_Test/unionS.cpp +++ b/tests/IDL_Test/unionS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_UNIONS_FUTA7A_CPP_ -#define _TAO_IDL_UNIONS_FUTA7A_CPP_ +#ifndef _TAO_IDL_UNIONS_ZXQLH6_CPP_ +#define _TAO_IDL_UNIONS_ZXQLH6_CPP_ #include "unionS.h" diff --git a/tests/IDL_Test/unionS.h b/tests/IDL_Test/unionS.h index 6dc2315..d880515 100644 --- a/tests/IDL_Test/unionS.h +++ b/tests/IDL_Test/unionS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_UNIONS_FUTA7A_H_ -#define _TAO_IDL_UNIONS_FUTA7A_H_ +#ifndef _TAO_IDL_UNIONS_ZXQLH6_H_ +#define _TAO_IDL_UNIONS_ZXQLH6_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/union_anonymousC.h b/tests/IDL_Test/union_anonymousC.h index bf0796a..ae8d6e0 100644 --- a/tests/IDL_Test/union_anonymousC.h +++ b/tests/IDL_Test/union_anonymousC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_UNION_ANONYMOUSC_A9XCXS_H_ -#define _TAO_IDL_UNION_ANONYMOUSC_A9XCXS_H_ +#ifndef _TAO_IDL_UNION_ANONYMOUSC_KZQR89_H_ +#define _TAO_IDL_UNION_ANONYMOUSC_KZQR89_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/union_anonymousS.cpp b/tests/IDL_Test/union_anonymousS.cpp index 87c1c02..ec5d8be 100644 --- a/tests/IDL_Test/union_anonymousS.cpp +++ b/tests/IDL_Test/union_anonymousS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_UNION_ANONYMOUSS_WLZNFO_CPP_ -#define _TAO_IDL_UNION_ANONYMOUSS_WLZNFO_CPP_ +#ifndef _TAO_IDL_UNION_ANONYMOUSS_CBPRD1_CPP_ +#define _TAO_IDL_UNION_ANONYMOUSS_CBPRD1_CPP_ #include "union_anonymousS.h" diff --git a/tests/IDL_Test/union_anonymousS.h b/tests/IDL_Test/union_anonymousS.h index 8c809e9..5845b58 100644 --- a/tests/IDL_Test/union_anonymousS.h +++ b/tests/IDL_Test/union_anonymousS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_UNION_ANONYMOUSS_WLZNFO_H_ -#define _TAO_IDL_UNION_ANONYMOUSS_WLZNFO_H_ +#ifndef _TAO_IDL_UNION_ANONYMOUSS_CBPRD1_H_ +#define _TAO_IDL_UNION_ANONYMOUSS_CBPRD1_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/valuetypeC.h b/tests/IDL_Test/valuetypeC.h index 5cd9992..b8f7eea 100644 --- a/tests/IDL_Test/valuetypeC.h +++ b/tests/IDL_Test/valuetypeC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_VALUETYPEC_OVHAWH_H_ -#define _TAO_IDL_VALUETYPEC_OVHAWH_H_ +#ifndef _TAO_IDL_VALUETYPEC_GLLMN3_H_ +#define _TAO_IDL_VALUETYPEC_GLLMN3_H_ #include /**/ "ace/pre.h" diff --git a/tests/IDL_Test/valuetypeS.cpp b/tests/IDL_Test/valuetypeS.cpp index 4f7d50e..a6f65c8 100644 --- a/tests/IDL_Test/valuetypeS.cpp +++ b/tests/IDL_Test/valuetypeS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_VALUETYPES_OJEATX_CPP_ -#define _TAO_IDL_VALUETYPES_OJEATX_CPP_ +#ifndef _TAO_IDL_VALUETYPES_AJRI6E_CPP_ +#define _TAO_IDL_VALUETYPES_AJRI6E_CPP_ #include "valuetypeS.h" diff --git a/tests/IDL_Test/valuetypeS.h b/tests/IDL_Test/valuetypeS.h index fbfc758..204d4e2 100644 --- a/tests/IDL_Test/valuetypeS.h +++ b/tests/IDL_Test/valuetypeS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_VALUETYPES_OJEATX_H_ -#define _TAO_IDL_VALUETYPES_OJEATX_H_ +#ifndef _TAO_IDL_VALUETYPES_AJRI6E_H_ +#define _TAO_IDL_VALUETYPES_AJRI6E_H_ #include /**/ "ace/pre.h" diff --git a/tests/Strategies/simple_testC.h b/tests/Strategies/simple_testC.h index 69a9507..bfe3ce0 100644 --- a/tests/Strategies/simple_testC.h +++ b/tests/Strategies/simple_testC.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:148 -#ifndef _TAO_IDL_SIMPLE_TESTC_7KRRCC_H_ -#define _TAO_IDL_SIMPLE_TESTC_7KRRCC_H_ +#ifndef _TAO_IDL_SIMPLE_TESTC_UEJDXV_H_ +#define _TAO_IDL_SIMPLE_TESTC_UEJDXV_H_ #include /**/ "ace/pre.h" diff --git a/tests/Strategies/simple_testS.cpp b/tests/Strategies/simple_testS.cpp index 4f7fe62..0c2f3c0 100644 --- a/tests/Strategies/simple_testS.cpp +++ b/tests/Strategies/simple_testS.cpp @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:631 -#ifndef _TAO_IDL_SIMPLE_TESTS_8ASC7A_CPP_ -#define _TAO_IDL_SIMPLE_TESTS_8ASC7A_CPP_ +#ifndef _TAO_IDL_SIMPLE_TESTS_UEJDXV_CPP_ +#define _TAO_IDL_SIMPLE_TESTS_UEJDXV_CPP_ #include "simple_testS.h" @@ -139,15 +139,8 @@ static TAO_Simple_Server_Perfect_Hash_OpTable tao_Simple_Server_optable; POA_Simple_Server::POA_Simple_Server () - : TAO_ServantBase () -{ - this->optable_ = std::addressof(tao_Simple_Server_optable); -} - -POA_Simple_Server::POA_Simple_Server (const POA_Simple_Server& rhs) - : TAO_Abstract_ServantBase (rhs), - TAO_ServantBase (rhs) { + this->optable_ = std::addressof (tao_Simple_Server_optable); } @@ -288,7 +281,7 @@ void POA_Simple_Server::shutdown_skel ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:155 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:139 @@ -310,7 +303,7 @@ const char* POA_Simple_Server::_interface_repository_id () const // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:394 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:378 @@ -323,7 +316,7 @@ void POA_Simple_Server::_dispatch ( // TAO_IDL - Generated from -// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:354 +// /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp:338 diff --git a/tests/Strategies/simple_testS.h b/tests/Strategies/simple_testS.h index c895a58..a106de3 100644 --- a/tests/Strategies/simple_testS.h +++ b/tests/Strategies/simple_testS.h @@ -25,8 +25,8 @@ // TAO_IDL - Generated from // /home/johnny/ACE/trunk/TAO/TAO_IDL/be/be_codegen.cpp:454 -#ifndef _TAO_IDL_SIMPLE_TESTS_8ASC7A_H_ -#define _TAO_IDL_SIMPLE_TESTS_8ASC7A_H_ +#ifndef _TAO_IDL_SIMPLE_TESTS_UEJDXV_H_ +#define _TAO_IDL_SIMPLE_TESTS_UEJDXV_H_ #include /**/ "ace/pre.h" @@ -105,7 +105,7 @@ class POA_Simple_Server typedef ::Simple_Server_ptr _stub_ptr_type; typedef ::Simple_Server_var _stub_var_type; - POA_Simple_Server (const POA_Simple_Server& rhs); + POA_Simple_Server (const POA_Simple_Server& rhs) = default; virtual ~POA_Simple_Server () = default; virtual ::CORBA::Boolean _is_a (const char* logical_type_id);