diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-27 21:22:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-11-27 21:22:15 +0000 |
| commit | ff1dc51e16e283fa1e0faf2a7d4d3f2ba22c8050 (patch) | |
| tree | 9bc183f1387013f95d099dbe626b0f6b490dbb54 | |
| parent | 8b4923415be9e6b7949ea8e3678f4ebbb7040c1f (diff) | |
| download | ATCD-ff1dc51e16e283fa1e0faf2a7d4d3f2ba22c8050.tar.gz | |
Sun Nov 27 18:19:18 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
Merging in another set of changes. The skeletons got refactored even
more and now the S.inl files are not generated anymore. For CIAO
we now generate the facet servants in new _svnt_T.{h,cpp} files, which
is the first step in a major refactoring and simplification of the
CCM servants which is also a first step in the direction of a Common
Component Model
522 files changed, 1853 insertions, 2383 deletions
diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index 14a6e7cb33d..f847c4ede0e 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -556,16 +556,16 @@ public: size_t size, const ACE_TCHAR *text = 0); - static void init_hook (ACE_OS_Log_Msg_Attributes &attributes -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) - , ACE_SEH_EXCEPT_HANDLER selector = 0 - , ACE_SEH_EXCEPT_HANDLER handler = 0 -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ /** * Init hook, create a Log_Msg_Attribute object, initialize its * attributes from the TSS Log_Msg and save the object in the * @a attributes argument */ + static void init_hook (ACE_OS_Log_Msg_Attributes &attributes +# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) + , ACE_SEH_EXCEPT_HANDLER selector = 0 + , ACE_SEH_EXCEPT_HANDLER handler = 0 +# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ ); /** diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index 29f8650283e..ef7e47cc311 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -289,7 +289,6 @@ IDL_CLIENT_HDR_EXT ?= C.h IDL_CLIENT_INL_EXT ?= C.inl IDL_CLIENT_SRC_EXT ?= C.cpp IDL_SERVER_HDR_EXT ?= S.h -IDL_SERVER_INL_EXT ?= S.inl IDL_SERVER_SRC_EXT ?= S.cpp IDL_SERVER_THDR_EXT ?= S_T.h IDL_SERVER_TINL_EXT ?= S_T.inl diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 0a99abac42f..a9201bbbbe5 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,53 @@ +Sun Nov 27 18:19:18 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + Merging in our workbranch + + === start changelog === + + Thu Nov 24 12:31:23 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/IDL_Test/Inherited_Servants/Derived.mpc: + Fixed afters. + + Thu Nov 24 07:40:14 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/IDL_Test/Inherited_Servants/Base.idl: + * tests/IDL_Test/Inherited_Servants/Derived.idl: + Enabled all IDL code again and added an extra component + and interface without a module. + + Fri Nov 4 15:47:29 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * *.mpc: + Removed all S.inl entries. + + Fri Nov 4 16:16:35 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * bin/generate_component_mpc.pl: + Removed reference to S.inl + + Mon Nov 21 15:21:00 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * tests/IDL_Test/Inherited_Servants/Derived.mpc: + Fixed mpc issue + + Thu Nov 17 10:54:54 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * ciao/Servants/Facet_Servant_Base_T.h: + * ciao/Servants/Facet_Servant_Base_T.cpp: + Templated base class for facet servants. + + * tests/IDL_Test/Inherited_Servants: + * tests/IDL_Test/Inherited_Servants/Base.idl: + * tests/IDL_Test/Inherited_Servants/Base.mpc: + * tests/IDL_Test/Inherited_Servants/Derived.idl: + * tests/IDL_Test/Inherited_Servants/Derived.mpc: + * tests/IDL_Test/Inherited_Servants/Tester: + * tests/IDL_Test/Inherited_Servants/Tester.cpp: + Added compilation test. + + === end changelog === + Tue Nov 22 14:04:21 UTC 2011 Martin Corino <mcorino@remedy.nl> * ciao/Servants/Home_Servant_Impl_T.h: diff --git a/CIAO/bin/generate_component_mpc.pl b/CIAO/bin/generate_component_mpc.pl index c915836cd94..94ef35476b1 100755 --- a/CIAO/bin/generate_component_mpc.pl +++ b/CIAO/bin/generate_component_mpc.pl @@ -333,7 +333,6 @@ project('."$unique_prefix"."$com_name"."$svr_suffix".') : '."$svr_base". "$base_ Header_Files {'."$svr_hdr".' } Inline_Files { - '."$com_name".'S.inl } } diff --git a/CIAO/ccm/CCM_stub.mpc b/CIAO/ccm/CCM_stub.mpc index 489be0694f0..6d2c581e566 100644 --- a/CIAO/ccm/CCM_stub.mpc +++ b/CIAO/ccm/CCM_stub.mpc @@ -38,7 +38,6 @@ project(CCM_stub_idl) : install, ciaolib_with_idl, valuetype { } IDL_Files { - idlflags += -Ssi CCM_HomeFinder.idl CCM_Configurator.idl CCM_KeylessCCMHome.idl @@ -116,12 +115,6 @@ project(CCM_stub) : install, ciaolib_with_idl, ciao_output, valuetype, ifr_clien CCM_ReceptacleC.inl CCM_StandardConfiguratorC.inl CCM_CookieC.inl - CCM_HomeConfigurationS.inl - CCM_HomeS.inl - CCM_HomesS.inl - CCM_ObjectS.inl - CCM_PrimaryKeyBaseS.inl - CCM_StandardConfiguratorS.inl } Source_Files { diff --git a/CIAO/ccm/Extension/CCM_extension.mpc b/CIAO/ccm/Extension/CCM_extension.mpc index 819c2c8db03..26e0f5e496d 100644 --- a/CIAO/ccm/Extension/CCM_extension.mpc +++ b/CIAO/ccm/Extension/CCM_extension.mpc @@ -33,7 +33,6 @@ project(CCM_extension_stub_idl) : install, ciaolib_with_idl { } IDL_Files { - idlflags += -Ssi CCM_QoS.idl } diff --git a/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp b/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp new file mode 100644 index 00000000000..54b82708d4e --- /dev/null +++ b/CIAO/ciao/Servants/Facet_Servant_Base_T.cpp @@ -0,0 +1,42 @@ +// $Id$ + +#ifndef CIAO_FACET_INTERFACE_BASE_T_C +#define CIAO_FACET_INTERFACE_BASE_T_C + +#include "Facet_Servant_Base_T.h" +#include "ccm/CCM_ObjectC.h" +#include "ciao/Logger/Log_Macros.h" + +namespace CIAO +{ + template <typename BASE, typename EXEC, typename CONTEXT> + Facet_Servant_Base_T<BASE, EXEC, CONTEXT>::Facet_Servant_Base_T ( + typename EXEC::_ptr_type exec, + ::Components::CCMContext_ptr ctx) + : executor_ (EXEC::_duplicate (exec)), + ctx_ (::Components::CCMContext::_duplicate (ctx)) + { + CIAO_TRACE ("Facet_Servant_Base_T<BASE, EXEC, CONTEXT>::Facet_Servant_Base_T"); + } + + template <typename BASE, typename EXEC, typename CONTEXT> + Facet_Servant_Base_T<BASE, EXEC, CONTEXT>::~Facet_Servant_Base_T (void) + { + } + + template <typename BASE, typename EXEC, typename CONTEXT> + ::CORBA::Object_ptr + Facet_Servant_Base_T<BASE, EXEC, CONTEXT>::_get_component (void) + { + typename CONTEXT::_var_type sc = CONTEXT::_narrow (this->ctx_.in ()); + + if (::CORBA::is_nil (sc.in ())) + { + throw ::CORBA::INTERNAL (); + } + + return sc->get_CCM_object (); + } +}; + +#endif /* CIAO_FACET_INTERFACE_BASE_T_C */ diff --git a/CIAO/ciao/Servants/Facet_Servant_Base_T.h b/CIAO/ciao/Servants/Facet_Servant_Base_T.h new file mode 100644 index 00000000000..32b23fea76b --- /dev/null +++ b/CIAO/ciao/Servants/Facet_Servant_Base_T.h @@ -0,0 +1,59 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file Facet_Servant_Base_T.h + * + * $Id$ + * + * This file contains the declaration of a mixin base class for + * the generated interface servant class. + * + * @authors Marcel Smit <msmit@remedy.nl> + */ +//============================================================================= + +#ifndef CIAO_FACET_INTERFACE_BASE_T_H +#define CIAO_FACET_INTERFACE_BASE_T_H + +#include /**/ "ace/pre.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + +namespace CIAO +{ + template <typename BASE, typename EXEC, typename CONTEXT> + class Facet_Servant_Base_T + : public virtual BASE + { + public: + Facet_Servant_Base_T (typename EXEC::_ptr_type exec, + ::Components::CCMContext_ptr ctx); + + virtual ~Facet_Servant_Base_T (void); + + /// Get component implementation. + virtual CORBA::Object_ptr _get_component (void); + + protected: + typename EXEC::_var_type executor_; + + /// Context object. + ::Components::CCMContext_var ctx_; + }; +}; + +#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) +#include "Facet_Servant_Base_T.cpp" +#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ + +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) +#pragma implementation ("Facet_Servant_Base_T.cpp") +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + +#include /**/ "ace/post.h" + + +#endif /* CIAO_FACET_INTERFACE_BASE_T_H */ diff --git a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc index 92d18d16af4..874a7693319 100644 --- a/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc +++ b/CIAO/connectors/ami4ccm/ami4ccm/ami4ccm.mpc @@ -115,7 +115,6 @@ project (AMI4CCM_svnt) : install, ciao_servant, ciao_lib { } Inline_Files { - ami4ccmS.inl } specific { diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc index fc6b717a9dc..e6e41e8c1b8 100644 --- a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc +++ b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.mpc @@ -140,7 +140,6 @@ project(AMI_Hello_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - HelloS.inl } } diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc index 01ba696e68e..f7d776a93a7 100644 --- a/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/examples/Hello/Receiver/Hello_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_Hello_Base_Hello_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - Hello_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc index 72a33b2536c..0d6b9397524 100644 --- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc +++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_Hello_Base_Hello_Sender_svnt) : ciao_servant, ami { } Inline_Files { - Hello_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc index 0d3bd227aed..5ac46916b9e 100644 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc +++ b/CIAO/connectors/ami4ccm/examples/Quoter/Base/Quoter.mpc @@ -140,7 +140,6 @@ project(AMI_Quoter_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - QuoterS.inl } } diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc index f3dd3c341dc..6a5e121f03e 100644 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc +++ b/CIAO/connectors/ami4ccm/examples/Quoter/Client/Quoter_Client.mpc @@ -128,7 +128,6 @@ project(AMI_Quoter_Client_svnt) : ciao_servant, ami { } Inline_Files { - Quoter_ClientS.inl } } diff --git a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc index 4787ee59949..caf00e31b7b 100644 --- a/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc +++ b/CIAO/connectors/ami4ccm/examples/Quoter/Producer/Quoter_Producer.mpc @@ -128,7 +128,6 @@ project(AMI_Quoter_Producer_svnt) : ciao_servant, messaging { } Inline_Files { - Quoter_ProducerS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc index 7e07fe12876..c1a1b0e8f86 100644 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc +++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Base/AsynchT.mpc @@ -141,7 +141,6 @@ project(AMI_AsynchT_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - AsynchTS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc index 9006c758f77..b1dddc918d2 100644 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Receiver/AsynchT_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_AsynchT_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - AsynchT_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc index b6ec6289a9b..c9f26a083a4 100644 --- a/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/AsynchT/Sender/AsynchT_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_AsynchT_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - AsynchT_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc index b92e5ab119b..7764e9f8c69 100644 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc +++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Base/DelReplyH.mpc @@ -136,13 +136,11 @@ project(AMI_DelReplyH_skel) : ciao_executor, ami, ami4ccm_servant { Header_Files { DelReplyHS.h - + DelReplyH_skel_export.h } Inline_Files { - DelReplyHS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc index 46dfc87f5d5..0c636a532b6 100644 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Receiver/DelReplyH_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_DelReplyH_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - DelReplyH_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc index aa96f223f45..45d851c4442 100644 --- a/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/DelReplyH/Sender/DelReplyH_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_DelReplyH_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - DelReplyH_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc index 57178e7d01a..9f2c62e4193 100644 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc +++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Base/ExceptionT.mpc @@ -141,7 +141,6 @@ project(AMI_ExceptionT_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - ExceptionTS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc index 174796e8a25..6fdfea1de13 100644 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Receiver/ExceptionT_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_ExceptionT_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - ExceptionT_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc index d251c688aef..6a4ada1853a 100644 --- a/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/Exceptions/Sender/ExceptionT_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_ExceptionT_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - ExceptionT_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc index 49bd8885e5d..7975bc23aae 100644 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc +++ b/CIAO/connectors/ami4ccm/tests/GetComp/Base/GetComp.mpc @@ -141,8 +141,6 @@ project(AMI_GetComp_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - GetCompS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc index 5c84461084c..3b8c656eafa 100644 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/GetComp/Receiver/GetComp_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_GetComp_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - GetComp_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc index 61d8643baad..4f51e3e5bba 100644 --- a/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/GetComp/Sender/GetComp_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_GetComp_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - GetComp_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc index 9e4bf15aa83..8b0b57d9933 100644 --- a/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc +++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/AMI4CCM_IDLTest.mpc @@ -113,8 +113,6 @@ project(AMI4CCM_IDL_Test_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - HelloS.inl - HelloAS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc index b0da2a3e0c3..32bfe262ccd 100644 --- a/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc +++ b/CIAO/connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc @@ -132,7 +132,6 @@ project(AMI4CCM_ITB_Hello_Comp_svnt) : ciao_servant, ami { } Inline_Files { - Hello_ComponentS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc index 102ff194be6..329ebf879af 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Base/InterInArgsT.mpc @@ -141,8 +141,6 @@ project(AMI_InterInArgsT_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - InterInArgsTS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc index 378f834457f..d117c93e2de 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Receiver/InterInArgsT_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_InterInArgsT_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - InterInArgsT_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc index 098b4318ac6..45aaf485bf6 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterInArgs/Sender/InterInArgsT_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_InterInArgsT_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - InterInArgsT_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc index 3213bd0e819..97ed2e32475 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Base/InterInOutT.mpc @@ -141,8 +141,6 @@ project(AMI_InterInOutT_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - InterInOutTS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc index 21aa8c64ece..171b4758762 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Receiver/InterInOutT_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_InterInOutT_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - InterInOutT_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc index ad6ca66be06..f74b8d3d27e 100644 --- a/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterInOutArgs/Sender/InterInOutT_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_InterInOutT_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - InterInOutT_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc index 4ab203034e9..cb4307a562e 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Base/InterMulti.mpc @@ -141,8 +141,6 @@ project(AMI_InterMulti_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - InterMultiS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc index 50534fda54f..7d28075ee97 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Receiver/InterMulti_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_InterMulti_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - InterMulti_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc index 93a6a9a3923..736fd1fdc88 100644 --- a/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterMulti/Sender/InterMulti_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_InterMulti_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - InterMulti_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc index e10d4008190..1a66943435c 100644 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Base/InterOutArgsT.mpc @@ -141,8 +141,6 @@ project(AMI_InterOutArgsT_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - InterOutArgsTS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc index 97360d4d252..638b223132e 100644 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Receiver/InterOutArgsT_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_InterOutArgsT_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - InterOutArgsT_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc index d68ebe45df4..f7b4be3bec2 100644 --- a/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterOutArgs/Sender/InterOutArgsT_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_InterOutArgsT_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - InterOutArgsT_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc index 85c7e37393f..79a276079f6 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Base/InterReturnT.mpc @@ -141,8 +141,6 @@ project(AMI_InterReturnT_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - InterReturnTS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc index 810c41eb310..dcb934556f1 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Receiver/InterReturnT_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_InterReturnT_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - InterReturnT_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc index 0b443de6fbc..c30da578161 100644 --- a/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/InterReturn/Sender/InterReturnT_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_InterReturnT_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - InterReturnT_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc index 5decdb9facd..51f9a435a3c 100644 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc +++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Base/HelloT.mpc @@ -141,8 +141,6 @@ project(AMI_HelloT_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - HelloTS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc index ee3155b11ad..d146c23f2d4 100644 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Receiver/HelloT_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_HelloT_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - HelloT_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc index 052a7eb741b..fff938bde86 100644 --- a/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/NoConnection/Sender/HelloT_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_HelloT_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - HelloT_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc index 11ada51a987..e9702add771 100644 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc +++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Base/NoReplyH.mpc @@ -141,8 +141,6 @@ project(AMI_NoReplyH_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - NoReplyHS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc index ce200f3326e..3c62cf93713 100644 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Receiver/NoReplyH_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_NoReplyH_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - NoReplyH_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc index 0c9bf268274..f2decc6fb0c 100644 --- a/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/NoReplyH/Sender/NoReplyH_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_NoReplyH_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - NoReplyH_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc index 25d2dd74a7a..7876403aa36 100644 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc +++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Base/OneProcess.mpc @@ -141,8 +141,6 @@ project(AMI_OneProcess_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - OneProcessS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc index 10768dd5db0..e818a82b143 100644 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Receiver/OneProcess_Receiver.mpc @@ -127,7 +127,6 @@ project(AMI_OneProcess_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - OneProcess_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc index 0b11cbf053d..ccf61f94ed7 100644 --- a/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/OneProcess/Sender/OneProcess_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_OneProcess_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - OneProcess_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc index 5ce19bdd2db..e6a9ae889f0 100644 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc +++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Base/OneReplyH.mpc @@ -141,8 +141,6 @@ project(AMI_OneReplyH_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - OneReplyHS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc index c6aa5f39e87..ac52652ba3e 100644 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Receiver/OneReplyH_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_OneReplyH_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - OneReplyH_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc index ca3196cabc3..7afdccd8acc 100644 --- a/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/OneReplyH/Sender/OneReplyH_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_OneReplyH_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - OneReplyH_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc index 728acf9edde..a9499955ee8 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Base/UsesSM.mpc @@ -142,8 +142,6 @@ project(AMI_UsesSM_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - UsesSMS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc index d2ce5467c35..e98ec843155 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Receiver/UsesSM_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_UsesSM_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - UsesSM_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc index f7bf8c2e456..5f102d474a3 100644 --- a/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/SimplexMulti/Sender/UsesSM_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_UsesSM_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - UsesSM_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc index fb3045878ba..a6d39cd9b18 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Base/ThreeComp.mpc @@ -166,8 +166,6 @@ project(AMI_ThreeComp_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - ThreeCompS.inl - ThreeComp_no_amiS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc index 3162d83792e..6b293e4ac14 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Master/ThreeComp_Master.mpc @@ -127,7 +127,6 @@ project(AMI_ThreeComp_Base_Master_svnt) : ciao_servant, ami { } Inline_Files { - ThreeComp_MasterS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc index 62f6dd0804d..26fd307b0fd 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Receiver/ThreeComp_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_ThreeComp_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - ThreeComp_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc index 6323dbd93b2..98b5ce181fd 100644 --- a/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/ThreeComp/Sender/ThreeComp_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_ThreeComp_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - ThreeComp_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc index ecabfedc7bc..9355dd8d1b8 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Base/UsesMulti.mpc @@ -142,8 +142,6 @@ project(AMI_UsesMulti_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - UsesMultiS.inl - } } diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc index 3b53f58a3e2..ffaad2e534c 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Receiver/UsesMulti_Receiver.mpc @@ -128,7 +128,6 @@ project(AMI_UsesMulti_Base_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - UsesMulti_ReceiverS.inl } } diff --git a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc index 3ea71a81db8..1c24b38c1ea 100644 --- a/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc +++ b/CIAO/connectors/ami4ccm/tests/UsesMulti/Sender/UsesMulti_Sender.mpc @@ -128,7 +128,6 @@ project(AMI_UsesMulti_Base_Sender_svnt) : ciao_servant, ami { } Inline_Files { - UsesMulti_SenderS.inl } } diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc index e436362e44e..521ca628af1 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Receiver_comp/src/Hello_Receiver_comp.mpc @@ -24,7 +24,7 @@ project(AMI_Hello_Tuto_Hello_Receiver_idl_gen) : componentidldefaults { project(AMI_Hello_Hello_Receiver_exec_idl_gen) : componentidldefaults { requires += dummy_label custom_only = 1 - idlflags += -Gex -SS -Sci -Ssi \ + idlflags += -Gex -SS -Sci \ -I../ports \ -I../../ports \ -o ../../../Tutorial/Code/GeneratedExec @@ -114,7 +114,7 @@ project(AMI_Hello_Tuto_Hello_Receiver_exec) : ciao_executor, messaging { libpaths += ../../lib libout = ../../lib dynamicflags += HELLO_RECEIVER_COMP_EXEC_BUILD_DLL - includes += ../../GeneratedCode + includes += ../../GeneratedCode IDL_Files { } @@ -160,6 +160,5 @@ project(AMI_Hello_Tuto_Hello_Receiver_svnt) : ciao_servant, messaging { } Inline_Files { - ../../GeneratedCode/Hello_Receiver_compS.inl } } diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc index 13daf6c5943..048d214c30e 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/Sender_comp/src/Hello_Sender_comp.mpc @@ -23,7 +23,7 @@ project(AMI_Hello_Tuto_Hello_Sender_idl_gen) : componentidldefaults { project(AMI_Hello_Hello_Sender_exec_idl_gen) : componentidldefaults { requires += dummy_label custom_only = 1 - idlflags += -Gex -SS -Sci -Ssi \ + idlflags += -Gex -SS -Sci \ -I../ports \ -I../../ports \ -o ../../../Tutorial/Code/GeneratedExec @@ -38,7 +38,7 @@ project(AMI_Hello_Tuto_Hello_Sender_lem_gen) : ciaoidldefaults { custom_only = 1 idlflags += -Wb,stub_export_macro=HELLO_SENDER_COMP_LEM_STUB_Export \ -Wb,stub_export_include=Hello_Sender_comp_lem_stub_export.h \ - -SS -Gxhst\ + -SS -Gxhst\ -I../../ports \ -I../../GeneratedCode\ -o ../../GeneratedCode @@ -57,7 +57,7 @@ project(AMI_Hello_Tuto_Hello_Sender_lem_stub) : ccm_svnt, ami { libout = ../../lib sharedname = Hello_Sender_comp_lem_stub dynamicflags += HELLO_SENDER_COMP_LEM_STUB_BUILD_DLL - includes += ../../GeneratedCode ../.. + includes += ../../GeneratedCode ../.. IDL_Files { } @@ -154,6 +154,5 @@ project(AMI_Hello_Tuto_Hello_Sender_svnt) : ciao_servant, ami { } Inline_Files { - ../../GeneratedCode/Hello_Sender_compS.inl } } diff --git a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc index ae329e5e8c2..427ca625d05 100644 --- a/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc +++ b/CIAO/connectors/ami4ccm/tutorials/Hello/Hello_asm/ports/Hello_MyFoo_obj.mpc @@ -152,7 +152,6 @@ project(AMI_Hello_Tuto_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - ../GeneratedCode/Hello_MyFoo_objS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc index ff8767c0197..61e1ed33c06 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc +++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc @@ -145,7 +145,6 @@ project(DDS_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Hello_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc index 344faaad8fc..c97a14f7275 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc @@ -137,7 +137,6 @@ project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - Hello_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc index fe3fc1ab5db..9727a093cb3 100644 --- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc +++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc @@ -138,7 +138,6 @@ project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Hello_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc index 068148c5623..3da2e6a035a 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Common/Single_Service_Common.mpc @@ -63,6 +63,5 @@ project(Single_Service_Common_skel) : ccm_svnt { } Inline_Files { - Single_Service_CommonS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc index 5e7c554a3e3..d7f0717f044 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Connector/Large_Connector.mpc @@ -133,7 +133,6 @@ project(Large_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Large_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc index e24f975e541..8c6c1ca8d39 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Pub/DDS_Pub.mpc @@ -131,7 +131,6 @@ project(Large_DDS_Pub_svnt) : ciao_servant, dds4ccm_base { } Inline_Files { - DDS_PubS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc index c223240f724..9de6f2338ac 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/DDS_Sub/DDS_Sub.mpc @@ -130,7 +130,6 @@ project(Large_DDS_Sub_svnt) : ciao_servant, dds4ccm_base { } Inline_Files { - DDS_SubS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc index ae2e057ab3a..0f22cfd536b 100644 --- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc +++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc @@ -131,7 +131,6 @@ project(Single_Service_svnt) : ciao_servant { } Inline_Files { - Single_ServiceS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc index e892ccfc76b..872d9481c51 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc @@ -133,7 +133,6 @@ project(DDS_Broker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - BrokerS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc index a4f9b2ae675..a658421a258 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_Quoter_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Quoter_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc index b85ce3b99c8..8cbb3d0fb7b 100644 --- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc +++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc @@ -134,7 +134,6 @@ project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - DistributorS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc index 4efb3d76089..473a05bfe3e 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_Shapes_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Shapes_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc index 4f0560a4fdd..d7b67c71229 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc @@ -133,7 +133,6 @@ project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - Shapes_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc index d079f2047d1..acb77b7ed92 100644 --- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc +++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Shapes_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc index 309ba352d67..36fb5de47f2 100644 --- a/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc +++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_skel.mpc @@ -32,12 +32,6 @@ project (DDS4CCM_skel) : install, dds4ccm_lem_stub, ciaolib_with_idl, \ } Inline_Files { - dds_rtf2_dcpsS.inl - dds4ccm_PortStatusListenerS.inl - dds4ccm_DataListenerControlS.inl - dds4ccm_ConnectorStatusListenerS.inl - dds4ccm_ConnectorS.inl - dds4ccm_StateListenerControlS.inl } specific { diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc index 8a3c01e4d7f..b353927b2f9 100644 --- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc +++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_skel.mpc @@ -20,8 +20,6 @@ project (CIAO_NDDS_skel) : install, ndds_idltocpp_stub, ciaolib_with_idl, ciao_o } Inline_Files { - ndds_dcpsS.inl - ndds_dcps_i_handleS.inl } specific { diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc index 4face6ad097..e4131be2dfd 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4cc } Inline_Files { - Perf_Keyed_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc index 147098f2393..c11a25fbbee 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc @@ -142,7 +142,6 @@ project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_skel, dds4ccm } Inline_Files { - Perf_Keyed_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc index cc02cb4a07f..4f9483ecd52 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc @@ -141,7 +141,6 @@ project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_skel { } Inline_Files { - Perf_Keyed_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc index 78470024921..ea89e031a47 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/LatencyTT_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_LatencyTT_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm } Inline_Files { - LatencyTT_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc index 932d9b9313f..c997b41ea15 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/LatencyTT_Test_Receiver.mpc @@ -144,7 +144,6 @@ project(DDS_LatencyTT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4 } Inline_Files { - LatencyTT_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc index 70988c02360..275f0bae134 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/LatencyTT_Test_Sender.mpc @@ -140,7 +140,6 @@ project(DDS_LatencyTT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc } Inline_Files { - LatencyTT_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc index 017f5989f20..b178877facf 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Connector/Throughput_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_Throughput_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm_lem } Inline_Files { - Throughput_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc index 3a26e557ead..32dac39366c 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Receiver/Throughput_Receiver.mpc @@ -146,7 +146,6 @@ project(DDS_Throughput_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - Throughput_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc index 833b3de83c9..e7935f78d38 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/SecConnector/Throughput_Sec_Connector.mpc @@ -136,7 +136,6 @@ project(DDS_Throughput_Sec_Connector_svnt) : ciao_servant, dds4ccm_skel, dds4ccm } Inline_Files { - Throughput_Sec_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc index fadafc3f4bc..50d1d49a58b 100644 --- a/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc +++ b/CIAO/connectors/dds4ccm/performance-tests/Throughput/Sender/Throughput_Sender.mpc @@ -144,7 +144,6 @@ project(DDS_Throughput_Sender_svnt) : ciao_servant, dds4ccm_skel { } Inline_Files { - Throughput_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc index 13a1c2e7b29..50ee0b44588 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_CSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - CSL_DeadlineTest_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc index 43e0bd1b29a..fcf33fc9a09 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc @@ -131,7 +131,6 @@ project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dd } Inline_Files { - CSL_DeadlineTest_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc index b363171a1b4..c1a1e87e9c8 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4 } Inline_Files { - CSL_DeadlineTest_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc index 52d15882ec0..79dcb9cc5d8 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_CSL_QoSTest_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - CSL_QoSTest_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc index 521151482df..ad025772732 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc @@ -131,7 +131,6 @@ project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - CSL_QoSTest_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc index 8ac06eb8ae8..7a9efb17709 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - CSL_QoSTest_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc index 413abfab643..ace737213f7 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_CSL_SRTest_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - CSL_SRTest_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc index 762e09fcdfa..832bd209c80 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - CSL_SRTest_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc index 54cbec4e435..72aefc6ed35 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - CSL_SRTest_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc index 00a27ecb267..0681b875095 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_CSL_USTest_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - CSL_USTest_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc index de7bcaa4aaa..f0a8733b7ed 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - CSL_USTest_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc index ecc1f8f3b52..e623769dc89 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - CSL_USTest_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc index 44a4935d9d4..5a00581be0b 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Base/Reader_Starter.mpc @@ -105,7 +105,6 @@ project(DDS_Coh_Update_ReaderStarter_svnt) : ciao_servant, dds4ccm_lem_stub, dds } Inline_Files { - Reader_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc index a515fab99a8..11417e91eea 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Connector/CoherentUpdate_Test_Connector.mpc @@ -141,7 +141,6 @@ project(CoherentUpdate_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - CoherentUpdate_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc index d8da91edaa4..073d5b1bc0d 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Receiver/CoherentUpdate_Test_Receiver.mpc @@ -150,7 +150,6 @@ project(CoherentUpdate_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds } Inline_Files { - CoherentUpdate_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc index 9f7ed0fc325..b22c09b72e1 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentUpdater/Sender/CoherentUpdate_Test_Sender.mpc @@ -149,7 +149,6 @@ project(CoherentUpdate_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c } Inline_Files { - CoherentUpdate_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc index 04bb3398d3f..af5597803a3 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Base/Reader_Starter.mpc @@ -105,7 +105,6 @@ project(DDS_Coherent_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4 } Inline_Files { - Reader_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc index 6b1ca64bc64..e9be14db0bd 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Connector/CoherentWrite_Test_Connector.mpc @@ -137,7 +137,6 @@ project(CoherentWrite_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - CoherentWrite_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc index 4d67b4f6bcf..9f008a9ac71 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Receiver/CoherentWrite_Test_Receiver.mpc @@ -151,7 +151,6 @@ project(CoherentWrite_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4 } Inline_Files { - CoherentWrite_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc index 1c22d1faad8..7975fc52e38 100755 --- a/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/CoherentWriter/Sender/CoherentWrite_Test_Sender.mpc @@ -149,7 +149,6 @@ project(CoherentWrite_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc } Inline_Files { - CoherentWrite_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc index a75a0b6274a..9b5aecce470 100644 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/Connector/Collocated_Connector.mpc @@ -140,7 +140,6 @@ project(Collocated_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Collocated_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc index 502644612a9..487483045c8 100644 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/PubSubComponent/PubSub_Component.mpc @@ -140,7 +140,6 @@ project(PubSubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - PubSub_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc index 86ed3573eb7..a436c5f3836 100644 --- a/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/CollocatedPubSub/SubComponent/Sub_Component.mpc @@ -140,7 +140,6 @@ project(SubComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Sub_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc index b195acc1f56..03bb352085d 100644 --- a/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ConnectorFilesInDiffDir/DiffDir_Connector.mpc @@ -129,7 +129,6 @@ project(DiffDir_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Connector/DiffDir_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc index b4236daf4af..5c951663474 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Component/CFT_Test_Component.mpc @@ -141,7 +141,6 @@ project(CFT_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - CFT_Test_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc index 1c6dbe79aea..aafeaef696a 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/CFTNamesClash/Connector/CFT_Test_Connector.mpc @@ -137,7 +137,6 @@ project(CFT_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - CFT_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc index c4e73705d86..d47af56e58f 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Connector/CFTLE_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_CFTLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - CFTLE_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc index 6e48a1a1507..4a608ac1783 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Receiver/CFTLE_Test_Receiver.mpc @@ -142,7 +142,6 @@ project(DDS_CFTLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - CFTLE_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc index 67c9b77540e..e742d9e7656 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/EventListener/Sender/CFTLE_Test_Sender.mpc @@ -141,7 +141,6 @@ project(DDS_CFTLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - CFTLE_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc index 97169ed1f7c..22a8369448d 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Component/Exception_Test_Component.mpc @@ -141,7 +141,6 @@ project(CFT_Exception_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds } Inline_Files { - Exception_Test_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc index 8771d404def..c5354d85dc3 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/Exception/Connector/Exception_Test_Connector.mpc @@ -137,7 +137,6 @@ project(CFT_Exception_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Exception_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc index ec68400148a..51cd2cd48e3 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Base/ReadGet_Starter.mpc @@ -105,7 +105,6 @@ project(CFT_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - ReadGet_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc index b687f4110f6..34923267436 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Connector/ReadGet_Test_Connector.mpc @@ -141,7 +141,6 @@ project(CFT_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - ReadGet_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc index 16d7855838f..bd70d89bc33 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver.mpc @@ -151,7 +151,6 @@ project(CFT_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc } Inline_Files { - ReadGet_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc index bc1f872af4d..4c167e1993c 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Sender/ReadGet_Test_Sender.mpc @@ -149,7 +149,6 @@ project(CFT_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - ReadGet_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc index 59f6ef9c4c5..793ee81f5de 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Connector/CFTLS_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_CFTLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - CFTLS_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc index a546809f0ee..a39bedc2403 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Receiver/CFTLS_Test_Receiver.mpc @@ -141,7 +141,6 @@ project(DDS_CFTLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - CFTLS_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc index e462682551b..2832f458839 100755 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/StateListener/Sender/CFTLS_Test_Sender.mpc @@ -141,7 +141,6 @@ project(DDS_CFTLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - CFTLS_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc index 28699ac1db8..bdb237f55b1 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Connector/Writer_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_DDSWriterEntityConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Writer_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc index 7462d1531f6..02fb99b96de 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Receiver/Writer_Receiver.mpc @@ -134,7 +134,6 @@ project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4 } Inline_Files { - Writer_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc index e9620a83cd9..3adfbc254fb 100644 --- a/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/DDSEntity/Sender/Writer_Sender.mpc @@ -145,7 +145,6 @@ project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc } Inline_Files { - Writer_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc index 838d4675b38..d6713045e5c 100644 --- a/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Derived/Derived_Connector.mpc @@ -124,7 +124,6 @@ project(Derived_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Derived_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc index fd83b76e6f3..2a6f741adbb 100755 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Connector/DNM_Connector.mpc @@ -136,7 +136,6 @@ project(DDS_DNM_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - DNM_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc index dc7fb3175c7..045577065f4 100755 --- a/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/DoubleNestedModule/Sender/DNM_Sender.mpc @@ -139,7 +139,6 @@ project(DNM_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - DNM_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc index 2619e45f013..81c2f135049 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_ECT_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Event_Connection_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc index e605f6517ba..41f883a9c4d 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc @@ -131,7 +131,6 @@ project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Event_Connection_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc index c6dad6940b4..ea27d85d363 100644 --- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Event_Connection_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc index bb65328b879..889c96c4b52 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc @@ -136,7 +136,6 @@ project(DDS_FSS_Event_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - FSS_Event_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc index f06e2fc14b8..bb7759517b9 100755 --- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_FSS_State_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - FSS_State_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc index 41c7ed9ebf1..193d728f28f 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Component/GCE_Test_Component.mpc @@ -141,7 +141,6 @@ project(GCE_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - GCE_Test_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc index bf0eef5ce18..a898244a545 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/Event/Connector/GCE_Test_Connector.mpc @@ -137,7 +137,6 @@ project(GCE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - GCE_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc index e8e9c957fd5..475efbc2ba2 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Component/GCS_Test_Component.mpc @@ -141,7 +141,6 @@ project(GCS_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - GCS_Test_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc index 8fccb838986..eb2b649ab81 100755 --- a/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/GetComponent/State/Connector/GCS_Test_Connector.mpc @@ -137,7 +137,6 @@ project(GCS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - GCS_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc index 0bd28cbdc34..f9857608592 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc @@ -107,7 +107,6 @@ project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Get_InvokerS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc index a010574641a..01d5f9e3a4b 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_Getter_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Getter_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc index 474d94de77a..cb5f5400cca 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc @@ -150,7 +150,6 @@ project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - Getter_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc index b13a29f80c1..03e2204374b 100755 --- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc @@ -145,7 +145,6 @@ project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - Getter_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc index d25d6d97ef2..84ac47b781c 100644 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Base/IDL_Test_Interfaces.mpc @@ -102,6 +102,5 @@ project(IDL_Test_Interfaces_svnt) : ccm_svnt { } Inline_Files { - IDL_Test_InterfacesS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc index 02225917db1..41b9aaa692a 100644 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Base_Component.mpc @@ -171,7 +171,6 @@ project(IDL_Test_Base_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - IDL_Test_Base_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc index c3ee2ecfce0..7e9a389342c 100644 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Component/IDL_Test_Derived_Component.mpc @@ -190,7 +190,6 @@ project(IDL_Test_Derived_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c } Inline_Files { - IDL_Test_Derived_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc index 7d8aa1f4fb1..c8e9ebc9706 100644 --- a/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/IDL_Test/Connector/IDL_Test_Connector.mpc @@ -137,7 +137,6 @@ project(IDL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - IDL_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc index 0126446a5b7..a032e7e739b 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_InstanceHandleConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Writer_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc index d583ae5ea8f..b9d68e2e51a 100644 --- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc @@ -143,7 +143,6 @@ project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4 } Inline_Files { - Writer_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc index 6b615a7c192..3731dcdd994 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Keyed_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc index 50ac8578461..aeca5a7a824 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - Keyed_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc index 6b56166a729..ca0b902f28f 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - Keyed_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc index c4ba37345ef..b5314ddd07a 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_KeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Writer_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc index 48d707cbdd4..abc49c53cee 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - Writer_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc index 2d2c5030b85..11d516cee83 100644 --- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - Writer_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc index c5445d15c50..8465336ee28 100755 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Base/Reader_Starter.mpc @@ -106,7 +106,6 @@ project(Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Reader_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc index 1e42ce25fbe..03c7ea275fe 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Connector/RG_LateBinding_Connector.mpc @@ -141,7 +141,6 @@ project (RG_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - RG_LateBinding_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc index 0f30d0f6602..5f2a8cd4aaf 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver.mpc @@ -151,7 +151,6 @@ project (RG_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - RG_LateBinding_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc index 18d523e7aa1..3227fac6b9e 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender.mpc @@ -146,7 +146,6 @@ project (RG_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - RG_LateBinding_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc index 7ff6c696f9d..26e3fd89b59 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Connector/WU_LateBinding_Connector.mpc @@ -141,7 +141,6 @@ project (WU_LateBindingConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - WU_LateBinding_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc index 328a658c3ec..ba0c8f8f6d7 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Receiver/WU_LateBinding_Receiver.mpc @@ -136,7 +136,6 @@ project (WU_LateBindingReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - WU_LateBinding_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc index 36a18a9b438..6f4c85ae025 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender.mpc @@ -137,7 +137,6 @@ project (WU_LateBindingSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - WU_LateBinding_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc index 1cc4d1c2d6d..d03528e7b78 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_LMBM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - LMBM_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc index 16eab169dc1..932cc6719a6 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc @@ -141,7 +141,6 @@ project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - LMBM_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc index 6aebd902bd3..82c6b98f12c 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc @@ -141,7 +141,6 @@ project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - LMBM_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc index 41d97dd70e8..bda90db2aa8 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_LNE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - LNE_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc index d2547a7033d..8bc43683040 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc @@ -142,7 +142,6 @@ project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - LNE_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc index 039ab94a2e3..433a6daec80 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc @@ -141,7 +141,6 @@ project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - LNE_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc index e8c4c878fdb..bc582a1e439 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_LOBO_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - LOBO_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc index 41c64cc20a0..8ecaeb1dddb 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc @@ -141,7 +141,6 @@ project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - LOBO_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc index e321b6908d7..ac414e6f05f 100755 --- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc @@ -141,7 +141,6 @@ project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - LOBO_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc index d2bd2ffc114..63489f0af2d 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Connector/Event_MemLeakDetection_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_EMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Event_MemLeakDetection_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc index 008010b555d..4f1354d6e01 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Receiver/Event_MemLeakDetection_Test_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_EMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - Event_MemLeakDetection_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc index 84aa30d7b4d..a03e6f68d52 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/Event_MemLeakDetection_Test/Sender/Event_MemLeakDetection_Test_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_EMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Event_MemLeakDetection_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc index 3e4eaedc370..936aaa02532 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Connector/State_MemLeakDetection_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_SMLDT_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - State_MemLeakDetection_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc index 67a9f79aa96..970c8f285c0 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Receiver/State_MemLeakDetection_Test_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_SMLDT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - State_MemLeakDetection_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc index b4a7fc534c7..5cdbd2f4956 100644 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/State_MemLeakDetection_Test/Sender/State_MemLeakDetection_Test_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_SMLDT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - State_MemLeakDetection_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc index cfabd9b087d..37d7775497b 100755 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Component/TypeRegistration_Test_Component.mpc @@ -141,7 +141,6 @@ project(TypeRegistration_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c } Inline_Files { - TypeRegistration_Test_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc index 8f17524e0b1..224a9a31a43 100755 --- a/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/MemLeakDetection/TypeRegistration/Connector/TypeRegistration_Test_Connector.mpc @@ -137,7 +137,6 @@ project(TypeRegistration_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - TypeRegistration_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc index 149c177b3b8..d84372bc7a3 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Connector/MultiTopic_Connector.mpc @@ -151,7 +151,6 @@ project(DDS_MultiTopic_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - MultiTopic_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc index 56f8709451a..d157d94ae08 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Receiver/MultiTopic_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_MultiTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - MultiTopic_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc index b53c899b32a..c04b71cf90d 100644 --- a/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/MultiTopic/Sender/MultiTopic_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_MultiTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - MultiTopic_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc index 7d2706d392f..02fbf15553c 100644 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Connector/MultipleTemp_Connector.mpc @@ -161,7 +161,6 @@ project(DDS_MT_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - MultipleTemp_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc index 275a5eb0afd..5a45580c18e 100644 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Receiver/MultipleTemp_Receiver.mpc @@ -137,7 +137,6 @@ project(DDS_MultipleTemp_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc } Inline_Files { - MultipleTemp_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc index afdacec4228..c76042fb341 100644 --- a/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/MultipleTemp/Sender/MultipleTemp_Sender.mpc @@ -139,7 +139,6 @@ project(DDS_MultipleTemp_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - MultipleTemp_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc index 2f098575832..7d75e5a3452 100644 --- a/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/NoModule/NoModule_Connector.mpc @@ -124,7 +124,6 @@ project(NoModule_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - NoModule_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc index 161413f0daa..7be1fdfbe55 100755 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Component/NonChangeable_Component.mpc @@ -141,7 +141,6 @@ project(NonChangeable_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - NonChangeable_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc index d36f94a1d3c..5c58a00cc29 100644 --- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_NonChangeableConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - NonChangeable_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc index 7c301fe99a7..6602de3110f 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/OIT_Test_Receiver.mpc @@ -141,7 +141,6 @@ project(OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - OIT_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc index da0aa40499c..1300bee26e9 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/ReceiverConnector/OIT_Receiver_Connector.mpc @@ -137,7 +137,6 @@ project(OIT_Receiver_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - OIT_Receiver_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc index a7b3c35c9f2..794c75596d0 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/OIT_Test_Sender.mpc @@ -141,7 +141,6 @@ project(OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - OIT_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc index 3c9dc6f812d..f651b020293 100644 --- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SenderConnector/OIT_Sender_Connector.mpc @@ -137,7 +137,6 @@ project(OIT_Sender_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - OIT_Sender_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc index b1b0fa35ae2..b437583be1d 100644 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/OneFile/Multiple/OFM_Connector.mpc @@ -144,6 +144,5 @@ project(OFM_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - OFM_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc index 28423532c92..305c7292428 100755 --- a/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/OneFile/Single/OneFile_Connector.mpc @@ -143,7 +143,6 @@ project(OneFile_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - OneFile_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc index a2ffdc0ddb3..5a9e9955e65 100644 --- a/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSAT/ccm_dds_psat.mpc @@ -200,7 +200,6 @@ project(DDS_PSAT_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - PSAT_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc index 2c57768808b..79dac5a4ea5 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_PSL_DeadlineTest_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - PSL_DeadlineTest_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc index f1490dcbec2..b3f8ef1ec1d 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dd } Inline_Files { - PSL_DeadlineTest_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc index d7ec5be8c2d..db32060a04c 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4 } Inline_Files { - PSL_DeadlineTest_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc index 1983963e70b..690445c10c3 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_PSL_SampleLost_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - PSL_SampleLost_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc index 3248846b4be..1df673b57ec 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4 } Inline_Files { - PSL_SampleLost_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc index 62dc888f3f3..8ab5bc0b401 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc } Inline_Files { - PSL_SampleLost_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc index f8755973434..f7258c06228 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventComponent/PortUsageEvent_Component.mpc @@ -141,7 +141,6 @@ project(PortUsageEvent_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - PortUsageEvent_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc index 7ea5de29d75..72a1976e10f 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/EventConnector/PortUsageEvent_Connector.mpc @@ -137,7 +137,6 @@ project(PortUsageEvent_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - PortUsageEvent_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc index a5ab91efbae..1e5295d6dd7 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateComponent/PortUsageState_Component.mpc @@ -141,7 +141,6 @@ project(PortUsageState_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - PortUsageState_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc index cab9c0ca48a..161b1485f4e 100755 --- a/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/PortUsage/StateConnector/PortUsageState_Connector.mpc @@ -137,7 +137,6 @@ project(PortUsageState_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - PortUsageState_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc index afd80353d21..d975b977499 100755 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Base/Reader_Starter.mpc @@ -106,7 +106,6 @@ project(RW_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Reader_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc index 85ccc3191af..eaee93bae4c 100755 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Connector/Proxy_RW_Test_Connector.mpc @@ -137,7 +137,6 @@ project(Proxy_RW_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Proxy_RW_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc index 7cb3b426d8c..b785b288715 100755 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Receiver/Proxy_RW_Test_Receiver.mpc @@ -151,7 +151,6 @@ project(Proxy_RW_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - Proxy_RW_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc index a3403ffe70b..636dfebff19 100755 --- a/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/Proxies/ReadWrite/Sender/Proxy_RW_Test_Sender.mpc @@ -147,7 +147,6 @@ project(Proxy_RW_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - Proxy_RW_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc index 14e3468a0ba..6af2a1229a1 100755 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Component/QosProfile_Test_Component.mpc @@ -141,7 +141,6 @@ project(QosProfile_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc } Inline_Files { - QosProfile_Test_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc index d72b9cbc98d..a4b41c1e134 100755 --- a/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QosProfile/Connector/QosProfile_Test_Connector.mpc @@ -137,7 +137,6 @@ project(QosProfile_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - QosProfile_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc index 53e453e7139..941c743621a 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Connector/Different_Test_Connector.mpc @@ -141,7 +141,6 @@ project(QC_Different_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Different_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc index 3f7b9aa30d8..85dd243f6e1 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Receiver/Different_Test_Receiver.mpc @@ -142,7 +142,6 @@ project(QC_Different_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c } Inline_Files { - Different_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc index 3492597f7b7..3e74d8a83c8 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/Different/Sender/Different_Test_Sender.mpc @@ -141,7 +141,6 @@ project(QC_Different_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - Different_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc index 9bb5e407515..8b932282b08 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QCLE_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_QCLE_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - QCLE_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc index 86e474393bc..d92762f9355 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QCLE_Test_Receiver.mpc @@ -142,7 +142,6 @@ project(DDS_QCLE_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - QCLE_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc index 2f7235a6adf..7f18230f3b7 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QCLE_Test_Sender.mpc @@ -141,7 +141,6 @@ project(DDS_QCLE_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - QCLE_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc index 94d1d42f37a..45aed08f861 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/ReadGet_Starter.mpc @@ -105,7 +105,6 @@ project(QC_ReadGet_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - ReadGet_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc index 12f3cc89114..72d2bf53811 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/ReadGet_Test_Connector.mpc @@ -141,7 +141,6 @@ project(QC_ReadGet_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - ReadGet_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc index d23c076ce5c..7921cbe4a6b 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver.mpc @@ -151,7 +151,6 @@ project(QC_ReadGet_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - ReadGet_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc index 5a6fbcd89ea..646e41736db 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/ReadGet_Test_Sender.mpc @@ -149,7 +149,6 @@ project(QC_ReadGet_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - ReadGet_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc index 280a7b459b5..fec70bf2120 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QCLS_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_QCLS_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - QCLS_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc index 0ae5f09bbd9..2065079617c 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QCLS_Test_Receiver.mpc @@ -142,7 +142,6 @@ project(DDS_QCLS_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - QCLS_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc index e26f147f9c9..24faaafecbc 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QCLS_Test_Sender.mpc @@ -141,7 +141,6 @@ project(DDS_QCLS_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - QCLS_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc index b8c87f6b474..97d4bbb5aa9 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Connector/QCTL_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_QCTL_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - QCTL_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc index 31db6189f26..cd83936e9ad 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Receiver/QCTL_Test_Receiver.mpc @@ -142,7 +142,6 @@ project(DDS_QCTL_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - QCTL_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc index 579307a21d0..b7ebbab66fb 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoListeners/Sender/QCTL_Test_Sender.mpc @@ -141,7 +141,6 @@ project(DDS_QCTL_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - QCTL_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc index 3c76cb764f3..2d00901a16b 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Base/QCTQ_Starter.mpc @@ -105,7 +105,6 @@ project(QC_QCTQ_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - QCTQ_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc index 328ea31df85..2bbf9d1ffeb 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Connector/QCTQ_Test_Connector.mpc @@ -141,7 +141,6 @@ project(QC_QCTQ_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - QCTQ_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc index 4a6be1d7437..d785375eda8 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Receiver/QCTQ_Test_Receiver.mpc @@ -151,7 +151,6 @@ project(QC_QCTQ_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - QCTQ_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc index 3ec615ddba9..021a1f623b5 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueries/Sender/QCTQ_Test_Sender.mpc @@ -149,7 +149,6 @@ project(QC_QCTQ_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - QCTQ_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc index bfb73fb293c..f18a0f3624b 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Base/QCTQM_Starter.mpc @@ -105,7 +105,6 @@ project(QC_QCTQM_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - QCTQM_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc index 8aaaabc6469..9a05b0c9b18 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Connector/QCTQM_Test_Connector.mpc @@ -141,7 +141,6 @@ project(QC_QCTQM_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - QCTQM_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc index 3ae4655b697..165c2188ece 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Receiver/QCTQM_Test_Receiver.mpc @@ -151,7 +151,6 @@ project(QC_QCTQM_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - QCTQM_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc index 610c2244d45..d100e1c039b 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/TwoQueriesMany/Sender/QCTQM_Test_Sender.mpc @@ -149,7 +149,6 @@ project(QC_QCTQM_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - QCTQM_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc index ca02024d4da..624b9d48c65 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc @@ -106,7 +106,6 @@ project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - Reader_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc index c5051492881..7d2b87f936e 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_Reader_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Reader_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc index 363cb84e998..e03548b14f3 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc @@ -151,7 +151,6 @@ project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - Reader_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc index 509cd971428..2104f38f015 100755 --- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc @@ -145,7 +145,6 @@ project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - Reader_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc index 050904fd873..0138dc69436 100755 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc @@ -106,7 +106,6 @@ project(reader_starter_rt_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - Reader_StarterS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc index f5e8207275a..c37580e6821 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Connector/RG_ResetTopic_Connector.mpc @@ -141,7 +141,6 @@ project (RG_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - RG_ResetTopic_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc index fe2ed2dae50..85e4b58c572 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Receiver/RG_ResetTopic_Receiver.mpc @@ -151,7 +151,6 @@ project (RG_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - RG_ResetTopic_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc index b2ee15acdb8..44953e66e1d 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Sender/RG_ResetTopic_Sender.mpc @@ -146,7 +146,6 @@ project (RG_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - RG_ResetTopic_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc index dd159226915..d7328088ab9 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Connector/TE_ResetTopic_Connector.mpc @@ -141,7 +141,6 @@ project (TE_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - TE_ResetTopic_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc index 396ab0c1405..0a4db8e0b4a 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/ToEmpty/Sender/TE_ResetTopic_Sender.mpc @@ -137,7 +137,6 @@ project (TE_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - TE_ResetTopic_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc index b65dca4b5b5..c9c8e62acac 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Connector/TL_ResetTopic_Connector.mpc @@ -141,7 +141,6 @@ project (TL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - TL_ResetTopic_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc index 54d6d13d885..ee310a9e2ff 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/TooLong/Sender/TL_ResetTopic_Sender.mpc @@ -137,7 +137,6 @@ project (TL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - TL_ResetTopic_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc index 2c4579b3a4f..c2e3c2a8b20 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Connector/UL_ResetTopic_Connector.mpc @@ -141,7 +141,6 @@ project (UL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - UL_ResetTopic_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc index 0de0609a041..152b2dd974e 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Receiver/UL_ResetTopic_Receiver.mpc @@ -134,7 +134,6 @@ project (UL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - UL_ResetTopic_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc index d8f536e893c..3da79ab75cc 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/UpdateListen/Sender/UL_ResetTopic_Sender.mpc @@ -137,7 +137,6 @@ project (UL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - UL_ResetTopic_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc index 62db2b36ac7..d69a574e44d 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Connector/WL_ResetTopic_Connector.mpc @@ -141,7 +141,6 @@ project (WL_ResetTopicConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - WL_ResetTopic_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc index bd7eb36429a..ce3901b3e9d 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Receiver/WL_ResetTopic_Receiver.mpc @@ -134,7 +134,6 @@ project (WL_ResetTopicReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - WL_ResetTopic_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc index 9bc89b7f5fa..bea65475164 100644 --- a/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/ResetTopic/WriteListen/Sender/WL_ResetTopic_Sender.mpc @@ -137,7 +137,6 @@ project (WL_ResetTopicSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - WL_ResetTopic_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc index c56b0d5ac3a..1ef29e1e3fc 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_SL_Disabled_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - SL_Disabled_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc index b83664809b8..bb281ccd853 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - SL_Disabled_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc index 6d66a6972b0..fd163cdca4a 100644 --- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - SL_Disabled_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc index c2ab7baeb2f..abc9df04a91 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_SL_ManyByMany_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - SL_ManyByMany_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc index 55ee904c9ff..af66b714a89 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4c } Inline_Files { - SL_ManyByMany_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc index 7b50385ccb9..3bf2d77a0de 100644 --- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - SL_ManyByMany_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc index 55ad3afdc19..94af0031a82 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_SL_OneByOne_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - SL_OneByOne_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc index de5c9ff828e..639fef1cd5c 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - SL_OneByOne_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc index 5d3a20aa785..252c6ef7681 100644 --- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - SL_OneByOne_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc index 1c74f0ab775..9a096cf64fb 100755 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Component/SetConnectorAttribute_Component.mpc @@ -143,7 +143,6 @@ project(SetAttribute_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_s } Inline_Files { - SetConnectorAttribute_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc index b85f34d4e3a..a3a7b059a63 100644 --- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_SCAConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - SetConnectorAttribute_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc index 6aaf141acb8..a1999b81ff5 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc @@ -149,7 +149,6 @@ project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc index cbdfc31a238..47577d5f9d0 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc @@ -136,7 +136,6 @@ project(DDS_SharedDP_Connector1_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Connector1S.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc index 73573bac8ea..25b513ce964 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc @@ -136,7 +136,6 @@ project(DDS_SharedDP_Connector2_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Connector2S.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc index 3084ea5d5e5..8d687b20c36 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc @@ -136,7 +136,6 @@ project(DDS_SharedDP_Connector3_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Connector3S.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc index 12eee1ea5c0..742ee5dcc50 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc @@ -141,7 +141,6 @@ project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_sk } Inline_Files { - ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc index f2e187fdeba..6bf6327e66e 100644 --- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc @@ -136,6 +136,5 @@ project(DDS_SharedDP_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc index f7d970dcca9..8def4599916 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_SCT_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - State_Connection_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc index 92866a73ea8..af14efe0d75 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc @@ -131,7 +131,6 @@ project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - State_Connection_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc index c02f131cb1d..45b35c1d1d4 100644 --- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - State_Connection_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc index a466944e64d..061a7d9ab8c 100755 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/TopicName/Component/TopicName_Test_Component.mpc @@ -141,7 +141,6 @@ project(TopicName_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm } Inline_Files { - TopicName_Test_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc index 09c84a868d9..35f0894f641 100755 --- a/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/TopicName/Connector/TopicName_Test_Connector.mpc @@ -137,7 +137,6 @@ project(TopicName_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - TopicName_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc index fd28afa04ff..1b3dd2ad778 100755 --- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_TwoTopics_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - TwoTopics_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc index 43ca1a68ba1..088e25cab77 100644 --- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc @@ -143,6 +143,5 @@ project(DDS_TTDN_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc index ee1b077b410..f3d8cdd33a2 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc @@ -141,7 +141,6 @@ project(DDS_Unkeyed_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Unkeyed_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc index 4d13ce564b3..56b0d7f34ed 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc } Inline_Files { - Unkeyed_Test_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc index bf77811e084..306a73909c1 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - Unkeyed_Test_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc index 6e65176c578..3a8e05b1461 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc @@ -141,7 +141,6 @@ project(DDS_UnkeyedWriterConnector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Writer_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc index 25888cd8018..2bee13ac808 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4cc } Inline_Files { - Writer_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc index d5eb9bfd2de..0e994657330 100644 --- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ } Inline_Files { - Writer_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc index 26f83636ed4..f29b01b9ea6 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_Updater_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - Updater_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc index 511d294319f..70f09d56233 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc @@ -132,7 +132,6 @@ project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - Updater_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc index 863665f5039..c1760b54668 100644 --- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc @@ -134,7 +134,6 @@ project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - Updater_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc index 8e8b60dd5d4..e73fb50f6b5 100755 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Component/UCC_Test_Component.mpc @@ -142,7 +142,6 @@ project(UCC_Test_Component_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - UCC_Test_ComponentS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc index 7c1f3f74466..094dbad880b 100755 --- a/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/UserdataCopyCount/Connector/UCC_Test_Connector.mpc @@ -137,7 +137,6 @@ project(UCC_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - UCC_Test_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc index 761b14515bf..079f66eec7e 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VT_Array_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VT_Array_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc index 843a4fa14c7..7a97e32486b 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VT_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VT_Seq_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc index 3e65fa33321..308433fc923 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VT_String_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VT_String_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc index c1bb787a5cf..ef3664690da 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Union/VT_Union_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VT_Union_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VT_Union_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc index 0e80dda9817..925f9f7cf62 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Valuetype/VT_Valuetype_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VT_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VT_Valuetype_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc index fd8b3fae706..bb42936b606 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VTopic_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VTopic_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc index 7ba401de13a..b1185e8a62a 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc @@ -162,7 +162,6 @@ project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - VTopic_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc index 87f0a724472..bb1dca76d3c 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc @@ -165,7 +165,6 @@ project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel { } Inline_Files { - VTopic_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc index 336e0b542b1..9d456278398 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VTS_Array_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VTS_Array_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc index 90adfbca433..7fe3ba92bdb 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VTS_Seq_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VTS_Seq_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc index ddf01c3cece..81d69998197 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VTS_String_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VTS_String_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc index b4f50b4ed17..dda7ffbaaea 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Union/VTS_Union_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VTS_Union_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VTS_Union_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc index 71e0ce97349..aee02aaa288 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Valuetype/VTS_Valuetype_Connector.mpc @@ -140,7 +140,6 @@ project(DDS_VTS_Valuetype_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VTS_Valuetype_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc index 6982ab916ad..4006b783de5 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_VTopics_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - VTopics_ConnectorS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc index c7cda9d2681..15919f9a2d8 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc @@ -166,7 +166,6 @@ project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - VTopics_ReceiverS.inl } } diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc index 836cf7f9951..ae24d2073f3 100644 --- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc +++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc @@ -162,7 +162,6 @@ project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - VTopics_SenderS.inl } } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc index 96ee0aac02a..2eaf7f9a9f4 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Control_comp/src/Shapes_Control_comp.mpc @@ -22,7 +22,7 @@ project(Shapes_Control_idl_gen) : componentidldefaults { project(Shapes_Control_executor_gen) : componentidldefaults { requires += dummy_label custom_only = 1 - idlflags += -Gexr -SS -Sci -Ssi \ + idlflags += -Gexr -SS -Sci \ -I../ports \ -I../../ports \ -o ../../../Tutorial/Code/Shapes_Control_comp @@ -172,7 +172,6 @@ project(Shapes_Control_comp_svnt) : ciao_servant { } Inline_Files { - GeneratedCode/Shapes_Control_compS.inl } } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc index 37fdaa19d1c..122ef63ad99 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Receiver_comp/src/Shapes_Receiver_comp.mpc @@ -21,7 +21,7 @@ project(Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm { project(Shapes_Receiver_executor_gen) : componentidldefaults, dds4ccm { requires += dummy_label custom_only = 1 - idlflags += -Gex -SS -Sci -Ssi \ + idlflags += -Gex -SS -Sci \ -I../../ports \ -o ../../../Tutorial/Code/Shapes_Receiver_comp @@ -167,7 +167,6 @@ project(Shapes_Receiver_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_ske } Inline_Files { - GeneratedCode/Shapes_Receiver_compS.inl } } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc index 7856260550f..86ce4151c7c 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/Shapes_Sender_comp/src/Shapes_Sender_comp.mpc @@ -21,7 +21,7 @@ project(Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm { project(Shapes_Sender_executor_gen) : componentidldefaults, dds4ccm { requires += dummy_label custom_only = 1 - idlflags += -Gex -SS -Sci -Ssi \ + idlflags += -Gex -SS -Sci \ -I../ports \ -I../../ports \ -o ../../../Tutorial/Code/Shapes_Sender_comp @@ -176,7 +176,6 @@ project(Shapes_Sender_comp_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel } Inline_Files { - GeneratedCode/Shapes_Sender_compS.inl } } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc index bd5cd37a3a8..7ee17767ecb 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_Control_obj.mpc @@ -121,7 +121,6 @@ project(Shapes_Control_obj_svnt) : ciao_servant { } Inline_Files { - GeneratedCode/Shapes_Control_objS.inl } } diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc index 49348cfc8d9..aabd7b238c6 100644 --- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc +++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_conn.mpc @@ -148,7 +148,6 @@ project(Shapes_ShapeType_conn_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - GeneratedCode/Shapes_ShapeType_connS.inl } } diff --git a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc index 8b93817e648..ab49f609c0c 100644 --- a/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc +++ b/CIAO/connectors/tests/AMIDDS/Base/AmiDds_Base.mpc @@ -140,7 +140,6 @@ project(AMI_AmiDds_Base_skel) : ciao_executor, ami, ami4ccm_servant { } Inline_Files { - AmiDds_BaseS.inl } } diff --git a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc index a6a0eef11b7..0e37ed917aa 100755 --- a/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc +++ b/CIAO/connectors/tests/AMIDDS/Connector/AmiDds_Connector.mpc @@ -137,7 +137,6 @@ project(DDS_AmiDds_Connector_svnt) : ciao_servant, dds4ccm_impl { } Inline_Files { - AmiDds_ConnectorS.inl } } diff --git a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc index d317fc97391..8f49b09e43c 100644 --- a/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc +++ b/CIAO/connectors/tests/AMIDDS/Receiver/AmiDds_Receiver.mpc @@ -129,7 +129,6 @@ project(AMI_AmiDds_Base_AmiDds_Receiver_svnt) : ciao_servant, messaging, dds4ccm } Inline_Files { - AmiDds_ReceiverS.inl } } diff --git a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc index 690c19f9559..eab35196775 100644 --- a/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc +++ b/CIAO/connectors/tests/AMIDDS/Sender/AmiDds_Sender.mpc @@ -127,6 +127,5 @@ project(AMI_AmiDds_Base_AmiDds_Sender_svnt) : ciao_servant, ami, dds4ccm_lem_stu } Inline_Files { - AmiDds_SenderS.inl } } diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc b/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc index 596cf8127d2..06e7212197f 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc +++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator.mpc @@ -103,7 +103,6 @@ project(Messenger_Administrator_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - AdministratorS.inl } } diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc index fc381000da8..9bacf9f7094 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc +++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc @@ -165,11 +165,6 @@ project(Messenger_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - RunnableS.inl - PublicationS.inl - MessageS.inl - HistoryS.inl - MessengerS.inl } } diff --git a/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc b/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc index 15624707766..e14e26cd97d 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc +++ b/CIAO/examples/DevGuideExamples/Messenger/Receiver.mpc @@ -103,7 +103,6 @@ project(Messenger_Receiver_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - ReceiverS.inl } } diff --git a/CIAO/examples/Display/Display_Base/Display_Base.mpc b/CIAO/examples/Display/Display_Base/Display_Base.mpc index b832d592e8e..c85e89028ce 100644 --- a/CIAO/examples/Display/Display_Base/Display_Base.mpc +++ b/CIAO/examples/Display/Display_Base/Display_Base.mpc @@ -72,7 +72,6 @@ project(Display_Base_skel) : ciao_executor, avoids_ccm_noevent { } Inline_Files { - Display_BaseS.inl } } diff --git a/CIAO/examples/Display/GPS/GPS.mpc b/CIAO/examples/Display/GPS/GPS.mpc index de68aa559cb..cd38a306f54 100644 --- a/CIAO/examples/Display/GPS/GPS.mpc +++ b/CIAO/examples/Display/GPS/GPS.mpc @@ -110,7 +110,6 @@ project(Display_GPS_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - GPSS.inl } } diff --git a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc index ad5f48de356..db572d57581 100644 --- a/CIAO/examples/Display/NavDisplay/NavDisplay.mpc +++ b/CIAO/examples/Display/NavDisplay/NavDisplay.mpc @@ -108,7 +108,6 @@ project(Display_NavDisplay_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - NavDisplayS.inl } } diff --git a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc index bf4d7a4d9b2..2ba05c17ccb 100644 --- a/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc +++ b/CIAO/examples/Display/NavDisplayGUI_exec/NavDisplayGUI.mpc @@ -84,6 +84,5 @@ project(Display_NavDisplayGUI_svnt) : ciao_servant, ace_qt4, avoids_ccm_noevent } Inline_Files { - ../NavDisplay/NavDisplayS.inl } } diff --git a/CIAO/examples/Display/RateGen/RateGen.mpc b/CIAO/examples/Display/RateGen/RateGen.mpc index 15aac53177a..3baaa5653ce 100644 --- a/CIAO/examples/Display/RateGen/RateGen.mpc +++ b/CIAO/examples/Display/RateGen/RateGen.mpc @@ -108,7 +108,6 @@ project(Display_RateGen_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - RateGenS.inl } } diff --git a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc index 4f6a3bdfdf6..b8f35ae53cc 100644 --- a/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc +++ b/CIAO/examples/Hello/Hello_Base/Hello_Base.mpc @@ -103,7 +103,6 @@ project(Hello_Base_skel) : ciao_executor, avoids_ccm_noevent { } Inline_Files { - Hello_BaseS.inl } } diff --git a/CIAO/examples/Hello/Receiver/Receiver.mpc b/CIAO/examples/Hello/Receiver/Receiver.mpc index 277f55bc9c1..c1d6b30836d 100644 --- a/CIAO/examples/Hello/Receiver/Receiver.mpc +++ b/CIAO/examples/Hello/Receiver/Receiver.mpc @@ -134,7 +134,6 @@ project(Hello_Base_Receiver_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - ReceiverS.inl } } diff --git a/CIAO/examples/Hello/Sender/Sender.mpc b/CIAO/examples/Hello/Sender/Sender.mpc index e1997492231..739ab7594f6 100644 --- a/CIAO/examples/Hello/Sender/Sender.mpc +++ b/CIAO/examples/Hello/Sender/Sender.mpc @@ -134,7 +134,6 @@ project(Hello_Base_Sender_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - SenderS.inl } } diff --git a/CIAO/examples/Null_Component/Null_Component.mpc b/CIAO/examples/Null_Component/Null_Component.mpc index c30a953737c..8cb15530500 100644 --- a/CIAO/examples/Null_Component/Null_Component.mpc +++ b/CIAO/examples/Null_Component/Null_Component.mpc @@ -108,7 +108,6 @@ project(Null_Component_svnt) : ciao_servant { } Inline_Files { - Null_ComponentS.inl } } diff --git a/CIAO/examples/Null_Component/Null_Interface.mpc b/CIAO/examples/Null_Component/Null_Interface.mpc index 576b107bf12..f4c0f67de3b 100644 --- a/CIAO/examples/Null_Component/Null_Interface.mpc +++ b/CIAO/examples/Null_Component/Null_Interface.mpc @@ -71,7 +71,6 @@ project(Null_Interface_skel) : ciao_executor { } Inline_Files { - Null_InterfaceS.inl } } diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc b/CIAO/examples/Null_Component_Glfa/Null_Component.mpc index 6ac1fa4cd13..fea7a7dab9c 100644 --- a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc +++ b/CIAO/examples/Null_Component_Glfa/Null_Component.mpc @@ -106,7 +106,6 @@ project(Null_Component_Glfa_svnt) : ciao_servant { } Inline_Files { - Null_ComponentS.inl } } diff --git a/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc b/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc index d0db26f94d6..62e02a70b65 100644 --- a/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc +++ b/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc @@ -61,7 +61,6 @@ project(Null_Interface_Glfa_skel) : ciao_executor { } Inline_Files { - Null_InterfaceS.inl } } diff --git a/CIAO/performance-tests/Benchmark/Benchmark.mpc b/CIAO/performance-tests/Benchmark/Benchmark.mpc index 5f0bc92b12c..bf9dc6c55f3 100644 --- a/CIAO/performance-tests/Benchmark/Benchmark.mpc +++ b/CIAO/performance-tests/Benchmark/Benchmark.mpc @@ -71,7 +71,6 @@ project(Benchmark_skel) : ciao_executor { } Inline_Files { - BenchmarkS.inl } } diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc index c9ead9ff038..921d1e4c085 100644 --- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc +++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc @@ -111,7 +111,6 @@ project(Benchmark_RoundTrip_svnt) : ciao_servant { } Inline_Files { - RoundTripS.inl } } diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc index c2120afb8ca..567fbcfce13 100644 --- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc +++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc @@ -111,7 +111,6 @@ project(Benchmark_RoundTripClient_svnt) : ciao_servant, avoids_ace_for_tao { } Inline_Files { - RoundTripClientS.inl } } diff --git a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc index e6cdc6ca320..c831cc1be5f 100644 --- a/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc +++ b/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc @@ -109,7 +109,6 @@ project(Protocols_Receiver_svnt) : ciao_servant, avoids_ace_for_tao { } Inline_Files { - ReceiverS.inl } } diff --git a/CIAO/performance-tests/Protocols/Sender/Sender.mpc b/CIAO/performance-tests/Protocols/Sender/Sender.mpc index 017ca0a3d7e..775ce63d5d9 100644 --- a/CIAO/performance-tests/Protocols/Sender/Sender.mpc +++ b/CIAO/performance-tests/Protocols/Sender/Sender.mpc @@ -109,7 +109,6 @@ project(Protocols_Sender_svnt) : ciao_servant, avoids_ace_for_tao { } Inline_Files { - SenderS.inl } } diff --git a/CIAO/performance-tests/Protocols/common/Protocols.mpc b/CIAO/performance-tests/Protocols/common/Protocols.mpc index 59f0d8dc3ad..210df2ec9a2 100644 --- a/CIAO/performance-tests/Protocols/common/Protocols.mpc +++ b/CIAO/performance-tests/Protocols/common/Protocols.mpc @@ -71,7 +71,6 @@ project(Protocols_skel) : ciao_executor { } Inline_Files { - ProtocolsS.inl } } diff --git a/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc b/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc index 910cc83694c..f0d959c90ec 100644 --- a/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc +++ b/CIAO/tests/Bug_3769_Regression/Bug_3769_Regression.mpc @@ -116,7 +116,6 @@ project(Foo_svnt) : ciao_servant { } Inline_Files { - FooS.inl } } diff --git a/CIAO/tests/Bug_3817_Regression/Bar.mpc b/CIAO/tests/Bug_3817_Regression/Bar.mpc index 825b0d2ce41..841dfb1528e 100644 --- a/CIAO/tests/Bug_3817_Regression/Bar.mpc +++ b/CIAO/tests/Bug_3817_Regression/Bar.mpc @@ -126,7 +126,6 @@ project(Bar_svnt) : ciao_servant { } Inline_Files { - BarS.inl } } diff --git a/CIAO/tests/Bug_3834_Regression/CompA.mpc b/CIAO/tests/Bug_3834_Regression/CompA.mpc index 64dc55dca0b..206c9232a9d 100644 --- a/CIAO/tests/Bug_3834_Regression/CompA.mpc +++ b/CIAO/tests/Bug_3834_Regression/CompA.mpc @@ -110,7 +110,6 @@ project(Moo_CompA_svnt) : ciao_servant { } Inline_Files { - CompAS.inl } } diff --git a/CIAO/tests/Bug_3834_Regression/CompB.mpc b/CIAO/tests/Bug_3834_Regression/CompB.mpc index c771b140908..ac8cf43f85e 100644 --- a/CIAO/tests/Bug_3834_Regression/CompB.mpc +++ b/CIAO/tests/Bug_3834_Regression/CompB.mpc @@ -110,7 +110,6 @@ project(Moo_CompB_svnt) : ciao_servant { } Inline_Files { - CompBS.inl } } diff --git a/CIAO/tests/Bug_3834_Regression/Moo.mpc b/CIAO/tests/Bug_3834_Regression/Moo.mpc index a2912d1fa55..dd0d5335bca 100644 --- a/CIAO/tests/Bug_3834_Regression/Moo.mpc +++ b/CIAO/tests/Bug_3834_Regression/Moo.mpc @@ -62,7 +62,6 @@ project(Moo_skel) : ciao_executor { } Inline_Files { - MooS.inl } } diff --git a/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc b/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc index a83620556ca..763f526c233 100644 --- a/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc +++ b/CIAO/tests/Bug_3890_Regression/Bug_3890_Regression.mpc @@ -117,7 +117,6 @@ project(Bug_3890_svnt) : ciao_servant { } Inline_Files { - FooS.inl } } diff --git a/CIAO/tests/CIDL/CodeGen/Basic.mpc b/CIAO/tests/CIDL/CodeGen/Basic.mpc index 97cdef6fede..9bc565d5b66 100644 --- a/CIAO/tests/CIDL/CodeGen/Basic.mpc +++ b/CIAO/tests/CIDL/CodeGen/Basic.mpc @@ -73,7 +73,6 @@ project(Basic_skel) : ciao_executor { } Inline_Files { - BasicS.inl } } diff --git a/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/CIAO/tests/CIDL/CodeGen/CodeGen.mpc index 3dc67ecb63e..6a9320a9d28 100644 --- a/CIAO/tests/CIDL/CodeGen/CodeGen.mpc +++ b/CIAO/tests/CIDL/CodeGen/CodeGen.mpc @@ -109,7 +109,6 @@ project(Basic_CodeGen_svnt) : ciao_servant { } Inline_Files { - CodeGenS.inl } } diff --git a/CIAO/tests/CIF/Component/CIF_Component.mpc b/CIAO/tests/CIF/Component/CIF_Component.mpc index b0f43ca39b7..6ad684379b6 100644 --- a/CIAO/tests/CIF/Component/CIF_Component.mpc +++ b/CIAO/tests/CIF/Component/CIF_Component.mpc @@ -134,7 +134,6 @@ project(CIF_Component_svnt) : ciao_servant { } Inline_Files { - CIF_ComponentS.inl } } diff --git a/CIAO/tests/COPI/Registration/Client/Component/Component.mpc b/CIAO/tests/COPI/Registration/Client/Component/Component.mpc index 1034d8c48ad..83aa34160ef 100644 --- a/CIAO/tests/COPI/Registration/Client/Component/Component.mpc +++ b/CIAO/tests/COPI/Registration/Client/Component/Component.mpc @@ -135,6 +135,5 @@ project(Client_Component_svnt) : ciao_servant, ccm_extension_stub, ciao_extensio } Inline_Files { - ComponentS.inl } } diff --git a/CIAO/tests/COPI/Registration/Servant/Component/Component.mpc b/CIAO/tests/COPI/Registration/Servant/Component/Component.mpc index 78fe74c57fe..3043db21a54 100644 --- a/CIAO/tests/COPI/Registration/Servant/Component/Component.mpc +++ b/CIAO/tests/COPI/Registration/Servant/Component/Component.mpc @@ -135,6 +135,5 @@ project(Servant_Component_svnt) : ciao_servant, ccm_extension_stub, ciao_extensi } Inline_Files { - ComponentS.inl } } diff --git a/CIAO/tests/COPI/Registration/Server/Component/Component.mpc b/CIAO/tests/COPI/Registration/Server/Component/Component.mpc index 4f06d262fb2..151c24a5221 100644 --- a/CIAO/tests/COPI/Registration/Server/Component/Component.mpc +++ b/CIAO/tests/COPI/Registration/Server/Component/Component.mpc @@ -135,6 +135,5 @@ project(Server_Component_svnt) : ciao_servant, ccm_extension_stub, ciao_extensio } Inline_Files { - ComponentS.inl } } diff --git a/CIAO/tests/COPI/Registration/Stub/Component/Component.mpc b/CIAO/tests/COPI/Registration/Stub/Component/Component.mpc index bede26b0445..ceb87cc7c2e 100644 --- a/CIAO/tests/COPI/Registration/Stub/Component/Component.mpc +++ b/CIAO/tests/COPI/Registration/Stub/Component/Component.mpc @@ -135,6 +135,5 @@ project(Stub_Component_svnt) : ciao_servant, ccm_extension_stub, ciao_extension_ } Inline_Files { - ComponentS.inl } } diff --git a/CIAO/tests/Collocation/Coll_Base/Base.mpc b/CIAO/tests/Collocation/Coll_Base/Base.mpc index 71e624a9d43..a61ef47507e 100644 --- a/CIAO/tests/Collocation/Coll_Base/Base.mpc +++ b/CIAO/tests/Collocation/Coll_Base/Base.mpc @@ -103,7 +103,6 @@ project(CollBase_skel) : ciao_executor { } Inline_Files { - BaseS.inl } } diff --git a/CIAO/tests/Collocation/Receiver/Receiver.mpc b/CIAO/tests/Collocation/Receiver/Receiver.mpc index eeb86e2c23a..4702aa7b7c6 100644 --- a/CIAO/tests/Collocation/Receiver/Receiver.mpc +++ b/CIAO/tests/Collocation/Receiver/Receiver.mpc @@ -134,6 +134,5 @@ project(CollBase_Receiver_svnt) : ciao_servant { } Inline_Files { - ReceiverS.inl } } diff --git a/CIAO/tests/Collocation/Sender/Sender.mpc b/CIAO/tests/Collocation/Sender/Sender.mpc index efc59e6dcc9..57e574d0aa9 100644 --- a/CIAO/tests/Collocation/Sender/Sender.mpc +++ b/CIAO/tests/Collocation/Sender/Sender.mpc @@ -134,7 +134,6 @@ project(CollBase_Sender_svnt) : ciao_servant { } Inline_Files { - SenderS.inl } } diff --git a/CIAO/tests/DAnCE/Components/ProcessColocation.mpc b/CIAO/tests/DAnCE/Components/ProcessColocation.mpc index 935e34e9072..2d8930bb5f1 100644 --- a/CIAO/tests/DAnCE/Components/ProcessColocation.mpc +++ b/CIAO/tests/DAnCE/Components/ProcessColocation.mpc @@ -101,7 +101,6 @@ project(ProcessColocation_svnt) : ciao_servant { } Inline_Files { - ProcessColocationS.inl } } diff --git a/CIAO/tests/DAnCE/Components/Progressive.mpc b/CIAO/tests/DAnCE/Components/Progressive.mpc index 867849678d1..83e1b59627a 100644 --- a/CIAO/tests/DAnCE/Components/Progressive.mpc +++ b/CIAO/tests/DAnCE/Components/Progressive.mpc @@ -104,7 +104,6 @@ project(SimpleCommon_Progressive_svnt) : ciao_servant { } Inline_Files { - ProgressiveS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc b/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc index 398c5046641..e11c70278f0 100644 --- a/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleAttribute.mpc @@ -101,7 +101,6 @@ project(SimpleAttribute_svnt) : ciao_servant { } Inline_Files { - SimpleAttributeS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleCommon.mpc b/CIAO/tests/DAnCE/Components/SimpleCommon.mpc index f959f6d3647..089ce7133c0 100644 --- a/CIAO/tests/DAnCE/Components/SimpleCommon.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleCommon.mpc @@ -72,7 +72,6 @@ project(SimpleCommon_skel) : ccm_svnt { } Inline_Files { - SimpleCommonS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc b/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc index a194a7b326e..e7b2c041de2 100644 --- a/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleConsumer.mpc @@ -103,7 +103,6 @@ project(SimpleCommon_SimpleConsumer_svnt) : ciao_servant { } Inline_Files { - SimpleConsumerS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc b/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc index 406d74a2cea..954d4a7792f 100644 --- a/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleEmitter.mpc @@ -103,7 +103,6 @@ project(SimpleCommon_SimpleEmitter_svnt) : ciao_servant { } Inline_Files { - SimpleEmitterS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleFailure.mpc b/CIAO/tests/DAnCE/Components/SimpleFailure.mpc index 74414e91beb..3edf3b96a75 100644 --- a/CIAO/tests/DAnCE/Components/SimpleFailure.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleFailure.mpc @@ -101,7 +101,6 @@ project(SimpleFailure_svnt) : ciao_servant { } Inline_Files { - SimpleFailureS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc b/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc index cf34a87f1cf..cac2ef1fa87 100644 --- a/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleLocalProvider.mpc @@ -104,7 +104,6 @@ project(SimpleLocalProvider_svnt) : ciao_servant { } Inline_Files { - SimpleLocalProviderS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc b/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc index 12eea2aa2d9..601df62a436 100644 --- a/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleLocalUser.mpc @@ -104,7 +104,6 @@ project(SimpleCommon_SimpleLocalUser_svnt) : ciao_servant { } Inline_Files { - SimpleLocalUserS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc index 7b112a2527a..b534158c547 100644 --- a/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleMultipleUser.mpc @@ -103,7 +103,6 @@ project(SimpleCommon_SimpleMultipleUser_svnt) : ciao_servant { } Inline_Files { - SimpleMultipleUserS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc index a2005b51ec2..965eb2650ec 100644 --- a/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetProvider.mpc @@ -105,7 +105,6 @@ project(SimpleCommon_SNFP_svnt) : ciao_servant { } Inline_Files { - SimpleNilFacetProviderS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc index ae50276f3e7..78805726832 100644 --- a/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleNilFacetUser.mpc @@ -104,7 +104,6 @@ project(SimpleCommon_SNFU_svnt) : ciao_servant { } Inline_Files { - SimpleNilFacetUserS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleNull.mpc b/CIAO/tests/DAnCE/Components/SimpleNull.mpc index 9ec397addf0..01c1cba289f 100644 --- a/CIAO/tests/DAnCE/Components/SimpleNull.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleNull.mpc @@ -100,7 +100,6 @@ project(SimpleNull_svnt) : ciao_servant { } Inline_Files { - SimpleNullS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleProvider.mpc b/CIAO/tests/DAnCE/Components/SimpleProvider.mpc index 6e3d8269ee2..eb743ecc70c 100644 --- a/CIAO/tests/DAnCE/Components/SimpleProvider.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleProvider.mpc @@ -104,7 +104,6 @@ project(SimpleCommon_SimpleProvider_svnt) : ciao_servant { } Inline_Files { - SimpleProviderS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimplePublisher.mpc b/CIAO/tests/DAnCE/Components/SimplePublisher.mpc index d9ce1cb7416..3091fc8aca1 100644 --- a/CIAO/tests/DAnCE/Components/SimplePublisher.mpc +++ b/CIAO/tests/DAnCE/Components/SimplePublisher.mpc @@ -103,7 +103,6 @@ project(SimpleCommon_SimplePublisher_svnt) : ciao_servant { } Inline_Files { - SimplePublisherS.inl } } diff --git a/CIAO/tests/DAnCE/Components/SimpleUser.mpc b/CIAO/tests/DAnCE/Components/SimpleUser.mpc index d02e0fa4d28..e892e1f5399 100644 --- a/CIAO/tests/DAnCE/Components/SimpleUser.mpc +++ b/CIAO/tests/DAnCE/Components/SimpleUser.mpc @@ -104,7 +104,6 @@ project(SimpleCommon_SimpleUser_svnt) : ciao_servant { } Inline_Files { - SimpleUserS.inl } } diff --git a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc index 756d9524ddc..78e9d7bfae9 100644 --- a/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc +++ b/CIAO/tests/DAnCE/Executor-Destructor/Executor_Destructor.mpc @@ -128,7 +128,6 @@ project(Executor_Destructor_svnt) : ciao_servant { } Inline_Files { - Executor_DestructorS.inl } } diff --git a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc index 09a47961fd4..de946e27569 100644 --- a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc +++ b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure.mpc @@ -135,7 +135,6 @@ project(Launch_Failure_svnt) : ciao_servant { } Inline_Files { - Launch_FailureS.inl } } diff --git a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc index af9a8de9035..1ee324339c8 100644 --- a/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc +++ b/CIAO/tests/DAnCE/LocalityManager/CPUAffinity/CPUAffinity.mpc @@ -118,7 +118,6 @@ project(CPUAffinity_svnt) : ciao_servant { } Inline_Files { - CPUAffinityS.inl } } diff --git a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc index 5840be245b0..3e308ac4543 100644 --- a/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc +++ b/CIAO/tests/DAnCE/LocalityManager/CommandlinePassage/CommandlinePassage.mpc @@ -118,7 +118,6 @@ project(CommandlinePassage_svnt) : ciao_servant { } Inline_Files { - CommandlinePassageS.inl } } diff --git a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc index 8af8f64ceac..8dec8229046 100644 --- a/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc +++ b/CIAO/tests/DAnCE/LocalityManager/UnexpectedShutdown/UnexpectedShutdown.mpc @@ -119,7 +119,6 @@ project(UnexpectedShutdown_svnt) : ciao_servant, dance_stub { } Inline_Files { - UnexpectedShutdownS.inl } } diff --git a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc index 35209725957..0ee47989de2 100644 --- a/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc +++ b/CIAO/tests/DAnCE/PartialShutdown/Base/PartialShutdown.mpc @@ -82,7 +82,6 @@ project(PartialShutdown_skel) : ciao_executor { } Inline_Files { - PartialShutdownS.inl } } diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc index bc4fd0d067a..36e1d9eaa4d 100755 --- a/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc +++ b/CIAO/tests/DAnCE/PartialShutdown/Component1/Component1.mpc @@ -144,7 +144,6 @@ project(PartialShutdown_Component1_svnt) : ciao_servant { } Inline_Files { - Component1S.inl } } diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc index 393d13e9121..eca2a9e0ea5 100755 --- a/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc +++ b/CIAO/tests/DAnCE/PartialShutdown/Component2/Component2.mpc @@ -142,7 +142,6 @@ project(PartialShutdown_Component2_svnt) : ciao_servant { } Inline_Files { - Component2S.inl } } diff --git a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc index 4d765df747f..a7b39c70250 100755 --- a/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc +++ b/CIAO/tests/DAnCE/PartialShutdown/Component3/Component3.mpc @@ -142,7 +142,6 @@ project(PartialShutdown_Component3_svnt) : ciao_servant { } Inline_Files { - Component3S.inl } } diff --git a/CIAO/tests/DAnCE/Threading/Base/Threading.mpc b/CIAO/tests/DAnCE/Threading/Base/Threading.mpc index 5220ee660b1..43ac64b328c 100644 --- a/CIAO/tests/DAnCE/Threading/Base/Threading.mpc +++ b/CIAO/tests/DAnCE/Threading/Base/Threading.mpc @@ -82,7 +82,6 @@ project(Threading_skel) : ciao_executor { } Inline_Files { - ThreadingS.inl } } diff --git a/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc b/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc index 8a5dbef8b5e..42b32014eb0 100755 --- a/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc +++ b/CIAO/tests/DAnCE/Threading/Component1/Component1.mpc @@ -146,7 +146,6 @@ project(Threading_Component1_svnt) : ciao_servant { } Inline_Files { - Component1S.inl } } diff --git a/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc b/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc index 2b00e1fea12..6e5cbe9f92a 100755 --- a/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc +++ b/CIAO/tests/DAnCE/Threading/Component2/Component2.mpc @@ -143,7 +143,6 @@ project(Threading_Component2_svnt) : ciao_servant { } Inline_Files { - Component2S.inl } } diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc index d304ea6c99d..03068d46826 100644 --- a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc +++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.mpc @@ -98,7 +98,6 @@ project(Cornucopia_skel) : ccm_svnt { } Inline_Files { - CornucopiaS.inl } } diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc index ce745f5e1c2..5aeb294873b 100644 --- a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc +++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc @@ -118,7 +118,6 @@ project(Inherited_Components_svnt) : ciao_servant { } Inline_Files { - Inherited_componentsS.inl } } diff --git a/CIAO/tests/IDL_Test/Extension/Cornucopia.mpc b/CIAO/tests/IDL_Test/Extension/Cornucopia.mpc index 88ea286251b..573ccb6a938 100644 --- a/CIAO/tests/IDL_Test/Extension/Cornucopia.mpc +++ b/CIAO/tests/IDL_Test/Extension/Cornucopia.mpc @@ -1,6 +1,7 @@ // $Id$ project(Cornucopia_Ext_idl_gen) : componentidldefaults { + requires += dummy_label custom_only = 1 idlflags += -Wb,stub_export_macro=CORNUCOPIA_STUB_Export \ -Wb,stub_export_include=Cornucopia_stub_export.h \ @@ -19,6 +20,7 @@ project(Cornucopia_Ext_idl_gen) : componentidldefaults { } project(Cornucopia_Ext_lem_gen) : ciaoidldefaults { + requires += dummy_label custom_only = 1 after += Cornucopia_Ext_idl_gen idlflags += -Wb,export_macro=CORNUCOPIA_EXEC_Export \ @@ -32,6 +34,7 @@ project(Cornucopia_Ext_lem_gen) : ciaoidldefaults { } project(Cornucopia_Ext_stub) : ccm_stub { + requires += dummy_label after += Cornucopia_Ext_idl_gen sharedname = Cornucopia_stub @@ -81,6 +84,7 @@ project(Cornucopia_Ext_exec) : ciao_executor, ccm_extension_stub { } project(Cornucopia_Ext_skel) : ccm_svnt, ccm_extension_stub { + requires += dummy_label after += Cornucopia_Ext_stub sharedname = Cornucopia_skel libs += Cornucopia_stub @@ -100,11 +104,11 @@ project(Cornucopia_Ext_skel) : ccm_svnt, ccm_extension_stub { } Inline_Files { - CornucopiaS.inl } } project(Cornucopia_Ext_svnt) : ciao_servant, ccm_extension_stub, ciao_extension_container_stub { + requires += dummy_label after += Cornucopia_Ext_exec Cornucopia_Ext_skel Cornucopia_Ext_stub sharedname = Cornucopia_svnt libs += Cornucopia_exec \ diff --git a/CIAO/tests/IDL_Test/Glfa/A.mpc b/CIAO/tests/IDL_Test/Glfa/A.mpc index 227a2fe401b..187148ddcd1 100644 --- a/CIAO/tests/IDL_Test/Glfa/A.mpc +++ b/CIAO/tests/IDL_Test/Glfa/A.mpc @@ -61,7 +61,6 @@ project(Glfa_A_skel) : ciao_executor { } Inline_Files { - AS.inl } } diff --git a/CIAO/tests/IDL_Test/Glfa/B.mpc b/CIAO/tests/IDL_Test/Glfa/B.mpc index b8ce9440f68..6e65a5ea3de 100644 --- a/CIAO/tests/IDL_Test/Glfa/B.mpc +++ b/CIAO/tests/IDL_Test/Glfa/B.mpc @@ -126,7 +126,6 @@ project(Glfa_B_svnt) : ciao_servant { } Inline_Files { - BS.inl } } diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc index 25eea2842f9..d9a3f079839 100644 --- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc +++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc @@ -101,7 +101,6 @@ project(KitchenSink_svnt) : ciao_servant { } Inline_Files { - KitchenSinkS.inl } } @@ -141,7 +140,6 @@ project(KitchenSink_IDL2_skel) : ciao_executor, avoids_ccm_noevent{ Inline_Files { KitchenSink_IDL2C.inl - KitchenSink_IDL2S.inl } } diff --git a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc index 29da29c8549..0a0838b0b15 100644 --- a/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc +++ b/CIAO/tests/IDL_Test/Included_Component/IC_Bar.mpc @@ -98,7 +98,6 @@ project(IC_Bar_svnt) : ciao_servant { } Inline_Files { - IC_BarS.inl } } diff --git a/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc b/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc index a67cdacab12..1d158ef9d8e 100644 --- a/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc +++ b/CIAO/tests/IDL_Test/Included_Component/IC_Foo.mpc @@ -97,7 +97,6 @@ project(IC_Foo_svnt) : ciao_servant { } Inline_Files { - IC_FooS.inl } } diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc index f61c1cff337..4ba77224976 100644 --- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc +++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Base.mpc @@ -122,6 +122,5 @@ project(Base_svnt) : ciao_servant { } Inline_Files { - BaseS.inl } } diff --git a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc index 6d4d8337d77..c291f0dbd9c 100644 --- a/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc +++ b/CIAO/tests/IDL_Test/Inherited_Component/Extended/Derived.mpc @@ -138,7 +138,6 @@ project(Base_Derived_svnt) : ciao_servant { } Inline_Files { - DerivedS.inl } } diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc index e6223176d1b..a47f9b75728 100644 --- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc +++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Bar.mpc @@ -138,7 +138,6 @@ project(IhC_Foo_IhC_Bar_svnt) : ciao_servant { } Inline_Files { - IhC_BarS.inl } } diff --git a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc index 0f223c00acb..c4ee937fc5a 100644 --- a/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc +++ b/CIAO/tests/IDL_Test/Inherited_Component/IhC_Foo.mpc @@ -126,7 +126,6 @@ project(IhC_Foo_svnt) : ciao_servant { } Inline_Files { - IhC_FooS.inl } } diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl b/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl new file mode 100644 index 00000000000..6e570086ee9 --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Servants/Base.idl @@ -0,0 +1,28 @@ +// $Id$ + +#ifndef BASE_IDL +#define BASE_IDL + +#include <Components.idl> + +#pragma ciao lem "BaseE.idl" + +module Inherited +{ + interface base_interface { +// void do_base (); +// attribute string str_base_interface; + }; +}; + +module Inherited +{ + component Base_comp + { + provides Inherited::base_interface prov_base; + uses Inherited::base_interface uses_base; + attribute long base; + }; +}; + +#endif diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc b/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc new file mode 100644 index 00000000000..c67cafa359b --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Servants/Base.mpc @@ -0,0 +1,127 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl Base" + +project(IS_Base_idl_gen) : componentidldefaults { + custom_only = 1 + idlflags += -Wb,stub_export_macro=IS_BASE_STUB_Export \ + -Wb,stub_export_include=Base_stub_export.h \ + -Wb,skel_export_macro=IS_BASE_SVNT_Export \ + -Wb,skel_export_include=Base_svnt_export.h \ + -Wb,exec_export_macro=IS_BASE_EXEC_Export \ + -Wb,exec_export_include=Base_exec_export.h \ + -Gex + + IDL_Files { + Base.idl + } +} + +project(IS_Base_lem_gen) : ciaoidldefaults { + after += IS_Base_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=IS_BASE_LEM_STUB_Export \ + -Wb,stub_export_include=Base_lem_stub_export.h \ + -SS -Gxhst + + IDL_Files { + BaseE.idl + } +} + +project(IS_Base_lem_stub) : ccm_svnt { + after += IS_Base_lem_gen IS_Base_stub + libs += IS_Base_stub + + sharedname = IS_Base_lem_stub + dynamicflags += IS_BASE_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + BaseEC.cpp + } + + Header_Files { + BaseEC.h + Base_lem_stub_export.h + } + + Inline_Files { + BaseEC.inl + } +} + +project(IS_Base_stub) : ccm_stub { + after += IS_Base_idl_gen + libs += + + sharedname = IS_Base_stub + dynamicflags += IS_BASE_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + BaseC.cpp + } + + Header_Files { + BaseC.h + Base_stub_export.h + } + + Inline_Files { + BaseC.inl + } +} + +project(IS_Base_exec) : ciao_executor { + after += IS_Base_lem_stub IS_Base_stub + sharedname = IS_Base_exec + libs += IS_Base_stub IS_Base_lem_stub + + dynamicflags += IS_BASE_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Base_exec.cpp + } + + Header_Files { + Base_exec.h + Base_exec_export.h + } + + Inline_Files { + } +} + + +project(IS_Base_svnt) : ciao_servant { + after += IS_Base_lem_stub + sharedname = IS_Base_svnt + libs += IS_Base_stub IS_Base_lem_stub + + dynamicflags += IS_BASE_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + BaseS.cpp + Base_svnt.cpp + } + + Header_Files { + BaseS.h + Base_svnt.h + Base_svnt_export.h + } + + Inline_Files { + BaseS.inl + } +} diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl new file mode 100644 index 00000000000..831af3282ff --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.idl @@ -0,0 +1,65 @@ +// $Id$ + +#ifndef DERIVED_IDL +#define DERIVED_IDL + +#include <Components.idl> + +#include "Base.idl" + +#pragma ciao lem "DerivedE.idl" + +module Inherited +{ + interface derived_interface { + void do_derived (); + readonly attribute string str_derived_interface; + }; + + interface derived_2_interface : derived_interface { + void do_derived_2 (); + readonly attribute string str_derived_interface_2; + }; + + interface Tester + { + void set_long_base (in long base); + long get_long_base (); + + void set_long_derived (in long derived); + long get_long_derived (); + }; + + component Derived_comp : Inherited::Base_comp + supports Inherited::Tester + { + provides Inherited::derived_interface prov_derived; + uses Inherited::derived_interface uses_derived; + + attribute long derived; + }; + + component Derived_2_comp : Inherited::Derived_comp + { + provides Inherited::derived_2_interface prov_derived_2; + uses Inherited::derived_2_interface uses_derived_2; + + attribute long derived_2; + }; +}; + +// Without a module +interface derived_3_interface : Inherited::derived_interface { + void do_derived_3 (); + readonly attribute string str_derived_interface_3; +}; + +component Derived_3_comp : Inherited::Derived_comp +{ + provides derived_3_interface prov_derived_3; + uses derived_3_interface uses_derived_3; + + attribute long derived_3; +}; + +#endif /* DERIVED_IDL */ diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc new file mode 100644 index 00000000000..dc83639de9d --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Servants/Derived.mpc @@ -0,0 +1,163 @@ +// $Id$ +// This file is generated with "generate_component_mpc.pl -p IhC_Foo Derived" + +project(IS_Base_Derived_idl_gen) : componentidldefaults { + custom_only = 1 + after += IS_Base_idl_gen + idlflags += -Wb,stub_export_macro=IS_DERIVED_STUB_Export \ + -Wb,stub_export_include=Derived_stub_export.h \ + -Wb,skel_export_macro=IS_DERIVED_SVNT_Export \ + -Wb,skel_export_include=Derived_svnt_export.h \ + -Wb,exec_export_macro=IS_DERIVED_EXEC_Export \ + -Wb,exec_export_include=Derived_exec_export.h \ + -Gex + + IDL_Files { + Derived.idl + } +} + +project(IS_Base_Derived_lem_gen) : ciaoidldefaults { + after += IS_Base_Derived_idl_gen + custom_only = 1 + idlflags += -Wb,stub_export_macro=IS_DERIVED_LEM_STUB_Export \ + -Wb,stub_export_include=Derived_lem_stub_export.h \ + -SS -Gxhst + + IDL_Files { + DerivedE.idl + } +} + +project(IS_Base_Derived_lem_stub) : ccm_svnt { + after += IS_Base_Derived_lem_gen \ + IS_Base_Derived_stub \ + IS_Base_stub \ + IS_Base_lem_stub + libs += IS_Base_stub \ + IS_Base_lem_stub \ + IS_Derived_stub + + sharedname = IS_Derived_lem_stub + dynamicflags += IS_DERIVED_LEM_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + DerivedEC.cpp + } + + Header_Files { + DerivedEC.h + Derived_lem_stub_export.h + } + + Inline_Files { + DerivedEC.inl + } +} + +project(IS_Base_Derived_stub) : ccm_stub { + after += IS_Base_Derived_idl_gen IS_Base_stub + libs += IS_Base_stub + + sharedname = IS_Derived_stub + dynamicflags += IS_DERIVED_STUB_BUILD_DLL + + IDL_Files { + } + + Source_Files { + DerivedC.cpp + } + + Header_Files { + DerivedC.h + Derived_stub_export.h + } + + Inline_Files { + DerivedC.inl + } +} + +project(IS_Base_Derived_exec) : ciao_executor { + after += IS_Base_Derived_lem_gen \ + IS_Base_Derived_lem_stub \ + IS_Base_Derived_stub \ + IS_Base_exec + sharedname = IS_Derived_exec + libs += IS_Derived_stub \ + IS_Derived_lem_stub \ + IS_Base_stub \ + IS_Base_lem_stub \ + IS_Base_exec + + dynamicflags += IS_DERIVED_EXEC_BUILD_DLL IS_BASE_EXEC_BUILD_DLL + + IDL_Files { + } + + Source_Files { + Derived_exec.cpp + } + + Header_Files { + Derived_exec.h + Derived_exec_export.h + } + + Inline_Files { + } +} + + +project(IS_Base_Derived_svnt) : ciao_servant { + after += IS_Base_svnt IS_Base_Derived_lem_stub + sharedname = IS_Derived_svnt + libs += IS_Derived_stub \ + IS_Derived_lem_stub \ + IS_Base_stub \ + IS_Base_lem_stub \ + IS_Base_svnt + + dynamicflags += IS_DERIVED_SVNT_BUILD_DLL + + IDL_Files { + } + + Source_Files { + DerivedS.cpp + Derived_svnt.cpp + } + + Header_Files { + DerivedS.h + Derived_svnt.h + Derived_svnt_export.h + } + + Inline_Files { + DerivedS.inl + } +} + + +project (IS_Derived_Tester) : ccm_stub, valuetype { + exename = Tester + after += IS_Base_Derived_stub + libs += IS_Derived_stub IS_Base_stub + IDL_Files { + } + + Source_Files { + Tester.cpp + } + + Header_Files { + } + + Inline_Files { + } +} diff --git a/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp b/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp new file mode 100644 index 00000000000..71a1bc8cd45 --- /dev/null +++ b/CIAO/tests/IDL_Test/Inherited_Servants/Tester.cpp @@ -0,0 +1,81 @@ +//$Id$ +/* + * @file Tester.cpp + * + * @author Marcel Smit + */ + + +#include "DerivedC.h" +#include "ace/streams.h" +#include "ace/Get_Opt.h" + +const ACE_TCHAR *tester_ior = ACE_TEXT ("file://Derived.ior"); + +int +parse_args (int argc, ACE_TCHAR *argv[]) +{ + ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("ek:n:")); + int c; + + while ((c = get_opts ()) != -1) + { + switch (c) + { + case 'k': + tester_ior = get_opts.opt_arg (); + break; + + case '?': + default: + ACE_ERROR_RETURN ((LM_ERROR, + "usage: %s\n" + "-k <Derived IOR> (default is file://Derived.ior)\n" + "\n", + argv [0]), + -1); + } + } + + return 0; +} + + +int ACE_TMAIN (int argc, ACE_TCHAR* argv[]) +{ + try + { + // initialize the ORB + CORBA::ORB_var orb = + CORBA::ORB_init (argc, argv); + if (parse_args (argc, argv) != 0) + { + return -1; + } + + // create the factory object reference, + CORBA::Object_var tester_obj = + orb->string_to_object (tester_ior); + + // downcast the object reference to the appropriate type +// ::Inherited::Tester_var tester = +// ::Inherited::Tester::_narrow (tester_obj.in ()); + +// if (CORBA::is_nil (tester.in ())) +// { +// ACE_ERROR_RETURN ((LM_ERROR, +// "Unable to acquire 'Tester' objref\n"), +// -1); +// } + + orb->destroy (); + } + catch (const CORBA::Exception& ex) + { + ex._tao_print_exception ("Who is the culprit in the Tester?\n"); + ACE_ERROR_RETURN ((LM_ERROR, + "Uncaught CORBA exception\n"), + 1); + } + return 0; +} diff --git a/CIAO/tests/IDL_Test/Keywords/Keywords.mpc b/CIAO/tests/IDL_Test/Keywords/Keywords.mpc index 82afaf5b642..1bb1e90bbfa 100644 --- a/CIAO/tests/IDL_Test/Keywords/Keywords.mpc +++ b/CIAO/tests/IDL_Test/Keywords/Keywords.mpc @@ -102,7 +102,6 @@ project(Keyword_Clash_svnt) : ciao_servant { } Inline_Files { - Keyword_ClashS.inl } } diff --git a/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc b/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc index e8c76560010..d184065407d 100644 --- a/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc +++ b/CIAO/tests/IDL_Test/Lem_Pragma/Lem_Pragma.mpc @@ -127,9 +127,6 @@ project(Lem_Pragma_svnt) : ciao_servant { } Inline_Files { - AS.inl - BS.inl - CS.inl } } diff --git a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc index 84b6fbd3f02..e25fb3e31a3 100644 --- a/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc +++ b/CIAO/tests/IDL_Test/Lem_Specific_Export/Lem_Export.mpc @@ -121,7 +121,6 @@ project(Lem_Export_svnt) : ciao_servant { } Inline_Files { - Lem_ExportS.inl } } diff --git a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc index cd0dd2c06e4..bc129212402 100644 --- a/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc +++ b/CIAO/tests/IDL_Test/NonTopic_Connector/NonTopic_Connector.mpc @@ -171,6 +171,5 @@ project(NT_Connector_svnt) : ciao_servant { } Inline_Files { - NonTopic_ConnectorS.inl } } diff --git a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc index 700204eeea9..6e2189c4215 100644 --- a/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc +++ b/CIAO/tests/IDL_Test/PIDL_Include/PIDLInclude.mpc @@ -124,7 +124,6 @@ project(PIDLInclude_svnt) : ciao_servant { } Inline_Files { - PIDLIncludeS.inl } } diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc index b91fdc8e08b..854e8da7918 100644 --- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc +++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Basic.mpc @@ -75,7 +75,6 @@ project(Reused_Facet_Interface_Basic_skel) : ciao_executor { } Inline_Files { - BasicS.inl } } diff --git a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc index b57d6b75eae..c985a972f7b 100644 --- a/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc +++ b/CIAO/tests/IDL_Test/Reused_Facet_Interface/Reused_Facet_Interface.mpc @@ -105,7 +105,6 @@ project(Reused_Facet_Interface_svnt) : ciao_servant { } Inline_Files { - CodeGenS.inl } } diff --git a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc index 5c25f2de231..c36a8ae51c0 100644 --- a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc +++ b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc @@ -101,6 +101,5 @@ project(TwoTemplArgs_svnt) : ciao_servant { } Inline_Files { - TwoTemplArgsS.inl } } diff --git a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc index 83639691569..06331d9c2ea 100644 --- a/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc +++ b/CIAO/tests/Minimum/Minimum_Base/Minimum_Base.mpc @@ -58,7 +58,6 @@ project(Minimum_Base_skel) : ccm_stub, portableserver { } Inline_Files { - Minimum_BaseS.inl } } diff --git a/CIAO/tests/Minimum/Receiver/Receiver.mpc b/CIAO/tests/Minimum/Receiver/Receiver.mpc index 69d6b20874c..e79e6619e8e 100644 --- a/CIAO/tests/Minimum/Receiver/Receiver.mpc +++ b/CIAO/tests/Minimum/Receiver/Receiver.mpc @@ -127,7 +127,6 @@ project(Minimum_Base_Receiver_svnt) : ciao_servant { } Inline_Files { - ReceiverS.inl } } diff --git a/CIAO/tests/Minimum/Sender/Sender.mpc b/CIAO/tests/Minimum/Sender/Sender.mpc index c2bf6997a28..302695e6e4a 100644 --- a/CIAO/tests/Minimum/Sender/Sender.mpc +++ b/CIAO/tests/Minimum/Sender/Sender.mpc @@ -106,7 +106,6 @@ project(Minimum_Base_Sender_svnt) : ciao_servant { } Inline_Files { - SenderS.inl } } diff --git a/CIAO/tests/Thread/Receiver/Receiver.mpc b/CIAO/tests/Thread/Receiver/Receiver.mpc index 6a200153a2a..41537017b9c 100644 --- a/CIAO/tests/Thread/Receiver/Receiver.mpc +++ b/CIAO/tests/Thread/Receiver/Receiver.mpc @@ -107,7 +107,6 @@ project(Thread_Receiver_skel) : ccm_svnt { } Inline_Files { - ReceiverS.inl } } diff --git a/CIAO/tests/Thread/Sender/Sender.mpc b/CIAO/tests/Thread/Sender/Sender.mpc index fe60b393f19..95b07882af4 100644 --- a/CIAO/tests/Thread/Sender/Sender.mpc +++ b/CIAO/tests/Thread/Sender/Sender.mpc @@ -113,7 +113,6 @@ project(Thread_Sender_svnt) : ciao_servant { } Inline_Files { - SenderS.inl } } diff --git a/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc b/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc index f92a98d874f..506204f343e 100644 --- a/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc +++ b/CIAO/tests/Thread/Thread_Base/Thread_Base.mpc @@ -71,7 +71,6 @@ project(Thread_Base_skel) : ccm_svnt { } Inline_Files { - Thread_BaseS.inl } } diff --git a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc index 1fa92c57c16..17e6d827fa5 100644 --- a/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc +++ b/CIAO/tutorials/Quoter/Simple/Broker/StockBroker.mpc @@ -130,7 +130,6 @@ project(Stock_Base_StockBroker_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - StockBrokerS.inl } } diff --git a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc index 4690c2030dc..a504cb41c97 100644 --- a/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc +++ b/CIAO/tutorials/Quoter/Simple/Distributor/StockDistributor.mpc @@ -130,7 +130,6 @@ project(Stock_Base_StockDistributor_svnt) : ciao_servant, avoids_ccm_noevent { } Inline_Files { - StockDistributorS.inl } } diff --git a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc index 0e78e03ed11..e1aafe36d19 100644 --- a/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc +++ b/CIAO/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc @@ -100,7 +100,6 @@ project(Stock_Base_skel) : ciao_executor, avoids_ccm_noevent { } Inline_Files { - Stock_BaseS.inl } } diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 07c2cf95097..22afcd7f29a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,8 +1,307 @@ +Sun Nov 27 18:19:18 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + Merging in another set of changes. The skeletons got refactored even + more and now the S.inl files are not generated anymore. For CIAO + we now generate the facet servants in new _svnt_T.{h,cpp} files, which + is the first step in a major refactoring and simplification of the + CCM servants which is also a first step in the direction of a Common + Component Model + + === start changelog === + + Sat Nov 26 11:58:18 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + Fixed keyword clash regarding c++ keywords. + + Fri Nov 25 13:28:08 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_visitor_component/facet_svth.cpp: + * TAO_IDL/be/be_visitor_component/facet_svts.cpp: + * TAO_IDL/be_include/be_visitor_component/facet_svth.h: + * TAO_IDL/be_include/be_visitor_component/facet_svts.h: + Templated servants for connector were not generated. Fixed this. + + Thu Nov 24 14:23:25 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_codegen.cpp: + Added appropriate ifdefs for including templated source + files. + + * TAO_IDL/be/be_visitor_attribute/attribute.cpp: + Also generate the setters in case templated code, + + Thu Nov 24 12:19:07 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_visitor_attribute/attribute.cpp: + Fixed an issues related to the generation of attribute + getter and setter methods. + + Thu Nov 24 11:14:31 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_codegen.cpp: + Don't use the fullname for the included template source. + + Thu Nov 24 10:59:28 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: + Included templated source file into the templated header. + Fixed some compile issues related to this. + + Thu Nov 24 07:43:27 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_visitor_component/facet_svth.cpp: + * TAO_IDL/be/be_visitor_component/facet_svts.cpp: + Fixed warnings on windows. + + Thu Nov 24 07:25:47 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + Fixed generation issue in case a component is not part of + module. + + Wed Nov 23 15:07:59 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * MPC/config/taobaseidldefaults.mpb: + Prevent building a second time when make was invoked a + second time. + + Fri Nov 4 15:45:54 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * examples/AMI/FL_Callback/FL_Callback.mpc: + * examples/RTScheduling/Job.mpc: + * examples/RTScheduling/Synch.mpc: + * orbsvcs/orbsvcs/CosConcurrency.mpc: + * orbsvcs/orbsvcs/CosEvent.mpc: + * orbsvcs/orbsvcs/CosLifeCycle.mpc: + * orbsvcs/orbsvcs/CosNaming_Skel.mpc: + * orbsvcs/orbsvcs/CosNotification.mpc: + * orbsvcs/orbsvcs/CosProperty.mpc: + * orbsvcs/orbsvcs/CosTime.mpc: + * orbsvcs/orbsvcs/CosTrading.mpc: + * orbsvcs/orbsvcs/DsEventLogAdmin.mpc: + * orbsvcs/orbsvcs/DsLogAdmin.mpc: + * orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc: + * orbsvcs/orbsvcs/RTEventLogAdmin.mpc: + * orbsvcs/orbsvcs/RTEvent_Skel.mpc: + * orbsvcs/orbsvcs/ec_typed_events_skel.mpb: + * tao/IFR_Client/IFR_Client.mpc: + * tests/Alt_Mapping/alt_mapping.mpc: + * tests/IDL_Inherited_Operation/InheritedOp.mpc: + * tests/Monitor/Marshal_Buffer/marshal_buffer.mpc: + * tests/Param_Test/Param_Test.mpc: + Removed all S.inl entries from the MPC files + + Fri Nov 4 16:17:33 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/tao_idl.1: + * docs/compiler.html: + * docs/tutorials/Quoter/Simple/Client/index.html: + * orbsvcs/tests/Bug_1393_Regression/run_test.pl: + * tests/Bug_3743_Regression/run_test.pl: + Removed references to S.inl files. + + Wed Nov 23 10:17:10 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: + * TAO_IDL/be_include/be_visitor_operation/operation_svs.h: + Found a better way whether we need to use a templated + class definition + + Fri Nov 4 16:24:26 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * MPC/config/taobaseidldefaults.mpb: + Don't generate S.inl extensions in the make files. + + Tue Nov 22 15:53:18 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_visitor_component/facet_svth.cpp: + * TAO_IDL/be/be_visitor_component/facet_svts.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_module/module.cpp: + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: + * TAO_IDL/be_include/be_visitor_component/facet_svth.h: + * TAO_IDL/be_include/be_visitor_component/facet_svts.h: + * TAO_IDL/be_include/be_visitor_operation/operation_svs.h: + Rename actions and prevented template declarations when not needed. + + Tue Nov 22 10:51:12 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL: + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/be/be_util.cpp: + + * TAO_IDL/be/be_visitor_component/component.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + + * TAO_IDL/be/be_visitor_interface.cpp: + + * TAO_IDL/be/be_visitor_interface/amh_sh.cpp: + * TAO_IDL/be/be_visitor_interface/amh_ss.cpp: + * TAO_IDL/be/be_visitor_interface/interface.cpp: + * TAO_IDL/be/be_visitor_interface/interface_sh.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ss.cpp: + + * TAO_IDL/be/be_visitor_module/module.cpp: + + * TAO_IDL/be/be_visitor_root.cpp: + * TAO_IDL/be/be_visitor_valuetype.cpp: + + * TAO_IDL/be/be_visitor_valuetype/valuetype.cpp: + + * TAO_IDL/be_include/be_codegen.h: + * TAO_IDL/be_include/be_global.h: + * TAO_IDL/be_include/be_interface.h: + * TAO_IDL/be_include/be_visitor_interface.h: + + * TAO_IDL/be_include/be_visitor_interface/amh_ss.h: + * TAO_IDL/be_include/be_visitor_interface/interface_ss.h: + + * TAO_IDL/be_include/be_visitor_root.h: + * TAO_IDL/be_include/be_visitor_valuetype.h: + + * TAO_IDL/tao_idl.1: + Merged in skeleton refactoring which now should work, no S.inl + files are generated anymore + + * TAO_IDL/be/be_visitor_interface/interface_si.cpp: + * TAO_IDL/be/be_visitor_root/root_si.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp: + * TAO_IDL/be_include/be_visitor_interface/amh_si.h: + * TAO_IDL/be_include/be_visitor_interface/interface_si.h: + * TAO_IDL/be_include/be_visitor_root/root_si.h: + * TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h: + Removed these files. + + Mon Nov 21 16:48:25 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_provides.cpp: + Removed _get_component method. + + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: + Added template argument to method declaration. + + Mon Nov 21 15:35:54 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_provides.cpp: + Layout changes in generated code. + + Mon Nov 21 15:21:53 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_provides.cpp: + * TAO_IDL/be/be_visitor_component.cpp: + * TAO_IDL/be/be_visitor_component/executor_exh.cpp: + * TAO_IDL/be/be_visitor_component/facet_svth.cpp: + * TAO_IDL/be/be_visitor_component/facet_svts.cpp: + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + * TAO_IDL/be_include/be_provides.h: + * TAO_IDL/be_include/be_visitor_component.h: + * TAO_IDL/be_include/be_visitor_component/facet_svth.h: + * TAO_IDL/be_include/be_visitor_component/facet_svts.h: + Template code for header is saved to _svnt_T.h. + + * TAO_IDL/be/be_visitor_component/facet_svh.cpp: + * TAO_IDL/be/be_visitor_component/facet_svs.cpp: + * TAO_IDL/be_include/be_visitor_component/facet_svh.h: + * TAO_IDL/be_include/be_visitor_component/facet_svs.h: + Renamed these files. + + Mon Nov 21 09:17:14 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_visitor_component/component_svh.cpp: + * TAO_IDL/be/be_visitor_component/component_svs.cpp: + * TAO_IDL/be/be_visitor_component/facet_svh.cpp: + * TAO_IDL/be/be_visitor_component/facet_svs.cpp: + * TAO_IDL/be/be_visitor_module/module.cpp: + * TAO_IDL/be_include/be_codegen.h: + * TAO_IDL/be_include/be_helper.h: + * TAO_IDL/be_include/be_visitor_component/facet_svh.h: + * TAO_IDL/be_include/be_visitor_component/facet_svs.h: + Determined the right file to write to (_svnt_T.cpp/h). + + Thu Nov 17 15:55:04 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_interface.cpp: + * TAO_IDL/be/be_visitor_interface/amh_si.cpp: + * TAO_IDL/be/be_visitor_operation/amh_sh.cpp: + * TAO_IDL/be/be_visitor_operation/amh_ss.cpp: + * TAO_IDL/be/be_visitor_operation/operation_sh.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: + * tao/Abstract_Servant_Base.h: + * tao/Messaging/AMH_Skeletons.h: + * tao/Messaging/AMH_Skeletons.cpp: + * tao/PortableServer/Operation_Table.h: + * tao/PortableServer/PolicyS.h: + * tao/PortableServer/PolicyS.cpp: + * tao/PortableServer/Servant_Base.h: + * tao/PortableServer/Servant_Base.cpp: + Changed the third argument of the skel methods from void* to + TAO_ServantBase*. As a result the static_cast in the skeleton + methods has been replaced with a dynamic_cast, something we couldn't + use in the past when we wheren't allowed to use RTTI. + + Thu Nov 17 11:33:52 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Abstract_Servant_Base.h: + synchronous_upcall_dispatch is not needed here + + * tao/PortableServer/PS_ForwardC.h: + Removed LocalServantBase, not part of CORBA anymore + + * tao/PortableServer/Servant_Base.h: + * tao/PortableServer/Servant_Base.cpp: + Start changing void* to TAO_ServantBase* + + * tao/PortableServer/Local_Servant_Base.cpp: + * tao/PortableServer/Local_Servant_Base.inl: + * tao/PortableServer/Local_Servant_Base.h: + Removed these files, not part of the CORBA spec anymore + + Thu Nov 17 10:46:22 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * MPC/config/taobaseidldefaults.mpb: + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_produce.cpp: + * TAO_IDL/be/be_visitor_component/component.cpp: + * TAO_IDL/be/be_visitor_component/facet_svh.cpp: + * TAO_IDL/be/be_visitor_component/facet_svs.cpp: + * TAO_IDL/be/be_visitor_component/servant_svs.cpp: + * TAO_IDL/be/be_visitor_module/module.cpp: + * TAO_IDL/be/be_visitor_root.cpp: + * TAO_IDL/be/be_visitor_root/root_svth.cpp: + * TAO_IDL/be/be_visitor_root/root_svts.cpp: + * TAO_IDL/be_include/be_codegen.h: + * TAO_IDL/be_include/be_global.h: + * TAO_IDL/be_include/be_visitor_root.h: + * TAO_IDL/be_include/be_visitor_root/root_svth.h: + * TAO_IDL/be_include/be_visitor_root/root_svts.h: + The IDL compileren doesn't generated the facet servants + in the _svnt.cpp/h files. + The IDL compiler now uses the template facet servant + implementation (which still need to be generated) + in the _svnt.cpp file. + The IDL compiler now creates the _svnt_T.cpp/h files and + initialize them. + + === end changelog === + Thu Nov 24 08:33:42 UTC 2011 Martin Corino <mcorino@remedy.nl> * tests/Mixed_Sync_ASync_Events/main.cpp: * tests/Mixed_Sync_ASync_Events/test_i.cpp: - + Fixed OpenVMS build errors. Wed Nov 23 14:37:02 UTC 2011 Martin Corino <mcorino@remedy.nl> diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb index 0337b206e3b..c8ab8cb0476 100644 --- a/TAO/MPC/config/taobaseidldefaults.mpb +++ b/TAO/MPC/config/taobaseidldefaults.mpb @@ -30,9 +30,6 @@ project: build_files { commandflags(!-SS && !-Ssi || !-Sci || -GT && !-SS && !-oS) += .inl, .i } optional(inline_pre_extension) { - commandflags(!-SS && !-Ssi && !-oS) += S - } - optional(inline_pre_extension) { commandflags(!-Sci) += C } @@ -59,11 +56,11 @@ project: build_files { } optional(source_pre_extension) { - commandflags(-Gsv) += _svnt + commandflags(-Gsv) += _svnt, _svnt_T } optional(header_pre_extension) { - commandflags(-Gsv) += _svnt + commandflags(-Gsv) += _svnt, _svnt_T } optional(source_pre_extension) { diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 24d45909e88..0b24fb0ff93 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -43,12 +43,13 @@ TAO_CodeGen::TAO_CodeGen (void) server_template_header_ (0), server_skeletons_ (0), server_template_skeletons_ (0), - server_inline_ (0), anyop_header_ (0), anyop_source_ (0), gperf_input_stream_ (0), ciao_svnt_header_ (0), ciao_svnt_source_ (0), + ciao_svnt_template_header_ (0), + ciao_svnt_template_source_ (0), ciao_exec_header_ (0), ciao_exec_source_ (0), ciao_exec_idl_ (0), @@ -676,18 +677,6 @@ TAO_CodeGen::start_server_skeletons (const char *fname) this->gen_skel_src_includes (); - // Only when we generate a server inline file generate the include - if (be_global->gen_server_inline ()) - { - // Generate the code that includes the inline file if not included in the - // header file. - *this->server_skeletons_ << "\n\n#if !defined (__ACE_INLINE__)\n"; - *this->server_skeletons_ << "#include \"" - << be_global->be_get_server_inline_fname (1) - << "\"\n"; - *this->server_skeletons_ << "#endif /* !defined INLINE */"; - } - // Begin versioned namespace support after initial headers have been // included, but before the inline file and post include // directives. @@ -756,39 +745,6 @@ TAO_CodeGen::server_template_skeletons (void) return this->server_template_skeletons_; } -// Set the server inline stream. -int -TAO_CodeGen::start_server_inline (const char *fname) -{ - // Clean up between multiple files. - delete this->server_inline_; - - ACE_NEW_RETURN (this->server_inline_, - TAO_OutStream, - -1); - - if (this->server_inline_->open (fname, TAO_OutStream::TAO_SVR_INL) == -1) - { - return -1; - } - - // Generate the ident string, if any. - this->gen_ident_string (this->server_inline_); - - // Begin versioned namespace support after initial headers, if any, have been - // included. - *this->server_inline_ << be_global->versioning_begin (); - - return 0; -} - -// Get the server inline stream. -TAO_OutStream * -TAO_CodeGen::server_inline (void) -{ - return this->server_inline_; -} - int TAO_CodeGen::start_anyop_header (const char *fname) { @@ -1112,7 +1068,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname) << "# pragma once\n" << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n"; - this->gen_svnt_hdr_includes (); + this->gen_svnt_hdr_includes (this->ciao_svnt_header_); return 0; } @@ -1154,9 +1110,131 @@ TAO_CodeGen::start_ciao_svnt_source (const char *fname) *this->ciao_svnt_source_ << "#include \"" << be_global->be_get_ciao_svnt_hdr_fname (true) + << "\"" << be_nl; + + *this->ciao_svnt_source_ + << "#include \"" + << be_global->be_get_ciao_tmpl_svnt_hdr_fname(true) << "\""; - this->gen_svnt_src_includes (); + this->gen_svnt_src_includes (this->ciao_svnt_source_); + + return 0; +} + +int +TAO_CodeGen::start_ciao_svnt_template_header (const char *fname) +{ + // Clean up between multiple files. + delete this->ciao_svnt_template_header_; + + ACE_NEW_RETURN (this->ciao_svnt_template_header_, + TAO_OutStream, + -1); + + int status = + this->ciao_svnt_template_header_->open (fname, + TAO_OutStream::CIAO_SVNT_T_HDR); + + if (status == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("TAO_CodeGen::start_ciao_svnt_template_header - ") + ACE_TEXT ("Error opening file\n")), + -1); + } + + TAO_OutStream &os = *this->ciao_svnt_template_header_; + + os << be_nl + << "// TAO_IDL - Generated from" << be_nl + << "// " << __FILE__ << ":" << __LINE__ + << be_nl_2; + + // Generate the #ident string, if any. + this->gen_ident_string (this->ciao_svnt_template_header_); + + // Generate the #ifndef clause. + this->gen_ifndef_string (fname, + this->ciao_svnt_template_header_, + "CIAO_SESSION_", + "_H_"); + + if (be_global->pre_include () != 0) + { + os << "#include /**/ \"" + << be_global->pre_include () + << "\"\n"; + } + + // All CIAO examples so far have component skeleton and servant + // generated code in the same library, using the skel export macro, + // so the values for the servant export default to the skel values. + // Eventually, there should be a way to completely decouple them. + if (be_global->svnt_export_include () != 0) + { + os << "\n#include /**/ \"" + << be_global->svnt_export_include () + << "\"\n"; + } + else if (be_global->skel_export_include () != 0) + { + os << "\n#include /**/ \"" + << be_global->skel_export_include () + << "\"\n"; + } + + // Some compilers don't optimize the #ifndef header include + // protection, but do optimize based on #pragma once. + os << "\n#if !defined (ACE_LACKS_PRAGMA_ONCE)\n" + << "# pragma once\n" + << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n"; + + this->gen_svnt_hdr_includes (this->ciao_svnt_template_header_); + + return 0; +} + +int +TAO_CodeGen::start_ciao_svnt_template_source (const char *fname) +{ + // Clean up between multiple files. + delete this->ciao_svnt_template_source_; + + ACE_NEW_RETURN (this->ciao_svnt_template_source_, + TAO_OutStream, + -1); + + int status = + this->ciao_svnt_template_source_->open (fname, + TAO_OutStream::CIAO_SVNT_T_IMPL); + + if (status == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("TAO_CodeGen::") + ACE_TEXT ("start_ciao_svnt_template_source - ") + ACE_TEXT ("Error opening file\n")), + -1); + } + + TAO_OutStream &os = *this->ciao_svnt_template_source_; + + os << be_nl + << "// TAO_IDL - Generated from" << be_nl + << "// " << __FILE__ << ":" << __LINE__ + << be_nl_2; + + // Generate the #ident string, if any. + this->gen_ident_string (this->ciao_svnt_template_source_); + + // Generate the include statement for the server header. + *this->ciao_svnt_template_source_ + << "#include \"" + << be_global->be_get_ciao_svnt_hdr_fname (true) + << "\"" << be_nl; + + this->gen_svnt_src_includes (this->ciao_svnt_template_source_); return 0; } @@ -1172,6 +1250,19 @@ TAO_CodeGen::ciao_svnt_source (void) { return this->ciao_svnt_source_; } + +TAO_OutStream * +TAO_CodeGen::ciao_svnt_template_header (void) +{ + return this->ciao_svnt_template_header_; +} + +TAO_OutStream * +TAO_CodeGen::ciao_svnt_template_source (void) +{ + return this->ciao_svnt_template_source_; +} + int TAO_CodeGen::start_ciao_exec_header (const char *fname) { @@ -1653,17 +1744,6 @@ TAO_CodeGen::end_server_header (void) << be_global->be_get_server_template_hdr_fname (true) << "\"\n"; } - - // Only when we generate a server inline file generate the include - if (be_global->gen_server_inline ()) - { - // Insert the code to include the inline file. - *os << "\n#if defined (__ACE_INLINE__)\n"; - *os << "#include \"" - << be_global->be_get_server_inline_fname (1) - << "\"\n"; - *os << "#endif /* defined INLINE */"; - } } if (be_global->post_include () != 0) @@ -1681,18 +1761,6 @@ TAO_CodeGen::end_server_header (void) return 0; } -void -TAO_CodeGen::end_server_inline (void) -{ - *this->server_inline_ << "\n"; - - // End versioned namespace support. Do not place include directives - // before this. - *this->server_inline_ << be_global->versioning_end (); - - *this->server_inline_ << "\n"; -} - int TAO_CodeGen::end_implementation_header (const char *fname) { @@ -1868,6 +1936,43 @@ TAO_CodeGen::end_ciao_svnt_source (void) } int +TAO_CodeGen::end_ciao_svnt_template_header (void) +{ + *this->ciao_svnt_template_header_ << be_nl + << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)" + << be_nl << "#include \"" + << be_global->be_get_ciao_tmpl_svnt_src_fname (true) + << "\"" << be_nl + << "#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */" + << be_nl_2 + << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)" + << be_nl << "#pragma implementation (\"" + << be_global->be_get_ciao_tmpl_svnt_src_fname (true) + << "\")" + << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */" + << be_nl; + + if (be_global->post_include () != 0) + { + *this->ciao_svnt_template_header_ << "\n\n#include /**/ \"" + << be_global->post_include () + << "\""; + } + + *this->ciao_svnt_template_header_ << "\n\n#endif /* ifndef */\n"; + + return 0; +} + +int +TAO_CodeGen::end_ciao_svnt_template_source (void) +{ + *this->ciao_svnt_template_source_ << "\n"; + + return 0; +} + +int TAO_CodeGen::end_ciao_exec_header (void) { if (be_global->post_include () != 0) @@ -3199,7 +3304,7 @@ TAO_CodeGen::gen_typecode_includes (TAO_OutStream * stream) } void -TAO_CodeGen::gen_svnt_hdr_includes (void) +TAO_CodeGen::gen_svnt_hdr_includes (TAO_OutStream *stream) { ACE_CString container_file ("ciao/Containers/"); container_file += be_global->ciao_container_type (); @@ -3208,7 +3313,7 @@ TAO_CodeGen::gen_svnt_hdr_includes (void) container_file += "_ContainerC.h"; this->gen_standard_include ( - this->ciao_svnt_header_, + stream, container_file.c_str ()); ACE_CString context_file ("ciao/Contexts/"); @@ -3218,55 +3323,59 @@ TAO_CodeGen::gen_svnt_hdr_includes (void) context_file += "_Context_T.h"; this->gen_standard_include ( - this->ciao_svnt_header_, - context_file.c_str ()); + stream, + context_file.c_str ()); ACE_CString servant_file ("ciao/Servants/"); servant_file += be_global->ciao_container_type (); servant_file += "/Servant_Impl_T.h"; this->gen_standard_include ( - this->ciao_svnt_header_, + stream, servant_file.c_str ()); this->gen_standard_include ( - this->ciao_svnt_header_, + stream, "ciao/Servants/Home_Servant_Impl_T.h"); - *this->ciao_svnt_header_ << be_nl; + this->gen_standard_include ( + stream, + "ciao/Servants/Facet_Servant_Base_T.h"); + + *stream << be_nl; this->gen_standard_include ( - this->ciao_svnt_header_, + stream, be_global->be_get_ciao_exec_stub_hdr_fname (true)); - *this->ciao_svnt_header_ << be_nl; + *stream << be_nl; this->gen_standard_include ( - this->ciao_svnt_header_, + stream, be_global->be_get_server_hdr_fname (true)); } void -TAO_CodeGen::gen_svnt_src_includes (void) +TAO_CodeGen::gen_svnt_src_includes (TAO_OutStream *stream) { this->gen_standard_include ( - this->ciao_svnt_source_, + stream, "ciao/Valuetype_Factories/Cookies.h"); this->gen_standard_include ( - this->ciao_svnt_source_, + stream, "tao/SystemException.h"); this->gen_standard_include ( - this->ciao_svnt_source_, + stream, "tao/Valuetype/ValueFactory.h"); this->gen_standard_include ( - this->ciao_svnt_source_, + stream, "tao/ORB_Core.h"); this->gen_standard_include ( - this->ciao_svnt_source_, + stream, "ace/SString.h"); } @@ -3621,7 +3730,6 @@ TAO_CodeGen::destroy (void) delete this->server_skeletons_; delete this->server_template_skeletons_; delete this->client_inline_; - delete this->server_inline_; delete this->anyop_source_; delete this->anyop_header_; delete this->ciao_svnt_header_; diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 370eb6e2b18..7fbf68871e3 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -72,9 +72,10 @@ BE_GlobalData::BE_GlobalData (void) server_template_hdr_ending_ (ACE::strnew ("S_T.h")), server_skeleton_ending_ (ACE::strnew ("S.cpp")), server_template_skeleton_ending_ (ACE::strnew ("S_T.cpp")), - server_inline_ending_ (ACE::strnew ("S.inl")), anyop_hdr_ending_ (ACE::strnew ("A.h")), anyop_src_ending_ (ACE::strnew ("A.cpp")), + ciao_svnt_hdr_template_ending_ (ACE::strnew ("_svnt_T.h")), + ciao_svnt_src_template_ending_ (ACE::strnew ("_svnt_T.cpp")), ciao_svnt_hdr_ending_ (ACE::strnew ("_svnt.h")), ciao_svnt_src_ending_ (ACE::strnew ("_svnt.cpp")), ciao_exec_hdr_ending_ (ACE::strnew ("_exec.h")), @@ -127,7 +128,6 @@ BE_GlobalData::BE_GlobalData (void) gen_anyop_files_ (false), gen_skel_files_ (true), gen_client_inline_ (true), - gen_server_inline_ (true), gen_client_stub_ (true), gen_server_skeleton_ (true), gen_local_iface_anyops_ (true), @@ -391,17 +391,6 @@ BE_GlobalData::be_get_server_template_skeleton (UTL_String *idl_file_name, } const char * -BE_GlobalData::be_get_server_inline (UTL_String *idl_file_name, - bool base_name_only) -{ - return be_change_idl_file_extension (idl_file_name, - be_global->server_inline_ending (), - base_name_only, - false, - true); -} - -const char * BE_GlobalData::be_get_anyop_header (UTL_String *idl_file_name, bool base_name_only) { @@ -431,6 +420,16 @@ BE_GlobalData::be_get_ciao_svnt_header (UTL_String *idl_file_name, } const char * +BE_GlobalData::be_get_ciao_svnt_template_header (UTL_String *idl_file_name, + bool base_name_only) +{ + return be_change_idl_file_extension (idl_file_name, + be_global->ciao_svnt_header_template_ending (), + base_name_only); +} + + +const char * BE_GlobalData::be_get_ciao_svnt_source (UTL_String *idl_file_name, bool base_name_only) { @@ -440,6 +439,15 @@ BE_GlobalData::be_get_ciao_svnt_source (UTL_String *idl_file_name, } const char * +BE_GlobalData::be_get_ciao_svnt_template_source (UTL_String *idl_file_name, + bool base_name_only) +{ + return be_change_idl_file_extension (idl_file_name, + be_global->ciao_svnt_source_template_ending (), + base_name_only); +} + +const char * BE_GlobalData::be_get_ciao_exec_header (UTL_String *idl_file_name, bool base_name_only) { @@ -638,15 +646,6 @@ BE_GlobalData::be_get_server_template_skeleton_fname ( } const char * -BE_GlobalData::be_get_server_inline_fname ( - bool base_name_only) -{ - return - be_get_server_inline (idl_global->stripped_filename (), - base_name_only); -} - -const char * BE_GlobalData::be_get_anyop_source_fname ( bool base_name_only) { @@ -674,6 +673,15 @@ BE_GlobalData::be_get_ciao_svnt_hdr_fname ( } const char * +BE_GlobalData::be_get_ciao_tmpl_svnt_hdr_fname ( + bool base_name_only) +{ + return + be_get_ciao_svnt_template_header (idl_global->stripped_filename (), + base_name_only); +} + +const char * BE_GlobalData::be_get_ciao_svnt_src_fname ( bool base_name_only) { @@ -683,6 +691,15 @@ BE_GlobalData::be_get_ciao_svnt_src_fname ( } const char * +BE_GlobalData::be_get_ciao_tmpl_svnt_src_fname ( + bool base_name_only) +{ + return + be_get_ciao_svnt_template_source (idl_global->stripped_filename (), + base_name_only); +} + +const char * BE_GlobalData::be_get_ciao_exec_hdr_fname ( bool base_name_only) { @@ -1251,19 +1268,6 @@ BE_GlobalData::server_template_skeleton_ending (void) const } void -BE_GlobalData::server_inline_ending (const char* s) -{ - ACE::strdelete (this->server_inline_ending_); - this->server_inline_ending_ = ACE::strnew (s); -} - -const char* -BE_GlobalData::server_inline_ending (void) const -{ - return this->server_inline_ending_; -} - -void BE_GlobalData::anyop_header_ending (const char* s) { ACE::strdelete (this->anyop_hdr_ending_); @@ -1352,6 +1356,32 @@ BE_GlobalData::ciao_svnt_source_ending (void) const } void +BE_GlobalData::ciao_svnt_header_template_ending (const char* s) +{ + ACE::strdelete (this->ciao_svnt_hdr_template_ending_); + this->ciao_svnt_hdr_template_ending_ = ACE::strnew (s); +} + +const char* +BE_GlobalData::ciao_svnt_header_template_ending (void) const +{ + return this->ciao_svnt_hdr_template_ending_; +} + +void +BE_GlobalData::ciao_svnt_source_template_ending (const char* s) +{ + ACE::strdelete (this->ciao_svnt_src_template_ending_); + this->ciao_svnt_src_template_ending_ = ACE::strnew (s); +} + +const char* +BE_GlobalData::ciao_svnt_source_template_ending (void) const +{ + return this->ciao_svnt_src_template_ending_; +} + +void BE_GlobalData::ciao_exec_header_ending (const char* s) { ACE::strdelete (this->ciao_exec_hdr_ending_); @@ -2003,9 +2033,6 @@ BE_GlobalData::destroy (void) ACE::strdelete (this->server_template_skeleton_ending_); this->server_template_skeleton_ending_ = 0; - ACE::strdelete (this->server_inline_ending_); - this->server_inline_ending_ = 0; - ACE::strdelete (this->anyop_hdr_ending_); this->anyop_hdr_ending_ = 0; @@ -2338,18 +2365,6 @@ BE_GlobalData::gen_client_inline (bool val) } bool -BE_GlobalData::gen_server_inline (void) const -{ - return this->gen_server_inline_; -} - -void -BE_GlobalData::gen_server_inline (bool val) -{ - this->gen_server_inline_ = val; -} - -bool BE_GlobalData::gen_client_stub (void) const { return this->gen_client_stub_; @@ -2739,8 +2754,6 @@ BE_GlobalData::parse_args (long &i, char **av) // Default is "S.cpp". // <-sT Server's template skeleton file name ending> // Default is "S_T.cpp". - // <-si Server's inline file name ending> - // Default is "S.inl". // <-sI Server's implementation skeleton file name ending> // Default is "I.cpp". @@ -2756,12 +2769,6 @@ BE_GlobalData::parse_args (long &i, char **av) be_global->server_template_skeleton_ending (av[i + 1]); ++i; } - else if (av[i][2] == 'i') - { - idl_global->append_idl_flag (av[i + 1]); - be_global->server_inline_ending (av[i + 1]); - ++i; - } else if (av[i][2] == 'I') { idl_global->append_idl_flag (av[i + 1]); @@ -2770,7 +2777,7 @@ BE_GlobalData::parse_args (long &i, char **av) } else { - // I expect 's' or 'T' or 'i' or 't' after 's'. + // I expect 's' or 'T' or or 't' after 's'. ACE_ERROR (( LM_ERROR, ACE_TEXT ("IDL: I don't understand the '%C' option\n"), @@ -3512,7 +3519,6 @@ BE_GlobalData::parse_args (long &i, char **av) { // Disable skeleton file generation. be_global->gen_skel_files (false); - be_global->gen_server_inline (false); be_global->gen_server_skeleton (false); } else @@ -3526,12 +3532,7 @@ BE_GlobalData::parse_args (long &i, char **av) } else if (av[i][2] == 's') { - if (av[i][3] == 'i') - { - // No skeleton inline. - be_global->gen_server_inline (false); - } - else if (av[i][3] == 'c') + if (av[i][3] == 'c') { // No skeleton inline. be_global->gen_server_skeleton (false); diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 1e86561f1e4..90056690717 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -1407,7 +1407,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface, if (be_global->gen_direct_collocation ()) { *os << " &" - << derived_interface->full_direct_proxy_impl_name () + << this->full_direct_proxy_impl_name () << "::" << d->local_name (); } else @@ -1436,7 +1436,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface, if (be_global->gen_direct_collocation ()) { *os << " &" - << derived_interface->full_direct_proxy_impl_name () + << this->full_direct_proxy_impl_name () << "::_get_" << d->local_name (); } else @@ -1458,7 +1458,7 @@ be_interface::gen_optable_entries (be_interface *derived_interface, if (be_global->gen_direct_collocation ()) { *os << " &" - << derived_interface->full_direct_proxy_impl_name () + << this->full_direct_proxy_impl_name () << "::_set_" << d->local_name (); } else @@ -1504,15 +1504,64 @@ be_interface::gen_optable_entries (be_interface *derived_interface, // We are an operation node. We use the original // operation name, not the one with _cxx_ in it. - *os << d->original_local_name () << ",&" - << full_skeleton_name << "::" - << d->local_name () << "_skel,"; - + // We need to the name of the base class!! But since + // we don't know whether this is an AMH class, we + // need to check this, using the full_skeleton_name + // TODO: find a more elegant solution for this + ACE_CString tmp (full_skeleton_name); + if (tmp.strstr ("AMH_") != ACE_String_Base_Const::npos) + { + ACE_CString name (d->full_name ()); + ACE_String_Base_Const::size_type const last = name.rfind(':') - 1; + name = name.substring (0, last); + if (name.rfind (':') != ACE_String_Base_Const::npos) + { + ACE_CString nspace = name.substring (0, name.rfind (':') - 1); + name = name.substring (name.rfind (':') + 1); + *os << d->original_local_name () << ",&POA_" + << nspace.c_str () << "::AMH_" + << name.c_str () << "::" + << d->original_local_name () + << "_skel,"; + } + else + { + *os << d->original_local_name () << ",&POA_AMH_" + << name.c_str () << "::" + << d->original_local_name () + << "_skel,"; + } + } + else + { + if (!d->is_abstract ()) + { + *os << d->original_local_name () << ",&POA_" + << d->full_name () << "_skel,"; + } + else + { + *os << d->original_local_name () << ",&" + << full_skeleton_name << "::" + << d->original_local_name () + << "_skel,"; + } + } if (be_global->gen_direct_collocation ()) { - *os << " &" - << derived_interface->full_direct_proxy_impl_name (); - *os << "::" << d->local_name (); + if (!d->is_abstract ()) + { + *os << " &" + << this->full_direct_proxy_impl_name () + << "::" << d->local_name (); + } + else + { + *os << " &" + << derived_interface->full_direct_proxy_impl_name () + << "::" << d->local_name (); + } + } else { @@ -1534,19 +1583,47 @@ be_interface::gen_optable_entries (be_interface *derived_interface, } // Generate only the "get" entry if we are readonly. - *os << "_get_" << d->original_local_name () << ",&" - << full_skeleton_name << "::_get_" - << d->local_name () << "_skel,"; + // we need to split the full name in order to push _set_ + // or _get_ in between the namespace and attribute name. - if (be_global->gen_direct_collocation ()) + //determine the correct namespace + ACE_CString nspace (d->full_name ()); + ACE_String_Base_Const::size_type const pos = nspace.rfind(':'); + nspace = nspace.substring(0, pos + 1); + + if (!d->is_abstract ()) { - *os << " &" - << derived_interface->full_direct_proxy_impl_name () - << "::_get_" << d->local_name (); + *os << "_get_" << d->original_local_name () << ",&POA_" + << nspace.c_str () << "_get_" + << d->original_local_name () << "_skel,"; + + if (be_global->gen_direct_collocation ()) + { + *os << " &" + << this->full_direct_proxy_impl_name () + << "::_get_" << d->local_name (); + } + else + { + *os << " 0"; + } } else { - *os << " 0"; + *os << "_get_" << d->original_local_name () << ",&" + << full_skeleton_name << "::_get_" + << d->original_local_name () << "_skel,"; + + if (be_global->gen_direct_collocation ()) + { + *os << " &" + << derived_interface->full_direct_proxy_impl_name () + << "::_get_" << d->local_name (); + } + else + { + *os << " 0"; + } } *os << "\n"; @@ -1555,20 +1632,41 @@ be_interface::gen_optable_entries (be_interface *derived_interface, if (!attr->readonly ()) { - // The set method - *os << "_set_" << d->original_local_name () << ",&" - << full_skeleton_name << "::_set_" - << d->local_name () << "_skel,"; - - if (be_global->gen_direct_collocation ()) + if (!d->is_abstract ()) { - *os << " &" - << derived_interface->full_direct_proxy_impl_name () - << "::_set_" << d->local_name (); + // The set method + *os << "_set_" << d->original_local_name () << ",&POA_" + << nspace.c_str () << "_set_" + << d->original_local_name () << "_skel,"; + + if (be_global->gen_direct_collocation ()) + { + *os << " &" + << this->full_direct_proxy_impl_name () + << "::_set_" << d->local_name (); + } + else + { + *os << " 0"; + } } else { - *os << " 0"; + // The set method in case abstract + *os << "_set_" << d->original_local_name () << ",&" + << full_skeleton_name << "::_set_" + << d->original_local_name () << "_skel,"; + + if (be_global->gen_direct_collocation ()) + { + *os << " &" + << derived_interface->full_direct_proxy_impl_name () + << "::_set_" << d->local_name (); + } + else + { + *os << " 0"; + } } *os << "\n"; @@ -2256,205 +2354,6 @@ be_interface::is_a_helper (be_interface * /*derived*/, } int -be_interface::gen_skel_helper (be_interface *derived, - be_interface *ancestor, - TAO_OutStream *os) -{ - // If derived and ancestor are same, skip it. - if (derived == ancestor) - { - return 0; - } - - // If an operation or an attribute is abstract (declared in an - // abstract interface), we will either generate the full - // definition (if there are no concrete interfaces between the - // abstract ancestor and us) or, if there is a concrete ancestor - // in between, we will catch its definition elsewhere in this - // traversal. - if (ancestor->is_abstract ()) - { - return 0; - } - - // Else generate code that does the cast to the appropriate type. - - if (ancestor->nmembers () > 0) - { - // If there are elements in ancestor scope i.e., any operations and - // attributes defined by "ancestor", become methods on the derived - // class which call the corresponding method of the base class by - // doing the proper casting. - for (UTL_ScopeActiveIterator si (ancestor, UTL_Scope::IK_decls); - !si.is_done (); - si.next ()) - { - // Get the next AST decl node - AST_Decl *d = si.item (); - AST_Decl::NodeType nt = d->node_type (); - - if (nt == AST_Decl::NT_op) - { - be_operation *op = - be_operation::narrow_from_decl (d); - - /// These are not generated on the server side. - if (op->is_sendc_ami ()) - { - continue; - } - - *os << be_nl_2 - << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__ - << be_nl_2; - - if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR) - { - // Generate the static method corresponding to this method. - *os << "static void" << be_nl - << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &server_request," << be_nl - << "TAO::Portable_Server::Servant_Upcall *servant_upcall," << be_nl - << "void *servant);" << be_uidt - << be_uidt; - } - else - { // Generate code in the inline file. - // Generate the static method corresponding to this method. - *os << "ACE_INLINE" << be_nl - << "void" << be_nl - << derived->full_skel_name () << "::" - << d->local_name () - << "_skel (" << be_idt_nl - << "TAO_ServerRequest &server_request," << be_nl - << "TAO::Portable_Server::Servant_Upcall *servant_upcall," << be_nl - << "void *servant)" - << be_uidt_nl - << "{" << be_idt_nl; - - *os << ancestor->full_skel_name () - << " * const impl =" << be_idt_nl - << "static_cast<" - << derived->full_skel_name () - << " *> (servant);" << be_uidt_nl; - - *os << ancestor->full_skel_name () - << "::" << d->local_name () - << "_skel (" << be_idt_nl - << "server_request," << be_nl - << "servant_upcall," << be_nl - << "impl);" << be_uidt - << be_uidt_nl - << "}"; - } - } - else if (nt == AST_Decl::NT_attr) - { - AST_Attribute *attr = AST_Attribute::narrow_from_decl (d); - - if (attr == 0) - { - return -1; - } - - *os << be_nl_2; - - if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR) - { - // Generate the static method corresponding to this method. - *os << "static void" << be_nl - << "_get_" << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &server_request," << be_nl - << "TAO::Portable_Server::Servant_Upcall *servant_upcall," << be_nl - << "void * servant);" << be_uidt - << be_uidt; - } - else - { // Generate code in the inline file. - // Generate the static method corresponding to this method. - *os << "ACE_INLINE" << be_nl - << "void" << be_nl - << derived->full_skel_name () << "::_get_" - << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &server_request," << be_nl - << "TAO::Portable_Server::Servant_Upcall *servant_upcall," << be_nl - << "void *servant)" << be_uidt - << be_uidt_nl - << "{" << be_idt_nl; - - *os << ancestor->full_skel_name () - << " * const impl = static_cast<" - << derived->full_skel_name () - << " *> (servant);" << be_nl; - - *os << ancestor->full_skel_name () - << "::_get_" << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "server_request," << be_nl - << "servant_upcall," << be_nl - << "impl);" << be_uidt - << be_uidt << be_uidt_nl - << "}"; - } - - if (!attr->readonly ()) - { - *os << be_nl_2; - - if (os->stream_type () == TAO_OutStream::TAO_SVR_HDR) - { - // Generate the static method corresponding to - // this method. - *os << "static void" << be_nl - << "_set_" << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &server_request," << be_nl - << "TAO::Portable_Server::Servant_Upcall *servant_upcall," << be_nl - << "void * servant);" << be_uidt - << be_uidt; - } - else - { // Generate code in the inline file. - // Generate the static method corresponding to - // this method. - *os << "ACE_INLINE" << be_nl - << "void" << be_nl - << derived->full_skel_name () - << "::_set_" << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest & server_request," << be_nl - << "TAO::Portable_Server::Servant_Upcall *servant_upcall," << be_nl - << "void * servant)" << be_uidt - << be_uidt_nl - << "{" << be_idt_nl; - - *os << ancestor->full_skel_name () - << " * const impl = static_cast<" - << derived->full_skel_name () - << " *> (servant);" << be_nl; - - *os << ancestor->full_skel_name () - << "::_set_" << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "server_request," << be_nl - << "servant_upcall," << be_nl - << "impl);" << be_uidt - << be_uidt << be_uidt_nl - << "}"; - } - } - } - } // End of FOR. - } - - return 0; -} - -int be_interface::gen_colloc_op_decl_helper (be_interface *derived, be_interface *ancestor, TAO_OutStream *os) diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp index 75d88932c39..9cd87e5a950 100644 --- a/TAO/TAO_IDL/be/be_produce.cpp +++ b/TAO/TAO_IDL/be/be_produce.cpp @@ -186,13 +186,6 @@ BE_produce (void) be_visitor_root_sh root_sh_visitor (&ctx); BE_visit_root (root_sh_visitor, "server header"); - if (be_global->gen_server_inline ()) - { - ctx.state (TAO_CodeGen::TAO_ROOT_SI); - be_visitor_root_si root_si_visitor (&ctx); - BE_visit_root (root_si_visitor, "server inline"); - } - if (be_global->gen_server_skeleton ()) { ctx.state (TAO_CodeGen::TAO_ROOT_SS); @@ -229,6 +222,14 @@ BE_produce (void) ctx.state (TAO_CodeGen::TAO_ROOT_SVS); be_visitor_root_svs root_svs_visitor (&ctx); BE_visit_root (root_svs_visitor, "CIAO servant source"); + + ctx.state (TAO_CodeGen::TAO_ROOT_SVTH); + be_visitor_root_svth root_svth_visitor (&ctx); + BE_visit_root (root_svth_visitor, "CIAO template servant header"); + + ctx.state (TAO_CodeGen::TAO_ROOT_SVTS); + be_visitor_root_svts root_svts_visitor (&ctx); + BE_visit_root (root_svts_visitor, "CIAO template servant source"); } if (be_global->gen_ciao_exec_idl ()) diff --git a/TAO/TAO_IDL/be/be_provides.cpp b/TAO/TAO_IDL/be/be_provides.cpp index 5c788a3ee39..938c66559b4 100644 --- a/TAO/TAO_IDL/be/be_provides.cpp +++ b/TAO/TAO_IDL/be/be_provides.cpp @@ -47,19 +47,18 @@ be_provides::provides_type (void) const } int -be_provides::gen_facet_svnt_decl (TAO_OutStream &os) +be_provides::gen_facet_svnt_tmpl_decl (TAO_OutStream &os) { - be_type *impl = + be_type *impl = be_type::narrow_from_decl (this->provides_type ()); - if (impl->is_local () || impl->svnt_hdr_facet_gen ()) - { - return 0; - } + if (impl->is_local () || impl->svnt_hdr_facet_gen ()) + { + return 0; + } - // No '_cxx_' prefix> const char *lname = - impl->original_local_name ()->get_string (); + impl->local_name ()->get_string (); be_decl *scope = be_scope::narrow_from_scope (impl->defined_in ())->decl (); @@ -74,31 +73,22 @@ be_provides::gen_facet_svnt_decl (TAO_OutStream &os) << "namespace CIAO_FACET" << suffix.c_str () << be_nl << "{" << be_idt_nl; - const char *impl_name = "::CORBA::Object"; bool is_intf = impl->node_type () == AST_Decl::NT_interface; - if (is_intf) - { - impl_name = - be_interface::narrow_from_decl (impl)->full_skel_name (); - } - - os << "class " << lname << "_Servant" << be_idt_nl - << ": public virtual " << impl_name << be_uidt_nl - << "{" << be_nl + os << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl + << "class " << lname << "_Servant_T" << be_idt_nl + << ": public virtual ::CIAO::Facet_Servant_Base_T<BASE, EXEC, " + << "CONTEXT>" << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl; AST_Decl *s = ScopeAsDecl (impl->defined_in ()); ACE_CString sname_str (s->full_name ()); - const char *sname = sname_str.c_str (); - const char *global = (sname_str == "" ? "" : "::"); - os << lname << "_Servant (" << be_idt_nl - << global << sname << "::CCM_" - << lname << "_ptr executor," << be_nl + os << lname << "_Servant_T (" << be_idt_nl + << "typename EXEC::_ptr_type executor," << be_nl << "::Components::CCMContext_ptr ctx);" << be_uidt_nl << be_nl; - os << "virtual ~" << lname << "_Servant (void);"; + os << "virtual ~" << lname << "_Servant_T (void);"; if (is_intf) { @@ -124,20 +114,7 @@ be_provides::gen_facet_svnt_decl (TAO_OutStream &os) } } - os << be_nl_2 << "/// Get component implementation." << be_nl - << "virtual CORBA::Object_ptr _get_component (void);" - << be_uidt_nl << be_nl; - - os << "protected:" << be_idt_nl; - - os << "/// Facet executor." << be_nl - << global << sname << "::CCM_" - << lname << "_var executor_;" << be_nl_2; - - os << "/// Context object." << be_nl - << "::Components::CCMContext_var ctx_;" << be_uidt_nl; - - os << "};" << be_nl << be_uidt_nl; + os << be_uidt_nl << "};" << be_nl << be_uidt_nl; os << "}"; @@ -146,7 +123,7 @@ be_provides::gen_facet_svnt_decl (TAO_OutStream &os) } int -be_provides::gen_facet_svnt_defn (TAO_OutStream &os) +be_provides::gen_facet_svnt_tmpl_defn (TAO_OutStream &os) { be_type *impl = be_type::narrow_from_decl (this->provides_type ()); @@ -156,16 +133,14 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os) return 0; } - // No '_cxx_' prefix. const char *lname = - impl->original_local_name ()->get_string (); + impl->local_name ()->get_string (); be_decl *scope = be_scope::narrow_from_scope (impl->defined_in ())->decl (); ACE_CString sname_str (scope->full_name ()); - const char *sname = sname_str.c_str (); const char *global = (sname_str == "" ? "" : "::"); ACE_CString suffix (scope->flat_name ()); @@ -179,22 +154,20 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os) << "namespace CIAO_FACET" << suffix.c_str () << be_nl << "{" << be_idt_nl; - os << lname << "_Servant::" - << lname << "_Servant (" << be_idt << be_idt_nl - << global << sname << "::CCM_" - << lname << "_ptr executor," << be_nl + os << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl + << lname << "_Servant_T<BASE, EXEC, CONTEXT>::" + << lname << "_Servant_T (" << be_idt << be_idt_nl + << "typename EXEC::_ptr_type executor," << be_nl << "::Components::CCMContext_ptr ctx)" << be_uidt_nl - << ": executor_ ( " << global << sname - << "::CCM_" << lname - << "::_duplicate (executor))," << be_idt_nl - << "ctx_ ( ::Components::CCMContext::_duplicate (ctx))" - << be_uidt << be_uidt_nl + << ": " << global << "CIAO::Facet_Servant_Base_T<BASE, EXEC, " + << "CONTEXT> (executor, ctx)" + << be_uidt_nl << "{" << be_nl << "}"; - os << be_nl_2 - << lname << "_Servant::~" - << lname << "_Servant (void)" << be_nl + os << be_nl_2 << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl + << lname << "_Servant_T<BASE, EXEC, CONTEXT>::~" + << lname << "_Servant_T (void)" << be_nl << "{" << be_nl << "}"; @@ -233,35 +206,7 @@ be_provides::gen_facet_svnt_defn (TAO_OutStream &os) } } - os << be_nl_2 - << "::CORBA::Object_ptr" << be_nl - << lname << "_Servant::_get_component (void)" - << be_nl - << "{" << be_idt_nl - << "::Components::" << be_global->ciao_container_type () - << "Context_var sc =" << be_idt_nl - << "::Components::" << be_global->ciao_container_type () - << "Context::_narrow (this->ctx_.in ());" - << be_uidt_nl << be_nl - << "if (! ::CORBA::is_nil (sc.in ()))" << be_idt_nl - << "{" << be_idt_nl; - - if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0) - { - os << "return sc->get_CCM_object ();"; - } - else - { - os << "return ::CORBA::Object::_nil ();"; - } - - os << be_uidt_nl << "}" << be_uidt_nl << be_nl; - - os << "throw ::CORBA::INTERNAL ();" << be_uidt_nl - << "}"; - - os << be_uidt_nl - << "}"; + os << be_uidt_nl << "}"; impl->svnt_src_facet_gen (true); return 0; @@ -304,7 +249,7 @@ be_facet_op_attr_defn_helper::emit (be_interface * /* derived_interface */, be_visitor_context ctx; ctx.stream (os); - ctx.state (TAO_CodeGen::TAO_ROOT_SVS); + ctx.state (TAO_CodeGen::TAO_ROOT_SVTS); for (UTL_ScopeActiveIterator i (base_interface, UTL_Scope::IK_decls); !i.is_done (); diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp index 0e5f7269162..4c5f786e8a1 100644 --- a/TAO/TAO_IDL/be/be_util.cpp +++ b/TAO/TAO_IDL/be/be_util.cpp @@ -858,16 +858,11 @@ be_util::usage (void) ACE_DEBUG (( LM_DEBUG, ACE_TEXT (" -SS\t\t\tsuppress generating skeleton implementation") - ACE_TEXT (" and inline file (disabled by default)\n") - )); - ACE_DEBUG (( - LM_DEBUG, - ACE_TEXT (" -Sci\t\t\tsuppress generating client inline file") ACE_TEXT (" (disabled by default)\n") )); ACE_DEBUG (( LM_DEBUG, - ACE_TEXT (" -Ssi\t\t\tsuppress generating server inline file") + ACE_TEXT (" -Sci\t\t\tsuppress generating client inline file") ACE_TEXT (" (disabled by default)\n") )); ACE_DEBUG (( diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp index 36e5969b365..db8b57209f1 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp @@ -171,12 +171,14 @@ be_visitor_attribute::visit_attribute (be_attribute *node) status = get_op.accept (&visitor); break; } + case TAO_CodeGen::TAO_ROOT_SVTH: case TAO_CodeGen::TAO_ROOT_SVH: { be_visitor_operation_ch visitor (&ctx); status = get_op.accept (&visitor); break; } + case TAO_CodeGen::TAO_ROOT_SVTS: case TAO_CodeGen::TAO_ROOT_SVS: { be_visitor_operation_svs visitor (&ctx); @@ -340,12 +342,14 @@ be_visitor_attribute::visit_attribute (be_attribute *node) status = set_op.accept (&visitor); break; } + case TAO_CodeGen::TAO_ROOT_SVTH: case TAO_CodeGen::TAO_ROOT_SVH: { be_visitor_operation_ch visitor (&ctx); status = set_op.accept (&visitor); break; } + case TAO_CodeGen::TAO_ROOT_SVTS: case TAO_CodeGen::TAO_ROOT_SVS: { be_visitor_operation_svs visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_component.cpp b/TAO/TAO_IDL/be/be_visitor_component.cpp index a1e66d0c267..ac735c69cb9 100644 --- a/TAO/TAO_IDL/be/be_visitor_component.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component.cpp @@ -66,11 +66,11 @@ #include "be_visitor_component/component.cpp" #include "be_visitor_component/component_svh.cpp" -#include "be_visitor_component/facet_svh.cpp" +#include "be_visitor_component/facet_svth.cpp" #include "be_visitor_component/context_svh.cpp" #include "be_visitor_component/servant_svh.cpp" #include "be_visitor_component/component_svs.cpp" -#include "be_visitor_component/facet_svs.cpp" +#include "be_visitor_component/facet_svts.cpp" #include "be_visitor_component/context_svs.cpp" #include "be_visitor_component/servant_svs.cpp" #include "be_visitor_component/component_ex_idl.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_component/component.cpp b/TAO/TAO_IDL/be/be_visitor_component/component.cpp index 204ff9b79ad..3e1d2b5ddf2 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component.cpp @@ -117,7 +117,6 @@ be_visitor_component::visit_operation (be_operation *node) case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: case TAO_CodeGen::TAO_ROOT_CDR_OP_CS: case TAO_CodeGen::TAO_ROOT_CI: - case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SVH: case TAO_CodeGen::TAO_ROOT_SVS: case TAO_CodeGen::TAO_ROOT_EXH: @@ -277,10 +276,11 @@ be_visitor_component::visit_typedef (be_typedef *node) case TAO_CodeGen::TAO_ROOT_SH: case TAO_CodeGen::TAO_ROOT_IH: case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SS: case TAO_CodeGen::TAO_ROOT_SVH: case TAO_CodeGen::TAO_ROOT_SVS: + case TAO_CodeGen::TAO_ROOT_SVTH: + case TAO_CodeGen::TAO_ROOT_SVTS: case TAO_CodeGen::TAO_ROOT_EXH: case TAO_CodeGen::TAO_ROOT_EXS: case TAO_CodeGen::TAO_ROOT_CNH: diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp index 1764e19a800..b6a57eaacd2 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp @@ -47,18 +47,6 @@ be_visitor_component_svh::visit_component (be_component *node) /// code generation. node->scan (node); - // Generate the facet servant class declaration. - be_visitor_facet_svh facet_visitor (this->ctx_); - - if (facet_visitor.visit_component_scope (node) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_component_svh::") - ACE_TEXT ("visit_component - ") - ACE_TEXT ("facet visitor failed\n")), - -1); - } - /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl_2 diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp index 5e098aa39fa..3248f0e7a88 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp @@ -43,17 +43,6 @@ be_visitor_component_svs::visit_component (be_component *node) return 0; } - be_visitor_facet_svs facet_visitor (this->ctx_); - - if (facet_visitor.visit_component_scope (node) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_component_svs::") - ACE_TEXT ("visit_component - ") - ACE_TEXT ("facet visitor failed\n")), - -1); - } - /// CIDL-generated namespace used 'CIDL_' + composition name. /// Now we use 'CIAO_' + component's flat name. os_ << be_nl_2 diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp index 287ee04e09d..a9edd6fa9dc 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp @@ -224,6 +224,7 @@ be_visitor_executor_exh::visit_component (be_component *node) return 0; } + int be_visitor_executor_exh::visit_provides (be_provides *node) { diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svth.cpp index 4f279b95e07..415252bd064 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svth.cpp @@ -13,28 +13,40 @@ */ //============================================================================= -be_visitor_facet_svh::be_visitor_facet_svh (be_visitor_context *ctx) +be_visitor_facet_svth::be_visitor_facet_svth (be_visitor_context *ctx) : be_visitor_component_scope (ctx) { } -be_visitor_facet_svh::~be_visitor_facet_svh (void) +be_visitor_facet_svth::~be_visitor_facet_svth (void) { } int -be_visitor_facet_svh::visit_provides (be_provides *node) +be_visitor_facet_svth::visit_provides (be_provides *node) { - if (node->gen_facet_svnt_decl (os_) == -1) + if (node->gen_facet_svnt_tmpl_decl (os_) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_facet_svh") + ACE_TEXT ("be_visitor_facet_svth") ACE_TEXT ("::visit_provides - ") ACE_TEXT ("gen_facet_svnt_decl() ") ACE_TEXT ("failed\n")), -1); } + return 0; +} + +int +be_visitor_facet_svth::visit_component (be_component *node) +{ + this->visit_component_scope (node); return 0; } +int +be_visitor_facet_svth::visit_connector (be_connector *node) +{ + return this->visit_component (node); +} diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svts.cpp index c9127923226..abfa8b3310f 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svts.cpp @@ -13,28 +13,41 @@ */ //============================================================================= -be_visitor_facet_svs::be_visitor_facet_svs (be_visitor_context *ctx) +be_visitor_facet_svts::be_visitor_facet_svts (be_visitor_context *ctx) : be_visitor_component_scope (ctx) { } -be_visitor_facet_svs::~be_visitor_facet_svs (void) +be_visitor_facet_svts::~be_visitor_facet_svts (void) { } int -be_visitor_facet_svs::visit_provides (be_provides *node) +be_visitor_facet_svts::visit_provides (be_provides *node) { - if (node->gen_facet_svnt_defn (os_) == -1) + if (node->gen_facet_svnt_tmpl_defn (os_) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_facet_svs") + ACE_TEXT ("be_visitor_facet_svts") ACE_TEXT ("::visit_provides - ") ACE_TEXT ("gen_facet_svnt_defn() ") ACE_TEXT ("failed\n")), -1); } + return 0; +} +int +be_visitor_facet_svts::visit_component (be_component *node) +{ + this->visit_component_scope (node); return 0; } +int +be_visitor_facet_svts::visit_connector (be_connector *node) +{ + return this->visit_component (node); +} + + diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp index 0709be18cd0..315309b808e 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -140,6 +140,7 @@ be_visitor_servant_svh::visit_attribute (be_attribute *node) return v.visit_attribute (node); } + int be_visitor_servant_svh::visit_provides (be_provides *node) { diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp index 5778857cf35..d86de6b4ae1 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file servant_svs.cpp @@ -12,6 +11,7 @@ * @author Jeff Parsons */ //============================================================================= +#include <be_helper.h> be_visitor_servant_svs::be_visitor_servant_svs (be_visitor_context *ctx) : be_visitor_component_scope (ctx), @@ -308,15 +308,20 @@ be_visitor_servant_svs::visit_provides (be_provides *node) << "PortableServer::POA_var POA = cnt_safe->the_port_POA ();" << be_nl << "::CORBA::Object_var tmp =" << be_idt_nl << "this->get_facet_executor (\"" << port_name << "\");"<< be_uidt_nl << be_nl - << global << sname << "::CCM_" << lname << "_var tmp_var = "<< global << sname <<"::CCM_" << lname - << "::_narrow (tmp.in());" << be_nl - << "::CIAO_FACET" << prefix_connector - << scope->flat_name () << "::" << lname - << "_Servant *" << port_name << "_servant_impl = 0;" << be_nl + << global << sname << "::CCM_" << lname << "_var tmp_var = " << be_idt_nl + << global << sname <<"::CCM_" << lname + << "::_narrow (tmp.in());" << be_uidt_nl << be_nl + << "typedef " << global << "CIAO_FACET" << prefix_connector + << scope->flat_name () << "::" << obj->local_name () << "_Servant_T <" << be_idt_nl + << "POA_" << sname << global << obj->local_name () + << "," << be_nl << global << sname <<"::CCM_" << lname << "," << be_nl + << global << "Components::" << be_global->ciao_container_type () + << "Context>" << be_idt_nl << lname + << "_type;" << be_uidt_nl << be_uidt_nl + << lname << "_type *" << port_name << "_servant_impl = 0;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt_nl << port_name << "_servant_impl," << be_nl - << "::CIAO_FACET" << prefix_connector - << scope->flat_name () << "::" << lname << "_Servant (" << be_idt_nl + << lname << "_type (" << be_idt_nl << "tmp_var.in(), " << be_nl << "this->context_)," << be_uidt_nl << "CORBA::NO_MEMORY ());" << be_uidt_nl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp index 76d01092d19..b77d531b463 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp @@ -64,7 +64,6 @@ #include "be_visitor_interface/interface_cs.cpp" #include "be_visitor_interface/interface_sh.cpp" #include "be_visitor_interface/interface_ih.cpp" -#include "be_visitor_interface/interface_si.cpp" #include "be_visitor_interface/interface_ss.cpp" #include "be_visitor_interface/interface_is.cpp" #include "be_visitor_interface/interface_ex_idl.cpp" @@ -91,7 +90,6 @@ // AMH #include "be_visitor_interface/amh_ch.cpp" #include "be_visitor_interface/amh_ss.cpp" -#include "be_visitor_interface/amh_si.cpp" #include "be_visitor_interface/amh_sh.cpp" #include "be_visitor_interface/amh_rh_ss.cpp" #include "be_visitor_interface/amh_rh_sh.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index 5669387f388..4a969a016e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -118,7 +118,6 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) << be_nl << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl_2; - // Add the dispatch method. *os << "virtual void _dispatch (" << be_idt << be_idt_nl << "TAO_ServerRequest &req," << be_nl @@ -141,18 +140,6 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) -1); } - // Generate skeletons for operations of our base classes. These - // skeletons just cast the pointer to the appropriate type - // before invoking the call. - if (node->traverse_inheritance_graph (be_interface::gen_skel_helper, os) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_amh_interface_sh::" - "visit_interface - " - "inheritance graph traversal failed\n"), - -1); - } - *os << be_uidt_nl << "};"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp deleted file mode 100644 index a5d0febdfd8..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp +++ /dev/null @@ -1,233 +0,0 @@ -//============================================================================= -/** -* @file amh_si.cpp -* -* $Id$ -* -* Specialized interface visitor for AMH generates code that is -* specific to AMH interfaces. -* -* @author Jeff Parsons <j.parsons@vanderbilt.edu> -*/ -//============================================================================= - -be_visitor_amh_interface_si::be_visitor_amh_interface_si ( - be_visitor_context *ctx) - : be_visitor_interface_si (ctx) -{ -} - -be_visitor_amh_interface_si::~be_visitor_amh_interface_si (void) -{ -} - -int -be_visitor_amh_interface_si::visit_interface (be_interface *node) -{ - if (node->srv_inline_gen () || node->imported () || node->is_local ()) - { - return 0; - } - - // Do not generate AMH classes for any sort of implied IDL. - if (node->original_interface () != 0) - { - return 0; - } - - TAO_OutStream *os = this->ctx_->stream (); - - int status = - node->traverse_inheritance_graph ( - be_visitor_amh_interface_si::gen_skel_helper, os); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_amh_interface_si::" - "visit_interface - " - "inheritance graph traversal failed\n"), - -1); - } - - return 0; -} - -int -be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived, - be_interface *ancestor, - TAO_OutStream *os) -{ - // If derived and ancestor are same, skip it. - if (derived == ancestor) - { - return 0; - } - - // If an operation or an attribute is abstract (declared in an - // abstract interface), we will either generate the full - // definition (if there are no concrete interfaces between the - // abstract ancestor and us) or, if there is a concrete ancestor - // in between, we will catch its definition elsewhere in this - // traversal. - if (ancestor->is_abstract ()) - { - return 0; - } - - // Else generate code that does the cast to the appropriate type. - - if (ancestor->nmembers () > 0) - { - // If there are elements in ancestor scope i.e., any operations and - // attributes defined by "ancestor", become methods on the derived class - // which call the corresponding method of the base class by doing the - // proper casting. - - ACE_CString ancestor_name ("POA_"); - char *buf = 0; - ancestor->compute_full_name ("AMH_", "", buf); - ancestor_name += buf; - // buf was allocated by ACE_OS::strdup, so we need to use free instead - // of delete. - ACE_OS::free (buf); - buf = 0; - - const char *ancestor_amh_name = ancestor_name.fast_rep (); - - ACE_CString derived_name ("POA_"); - derived->compute_full_name ("AMH_", "", buf); - derived_name += buf; - // buf was allocated by ACE_OS::strdup, so we need to use free instead - // of delete. - ACE_OS::free (buf); - buf = 0; - - const char *derived_amh_name = derived_name.fast_rep (); - - for (UTL_ScopeActiveIterator si (ancestor, UTL_Scope::IK_decls); - !si.is_done (); - si.next ()) - { - // Get the next AST decl node - AST_Decl *d = si.item (); - AST_Decl::NodeType nt = d->node_type (); - - if (nt == AST_Decl::NT_op) - { - be_operation *op = - be_operation::narrow_from_decl (d); - - /// These implied IDL operations are for stub-side only. - if (op->is_sendc_ami ()) - { - continue; - } - - *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl - << "// " << __FILE__ << ":" << __LINE__; - - *os << be_nl_2; - - // Generate code in the inline file. - // Generate the static method corresponding to this method. - *os << "ACE_INLINE" << be_nl - << "void" << be_nl - << derived_amh_name << "::" - << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req," << be_nl - << "TAO::Portable_Server::Servant_Upcall *context," << be_nl - << "void * obj)" << be_uidt - << be_uidt_nl - << "{" << be_idt_nl; - *os << ancestor_amh_name - << "* const impl = static_cast<" - << derived_amh_name - << " *> (obj);" << be_nl; - *os << ancestor_amh_name - << "::" << d->local_name () - << "_skel (" << be_idt_nl - << "req," << be_nl - << "context," << be_nl - << "impl);" << be_uidt - << be_uidt_nl - << "}"; - } - else if (nt == AST_Decl::NT_attr) - { - be_attribute *attr = be_attribute::narrow_from_decl (d); - - if (attr == 0) - { - return -1; - } - - *os << be_nl_2; - - // Generate code in the inline file. - // Generate the static method corresponding to this method. - *os << "ACE_INLINE" << be_nl - << "void" << be_nl - << derived_amh_name << "::_get_" - << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req," << be_nl - << "TAO::Portable_Server::Servant_Upcall *context," << be_nl - << "void *obj)" << be_uidt - << be_uidt_nl - << "{" << be_idt_nl; - - *os << ancestor_amh_name - << "* const impl = static_cast<" - << derived_amh_name - << " *> (obj);" << be_nl; - - *os << ancestor_amh_name - << "::_get_" << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "req," << be_nl - << "context," << be_nl - << "impl);" << be_uidt - << be_uidt << be_uidt_nl - << "}"; - - if (!attr->readonly ()) - { - *os << be_nl_2; - - // Generate code in the inline file. - // Generate the static method corresponding to - // this method. - *os << "ACE_INLINE" << be_nl - << "void" << be_nl - << derived_amh_name - << "::_set_" << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "TAO_ServerRequest &req," << be_nl - << "TAO::Portable_Server::Servant_Upcall *context," << be_nl - << "void *obj)" << be_uidt - << be_uidt_nl - << "{" << be_idt_nl; - - *os << ancestor_amh_name - << "* const impl = static_cast<" - << derived_amh_name - << " *> (obj);" << be_nl; - - *os << ancestor_amh_name - << "::_set_" << d->local_name () - << "_skel (" << be_idt << be_idt_nl - << "req," << be_nl - << "context," << be_nl - << "impl);" << be_uidt - << be_uidt << be_uidt_nl - << "}"; - } - } - } // End of FOR - } - - return 0; -} - diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index 354ba93bd79..41d97645066 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -130,13 +130,6 @@ be_visitor_amh_interface_ss::dispatch_method (be_interface *node) << "}"; } -void -be_visitor_amh_interface_ss::generate_send_reply (TAO_OutStream * os) -{ - *os << be_nl_2 - << "server_request.tao_send_reply ();"; -} - int be_visitor_amh_interface_ss::generate_amh_classes (be_interface *) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp index 2881de3760a..345e80863bc 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp @@ -497,7 +497,6 @@ be_visitor_interface::visit_operation (be_operation *node) case TAO_CodeGen::TAO_ROOT_CDR_OP_CH: case TAO_CodeGen::TAO_ROOT_CDR_OP_CS: case TAO_CodeGen::TAO_ROOT_CI: - case TAO_CodeGen::TAO_ROOT_SI: return 0; // nothing to be done default: { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index d92fd0e666a..25018bb4a05 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -150,24 +150,6 @@ be_visitor_interface_sh::visit_interface (be_interface *node) -1); } - // Generate skeletons for operations of our base classes. These - // skeletons just cast the pointer to the appropriate type - // before invoking the call. - int const status = - node->traverse_inheritance_graph ( - be_interface::gen_skel_helper, - os); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_interface_sh::") - ACE_TEXT ("visit_interface - ") - ACE_TEXT ("inheritance graph ") - ACE_TEXT ("traversal failed\n")), - -1); - } - *os << be_uidt_nl << "};"; be_visitor_context ctx (*this->ctx_); diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp deleted file mode 100644 index 465650b6dc1..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp +++ /dev/null @@ -1,122 +0,0 @@ - -//============================================================================= -/** - * @file interface_si.cpp - * - * $Id$ - * - * Visitor generating code for Interfaces in the server inline file - * - * - * @author Aniruddha Gokhale - */ -//============================================================================= - -// ************************************************************************ -// Interface visitor for server inline -// ************************************************************************ - -be_visitor_interface_si::be_visitor_interface_si (be_visitor_context *ctx) - : be_visitor_interface (ctx) -{ -} - -be_visitor_interface_si::~be_visitor_interface_si (void) -{ -} - -int -be_visitor_interface_si::visit_interface (be_interface *node) -{ - if (node->srv_inline_gen () - || node->imported () - || node->is_local () - || node->is_abstract ()) - { - return 0; - } - - TAO_OutStream *os = this->ctx_->stream (); - - // Determine if we are in some form of a multiple inheritance. - int status = - node->traverse_inheritance_graph (be_interface::in_mult_inheritance_helper, - 0); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_interface_si::") - ACE_TEXT ("visit_interface ") - ACE_TEXT ("error determining mult ") - ACE_TEXT ("inheritance\n")), - -1); - } - - // Generate skeletons for operations of our base classes. These skeletons - // just cast the pointer to the appropriate type before invoking the - // call. Hence we generate these in the inline file. - status = node->traverse_inheritance_graph (be_interface::gen_skel_helper, - os); - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_interface_si::") - ACE_TEXT ("visit_interface - ") - ACE_TEXT ("codegen for base ") - ACE_TEXT ("class skeletons failed\n")), - -1); - } - - if (this->generate_amh_classes (node) == -1) - { - return -1; - } - - if (be_global->gen_direct_collocation ()) - { - status = - node->traverse_inheritance_graph ( - be_interface::gen_colloc_op_defn_helper, - os); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_interface_si::") - ACE_TEXT ("visit_interface - ") - ACE_TEXT ("codegen for collocated base ") - ACE_TEXT ("class skeletons failed\n")), - -1); - } - } - - return 0; -} - -int -be_visitor_interface_si::visit_component (be_component *node) -{ - return this->visit_interface (node); -} - -int -be_visitor_interface_si::visit_connector (be_connector *node) -{ - return this->visit_interface (node); -} - -int -be_visitor_interface_si::generate_amh_classes (be_interface *node) -{ - // We have to check for an abstract ancestor until AMH is integrated - // with abstract interfaces. If the node itself is abstract, this - // visitor would not be created. - if (be_global->gen_amh_classes () && !node->has_mixed_parentage ()) - { - be_visitor_amh_interface_si amh_intf (this->ctx_); - return amh_intf.visit_interface (node); - } - - return 0; -} diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index fb268f009ec..6528801c099 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -170,7 +170,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << be_nl_2; - // Generate code for the _is_a override. *os << be_nl_2 << "::CORBA::Boolean " << full_skel_name @@ -420,12 +419,6 @@ be_visitor_interface_ss::this_method (be_interface *node) } void -be_visitor_interface_ss::generate_send_reply (TAO_OutStream *) -{ - // no-op for regular interfaces -} - -void be_visitor_interface_ss::dispatch_method (be_interface *node) { TAO_OutStream *os = this->ctx_->stream (); diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp index 70965c24dc2..8402c983f6f 100644 --- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp +++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp @@ -289,12 +289,6 @@ be_visitor_module::visit_interface (be_interface *node) status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_ROOT_SI: - { - be_visitor_interface_si visitor (&ctx); - status = node->accept (&visitor); - break; - } case TAO_CodeGen::TAO_ROOT_SS: { be_visitor_interface_ss visitor (&ctx); @@ -353,6 +347,8 @@ be_visitor_module::visit_interface (be_interface *node) case TAO_CodeGen::TAO_ROOT_EXS: case TAO_CodeGen::TAO_ROOT_CNH: case TAO_CodeGen::TAO_ROOT_CNS: + case TAO_CodeGen::TAO_ROOT_SVTH: + case TAO_CodeGen::TAO_ROOT_SVTS: { // Nothing to be done for these cases. return 0; @@ -484,7 +480,6 @@ be_visitor_module::visit_valuebox (be_valuebox *node) break; } case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SS: { break; @@ -564,12 +559,6 @@ be_visitor_module::visit_valuetype (be_valuetype *node) status = node->accept (&visitor); break; } - case TAO_CodeGen::TAO_ROOT_SI: - { - be_visitor_valuetype_si visitor (&ctx); - status = node->accept (&visitor); - break; - } case TAO_CodeGen::TAO_ROOT_SS: { be_visitor_valuetype_ss visitor (&ctx); @@ -669,7 +658,6 @@ be_visitor_module::visit_component (be_component *node) case TAO_CodeGen::TAO_ROOT_ANY_OP_CH: case TAO_CodeGen::TAO_ROOT_ANY_OP_CS: case TAO_CodeGen::TAO_ROOT_SH: - case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SS: return this->visit_interface (node); @@ -679,6 +667,18 @@ be_visitor_module::visit_component (be_component *node) case TAO_CodeGen::TAO_ROOT_CNH: case TAO_CodeGen::TAO_ROOT_CNS: break; + case TAO_CodeGen::TAO_ROOT_SVTH: + { + be_visitor_facet_svth visitor (&ctx); + status = node->accept (&visitor); + break; + } + case TAO_CodeGen::TAO_ROOT_SVTS: + { + be_visitor_facet_svts visitor (&ctx); + status = node->accept (&visitor); + break; + } case TAO_CodeGen::TAO_ROOT_SVH: { be_visitor_component_svh visitor (&ctx); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp index 87c8d2009e7..604677bb249 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp @@ -138,7 +138,7 @@ be_visitor_amh_operation_sh::generate_shared_prologue ( << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &_tao_req," << be_nl << "TAO::Portable_Server::Servant_Upcall *_tao_obj," << be_nl - << "void *_tao_servant_upcall" + << "TAO_ServantBase *_tao_servant_upcall" << ");" << be_uidt_nl << be_uidt_nl; // We need the interface node in which this operation was defined. However, diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp index 5cf5ca397cc..0df2834e727 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp @@ -337,7 +337,7 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & _tao_server_request," << be_nl << "TAO::Portable_Server::Servant_Upcall * /* context */," << be_nl - << "void * _tao_servant)" << be_uidt + << "TAO_ServantBase * _tao_servant)" << be_uidt << be_uidt_nl; // Generate the actual code for the skeleton. @@ -346,7 +346,7 @@ be_visitor_amh_operation_ss::generate_shared_prologue (be_decl *node, // Get the right object implementation. *os << amh_skel_name.c_str () << " * const _tao_impl =" << be_idt_nl - << "static_cast<" << amh_skel_name.c_str () << " *> (" + << "dynamic_cast<" << amh_skel_name.c_str () << " *> (" << "_tao_servant" << ");" << be_uidt_nl; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp index a731cbb4430..034344a7d96 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp @@ -109,7 +109,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node) << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest &server_request," << be_nl << "TAO::Portable_Server::Servant_Upcall *servant_upcall," << be_nl - << "void * servant);" << be_uidt + << "TAO_ServantBase *servant);" << be_uidt << be_uidt; } diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index 5052df4253a..80a6ff9a21b 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -192,7 +192,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node, << "_skel (" << be_idt << be_idt_nl << "TAO_ServerRequest & server_request," << be_nl << "TAO::Portable_Server::Servant_Upcall *TAO_INTERCEPTOR (servant_upcall)," << be_nl - << "void * servant)" << be_uidt << be_uidt_nl; + << "TAO_ServantBase *servant)" << be_uidt << be_uidt_nl; // Generate the actual code for the skeleton. However, if any of the // argument types is "native", we do not generate any skeleton @@ -246,7 +246,7 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node, // Get the right object implementation. *os << intf->full_skel_name () << " * const impl =" << be_idt_nl - << "static_cast<" + << "dynamic_cast<" << intf->full_skel_name () << " *> (servant);" << be_uidt << be_uidt_nl; // Upcall_Command instantiation. diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp index 68084dc7420..4b6d36e3524 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp @@ -11,6 +11,7 @@ * @author Jeff Parsons */ //============================================================================= +#include <be_visitor_operation/operation_svs.h> be_visitor_operation_svs::be_visitor_operation_svs ( be_visitor_context *ctx) @@ -30,6 +31,12 @@ be_visitor_operation_svs::visit_operation (be_operation *node) os_ << be_nl_2; + + if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SVTS) + { + os_ << "template <typename BASE, typename EXEC, typename CONTEXT>" + << be_nl; + } // Retrieve the operation return type. be_type *bt = be_type::narrow_from_decl (node->return_type ()); @@ -56,9 +63,19 @@ be_visitor_operation_svs::visit_operation (be_operation *node) } // Generate the operation name, avoiding possible _cxx_ prefix. - os_ << be_nl - << scope_->original_local_name ()->get_string () - << "_Servant"; + // USE STATE con the context!!!!!!! + if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SVTS) + { + os_ << be_nl + << scope_->original_local_name ()->get_string () + << "_Servant_T<BASE, EXEC, CONTEXT>"; + } + else + { + os_ << be_nl + << scope_->original_local_name ()->get_string () + << "_Servant"; + } os_ << "::" << node->local_name (); diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp index 92456f48d4a..046c3c67913 100644 --- a/TAO/TAO_IDL/be/be_visitor_root.cpp +++ b/TAO/TAO_IDL/be/be_visitor_root.cpp @@ -67,13 +67,14 @@ #include "be_visitor_root/root_ci.cpp" #include "be_visitor_root/root_cs.cpp" #include "be_visitor_root/root_sh.cpp" -#include "be_visitor_root/root_si.cpp" #include "be_visitor_root/root_ss.cpp" #include "be_visitor_root/root_sth.cpp" #include "be_visitor_root/root_is.cpp" #include "be_visitor_root/root_ih.cpp" #include "be_visitor_root/root_svh.cpp" #include "be_visitor_root/root_svs.cpp" +#include "be_visitor_root/root_svth.cpp" +#include "be_visitor_root/root_svts.cpp" #include "be_visitor_root/root_ex_idl.cpp" #include "be_visitor_root/root_exh.cpp" #include "be_visitor_root/root_exs.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp deleted file mode 100644 index 35b082bc11b..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp +++ /dev/null @@ -1,71 +0,0 @@ - -//============================================================================= -/** - * @file root_si.cpp - * - * $Id$ - * - * Visitor generating code for the Root in the server inline file - * - * - * @author Aniruddha Gokhale - */ -//============================================================================= - -// *********************************************** -// Root visitor for server inline -// *********************************************** - -be_visitor_root_si::be_visitor_root_si (be_visitor_context *ctx) - : be_visitor_root (ctx) -{ -} - -be_visitor_root_si::~be_visitor_root_si (void) -{ -} - -int -be_visitor_root_si::visit_root (be_root *node) -{ - if (this->init () == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_root_si::init - ") - ACE_TEXT ("failed to initialize\n")), - -1); - } - - if (this->visit_scope (node) == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_root_si::visit_root - ") - ACE_TEXT ("codegen for scope failed\n")), - -1); - } - - (void) tao_cg->end_server_inline (); - - return 0; -} - -int -be_visitor_root_si::init (void) -{ - /// First open the server-side file for writing - int status = - tao_cg->start_server_inline ( - be_global->be_get_server_inline_fname ()); - - if (status == -1) - { - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("be_visitor_root_si::init - ") - ACE_TEXT ("Error opening server inline file\n")), - -1); - } - - /// Initialize the stream. - this->ctx_->stream (tao_cg->server_inline ()); - return 0; -} diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp new file mode 100644 index 00000000000..c4b4a10e963 --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp @@ -0,0 +1,73 @@ + +//============================================================================= +/** + * @file root_svth.cpp + * + * $Id$ + * + * Visitor generating code for Root in the CIAO template servant header + * + * + * @author Marcel Smit + */ +//============================================================================= + +// ******************************** +// Root visitor for CIAO template servant header +// ******************************** + +be_visitor_root_svth::be_visitor_root_svth (be_visitor_context *ctx) + : be_visitor_root (ctx) +{ +} + +be_visitor_root_svth::~be_visitor_root_svth (void) +{ +} + +int +be_visitor_root_svth::visit_root (be_root *node) +{ + if (this->init () == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_root_svth::init - ") + ACE_TEXT ("failed to initialize\n")), + -1); + } + + if (this->visit_scope (node) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_root_svth::visit_root - ") + ACE_TEXT ("codegen for scope failed\n")), + -1); + } + + (void) tao_cg->end_ciao_svnt_template_header (); + + return 0; +} + +int +be_visitor_root_svth::init (void) +{ + /// First open the file for writing. + int status = + tao_cg->start_ciao_svnt_template_header ( + be_global->be_get_ciao_tmpl_svnt_hdr_fname ()); + + if (status == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_root_svth::init - ") + ACE_TEXT ("Error opening CIAO servant ") + ACE_TEXT ("header file\n")), + -1); + } + + /// Initialize the stream. + this->ctx_->stream (tao_cg->ciao_svnt_template_header ()); + + return 0; +} diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp new file mode 100644 index 00000000000..cfe25bf2e18 --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_root/root_svts.cpp @@ -0,0 +1,73 @@ + +//============================================================================= +/** + * @file root_svts.cpp + * + * $Id$ + * + * Visitor generating code for Root in the CIAO template servant source + * + * + * @author Marcel Smit + */ +//============================================================================= + +// ******************************** +// Root visitor for CIAO template servant source +// ******************************** + +be_visitor_root_svts::be_visitor_root_svts (be_visitor_context *ctx) + : be_visitor_root (ctx) +{ +} + +be_visitor_root_svts::~be_visitor_root_svts (void) +{ +} + +int +be_visitor_root_svts::visit_root (be_root *node) +{ + if (this->init () == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_root_svts::init - ") + ACE_TEXT ("failed to initialize\n")), + -1); + } + + if (this->visit_scope (node) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_root_svts::visit_root - ") + ACE_TEXT ("codegen for scope failed\n")), + -1); + } + + (void) tao_cg->end_ciao_svnt_template_source (); + + return 0; +} + +int +be_visitor_root_svts::init (void) +{ + // First open the client-side header file for writing. + int status = + tao_cg->start_ciao_svnt_template_source ( + be_global->be_get_ciao_tmpl_svnt_src_fname ()); + + if (status == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_root_svts::init - ") + ACE_TEXT ("Error opening CIAO servant ") + ACE_TEXT ("source file\n")), + -1); + } + + // Initialize the stream. + this->ctx_->stream (tao_cg->ciao_svnt_template_source ()); + + return 0; +} diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp index a05039ae09b..0a9d72c2e74 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp @@ -69,7 +69,6 @@ #include "be_visitor_valuetype/valuetype_ci.cpp" #include "be_visitor_valuetype/valuetype_cs.cpp" #include "be_visitor_valuetype/valuetype_sh.cpp" -#include "be_visitor_valuetype/valuetype_si.cpp" #include "be_visitor_valuetype/valuetype_ss.cpp" #include "be_visitor_valuetype/valuetype_obv_ch.cpp" #include "be_visitor_valuetype/valuetype_obv_ci.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 09db8aea597..6d2559612db 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -193,7 +193,6 @@ be_visitor_valuetype::visit_constant (be_constant *node) case TAO_CodeGen::TAO_ROOT_SH: case TAO_CodeGen::TAO_ROOT_IH: case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SS: return 0; // Nothing to be done. default: @@ -268,7 +267,6 @@ be_visitor_valuetype::visit_enum (be_enum *node) case TAO_CodeGen::TAO_ROOT_SH: case TAO_CodeGen::TAO_ROOT_IH: case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SS: return 0; // Nothing to be done. default: @@ -515,7 +513,6 @@ be_visitor_valuetype::visit_union (be_union *node) case TAO_CodeGen::TAO_ROOT_SH: case TAO_CodeGen::TAO_ROOT_IH: case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SS: return 0; // Nothing to be done. default: @@ -630,7 +627,6 @@ be_visitor_valuetype::visit_typedef (be_typedef *node) case TAO_CodeGen::TAO_ROOT_SH: case TAO_CodeGen::TAO_ROOT_IH: case TAO_CodeGen::TAO_ROOT_IS: - case TAO_CodeGen::TAO_ROOT_SI: case TAO_CodeGen::TAO_ROOT_SS: return 0; // Nothing to be done. default: diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp deleted file mode 100644 index 7b49825afb5..00000000000 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp +++ /dev/null @@ -1,41 +0,0 @@ - -//============================================================================= -/** - * @file valuetype_si.cpp - * - * $Id$ - * - * Visitor generating code for Interfaces in the server inline file - * - * - * @author Jeff Parsons - */ -//============================================================================= - - -// ************************************************************************ -// Valuetype visitor for server inline -// ************************************************************************ - -be_visitor_valuetype_si::be_visitor_valuetype_si (be_visitor_context *ctx) - : be_visitor_valuetype (ctx) -{ -} - -be_visitor_valuetype_si::~be_visitor_valuetype_si (void) -{ -} - -int -be_visitor_valuetype_si::visit_valuetype (be_valuetype *) -{ - // Nothing needed for now, but the visitor is here just in case. - return 0; -} - -int -be_visitor_valuetype_si::visit_eventtype (be_eventtype *node) -{ - return this->visit_valuetype (node); -} - diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index b0611b2bb8a..03f7442c765 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -119,7 +119,6 @@ public: TAO_ROOT_CI, TAO_ROOT_CS, TAO_ROOT_SH, - TAO_ROOT_SI, TAO_ROOT_SS, TAO_ROOT_TIE_SH, TAO_ROOT_TIE_SS, @@ -127,6 +126,8 @@ public: TAO_ROOT_IS, TAO_ROOT_SVH, TAO_ROOT_SVS, + TAO_ROOT_SVTH, + TAO_ROOT_SVTS, TAO_ROOT_EXH, TAO_ROOT_EXS, TAO_ROOT_CNH, @@ -226,9 +227,6 @@ public: /// Set the server template header stream. int start_server_template_header (const char *fname); - /// Set the server inline stream. - int start_server_inline (const char *fname); - /// Set the server skeletons stream. int start_server_skeletons (const char *fname); @@ -243,6 +241,8 @@ public: int start_ciao_svnt_header (const char *fname); int start_ciao_svnt_source (const char *fname); + int start_ciao_svnt_template_header (const char *fname); + int start_ciao_svnt_template_source (const char *fname); int start_ciao_exec_header (const char *fname); int start_ciao_exec_source (const char *fname); int start_ciao_exec_idl (const char *fname); @@ -263,9 +263,6 @@ public: /// Put a last #endif in the server header. int end_server_header (void); - /// Generate necessary code at end of server inline file. - void end_server_inline (void); - /// Put a last #endif in the server header. int end_implementation_header (const char *fname); @@ -289,6 +286,8 @@ public: int end_ciao_svnt_header (void); int end_ciao_svnt_source (void); + int end_ciao_svnt_template_header (void); + int end_ciao_svnt_template_source (void); int end_ciao_exec_header (void); int end_ciao_exec_source (void); int end_ciao_exec_idl (void); @@ -323,9 +322,6 @@ public: /// Get the server template skeletons stream. TAO_OutStream *server_template_skeletons (void); - /// Get the server inline stream. - TAO_OutStream *server_inline (void); - /// Get the server template inline stream. TAO_OutStream *server_template_inline (void); @@ -341,6 +337,12 @@ public: /// Get the CIAO servant source stream. TAO_OutStream *ciao_svnt_source (void); + /// Get the CIAO template servant header stream. + TAO_OutStream *ciao_svnt_template_header (void); + + /// Get the CIAO template servant source stream. + TAO_OutStream *ciao_svnt_template_source (void); + /// Get the CIAO executor impl header stream. TAO_OutStream *ciao_exec_header (void); @@ -417,8 +419,8 @@ private: void gen_typecode_includes (TAO_OutStream * stream); /// Used if one or both of the CIAO code gen flags are set. - void gen_svnt_hdr_includes (void); - void gen_svnt_src_includes (void); + void gen_svnt_hdr_includes (TAO_OutStream *stream); + void gen_svnt_src_includes (TAO_OutStream *stream); void gen_exec_hdr_includes (void); void gen_exec_src_includes (void); void gen_exec_idl_includes (void); @@ -463,9 +465,6 @@ private: /// Server skeleton template stream. TAO_OutStream *server_template_skeletons_; - /// Server side inline file. - TAO_OutStream *server_inline_; - /// Anyop header file. TAO_OutStream *anyop_header_; @@ -481,6 +480,12 @@ private: /// Component servant source file. TAO_OutStream *ciao_svnt_source_; + /// Template component servant header file. + TAO_OutStream *ciao_svnt_template_header_; + + /// Template component servant source file. + TAO_OutStream *ciao_svnt_template_source_; + /// Component executor impl header file. TAO_OutStream *ciao_exec_header_; diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h index 59e544b0f13..e65c4d30646 100644 --- a/TAO/TAO_IDL/be_include/be_global.h +++ b/TAO/TAO_IDL/be_include/be_global.h @@ -99,9 +99,6 @@ public: static const char *be_get_server_template_skeleton_fname ( bool base_name_only = false); - static const char *be_get_server_inline_fname ( - bool base_name_only = false); - static const char *be_get_anyop_source_fname ( bool base_name_only = false); @@ -111,9 +108,15 @@ public: static const char *be_get_ciao_svnt_hdr_fname ( bool base_name_only = false); + static const char *be_get_ciao_tmpl_svnt_hdr_fname ( + bool base_name_only=false); + static const char *be_get_ciao_svnt_src_fname ( bool base_name_only = false); + static const char *be_get_ciao_tmpl_svnt_src_fname ( + bool base_name_only=false); + static const char *be_get_ciao_exec_hdr_fname ( bool base_name_only = false); @@ -180,10 +183,6 @@ public: UTL_String *idl_file_name, bool base_name_only = false); - static const char *be_get_server_inline ( - UTL_String *idl_file_name, - bool base_name_only = false); - static const char *be_get_anyop_header ( UTL_String *idl_file_name, bool base_name_only = false); @@ -196,10 +195,18 @@ public: UTL_String *idl_file_name, bool base_name_only = false); + static const char *be_get_ciao_svnt_template_header ( + UTL_String *idl_file_name, + bool base_name_only = false); + static const char *be_get_ciao_svnt_source ( UTL_String *idl_file_name, bool base_name_only = false); + static const char *be_get_ciao_svnt_template_source ( + UTL_String *idl_file_name, + bool base_name_only = false); + static const char *be_get_ciao_exec_header ( UTL_String *idl_file_name, bool base_name_only = false); @@ -481,12 +488,6 @@ public: /// Get the server_template_skeleton_ending. const char* server_template_skeleton_ending (void) const; - /// Set the server_inline_ending. - void server_inline_ending (const char* s); - - /// Get the server_inline_ending. - const char* server_inline_ending (void) const; - /// Set the anyop_header_ending. void anyop_header_ending (const char* s); @@ -501,6 +502,12 @@ public: /// Similar to above, but for CIAO servant and executor /// impl and executor IDL files, if generated. + void ciao_svnt_header_template_ending (const char* s); + const char* ciao_svnt_header_template_ending (void) const; + + void ciao_svnt_source_template_ending (const char* s); + const char* ciao_svnt_source_template_ending (void) const; + void ciao_svnt_header_ending (const char* s); const char* ciao_svnt_header_ending (void) const; @@ -811,10 +818,6 @@ public: bool gen_client_inline (void) const; void gen_client_inline (bool val); - /// Accessors for the member gen_server_inline_. - bool gen_server_inline (void) const; - void gen_server_inline (bool val); - /// Accessors for the member gen_client_stub_. bool gen_client_stub (void) const; void gen_client_stub (bool val); @@ -981,15 +984,18 @@ private: /// "S_T.cpp". char* server_template_skeleton_ending_; - /// Server's inline file name ending. Default is "S.i". - char* server_inline_ending_; - /// Anyop header file name ending. Default is "A.h". char* anyop_hdr_ending_; /// Anyop source file name ending. Default is "A.cpp". char* anyop_src_ending_; + /// CIAO servant template header file name ending. Default is "_svnt_T.h". + char* ciao_svnt_hdr_template_ending_; + + /// CIAO servant template source file name ending. Default is "_svnt_T.cpp". + char* ciao_svnt_src_template_ending_; + /// CIAO servant header file name ending. Default is "_svnt.h". char* ciao_svnt_hdr_ending_; @@ -1182,10 +1188,6 @@ private: bool gen_client_inline_; /// True by default, but a command line option can turn this off so - /// that we don't generate a server inline file - bool gen_server_inline_; - - /// True by default, but a command line option can turn this off so /// that we don't generate a client stub file bool gen_client_stub_; diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index fa1938ef12a..a34083dc2af 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -110,6 +110,8 @@ public: TAO_GPERF_INPUT, CIAO_SVNT_HDR, CIAO_SVNT_IMPL, + CIAO_SVNT_T_HDR, + CIAO_SVNT_T_IMPL, CIAO_EXEC_HDR, CIAO_EXEC_IMPL, CIAO_EXEC_IDL, diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h index 4903fa9718a..a55c797cecf 100644 --- a/TAO/TAO_IDL/be_include/be_interface.h +++ b/TAO/TAO_IDL/be_include/be_interface.h @@ -186,12 +186,6 @@ public: TAO_OutStream *os); /// Helper method passed to the template method to generate code for the - /// skeletons in the header and inline files. - static int gen_skel_helper (be_interface *, - be_interface *, - TAO_OutStream *); - - /// Helper method passed to the template method to generate code for the /// collocated functions in the header file. static int gen_colloc_op_decl_helper (be_interface *derived, be_interface *ancestor, diff --git a/TAO/TAO_IDL/be_include/be_provides.h b/TAO/TAO_IDL/be_include/be_provides.h index 0effaf3ce33..6c32155c6b1 100644 --- a/TAO/TAO_IDL/be_include/be_provides.h +++ b/TAO/TAO_IDL/be_include/be_provides.h @@ -25,8 +25,8 @@ public: be_type *provides_type (void) const; // Common code called by visitors. - int gen_facet_svnt_decl (TAO_OutStream &os); - int gen_facet_svnt_defn (TAO_OutStream &os); + int gen_facet_svnt_tmpl_decl (TAO_OutStream &os); + int gen_facet_svnt_tmpl_defn (TAO_OutStream &os); // Narrowing. DEF_NARROW_FROM_DECL(be_provides); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component.h b/TAO/TAO_IDL/be_include/be_visitor_component.h index deb945c9eab..1fd4cfdf9b1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component.h @@ -21,11 +21,11 @@ #include "be_visitor_component/component.h" #include "be_visitor_component/component_svh.h" -#include "be_visitor_component/facet_svh.h" +#include "be_visitor_component/facet_svth.h" #include "be_visitor_component/context_svh.h" #include "be_visitor_component/servant_svh.h" #include "be_visitor_component/component_svs.h" -#include "be_visitor_component/facet_svs.h" +#include "be_visitor_component/facet_svts.h" #include "be_visitor_component/context_svs.h" #include "be_visitor_component/servant_svs.h" #include "be_visitor_component/component_ex_idl.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svth.h index 93d83b4eb57..a36bddc919e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svth.h @@ -18,20 +18,22 @@ #define _BE_COMPONENT_FACET_SVH_H_ /** - * @class be_visitor_facet_svh + * @class be_visitor_facet_svth * - * @brief be_visitor_facet_svh + * @brief be_visitor_facet_svth * * This is a concrete visitor to generate the facet servant decl * for a component. */ -class be_visitor_facet_svh : public be_visitor_component_scope +class be_visitor_facet_svth : public be_visitor_component_scope { public: - be_visitor_facet_svh (be_visitor_context *ctx); + be_visitor_facet_svth (be_visitor_context *ctx); - ~be_visitor_facet_svh (void); + ~be_visitor_facet_svth (void); + virtual int visit_connector (be_connector *node); + virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svts.h index 46658f60257..7e49904118e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svts.h @@ -18,20 +18,22 @@ #define _BE_COMPONENT_FACET_SVS_H_ /** - * @class be_visitor_facet_svs + * @class be_visitor_facet_svts * - * @brief be_visitor_facet_svs + * @brief be_visitor_facet_svts * * This is a concrete visitor to generate the facet servant defn * for a component. */ -class be_visitor_facet_svs : public be_visitor_component_scope +class be_visitor_facet_svts : public be_visitor_component_scope { public: - be_visitor_facet_svs (be_visitor_context *ctx); + be_visitor_facet_svts (be_visitor_context *ctx); - ~be_visitor_facet_svs (void); + ~be_visitor_facet_svts (void); + virtual int visit_connector (be_connector *node); + virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h index 740fa08dcae..a9334086554 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h @@ -27,7 +27,6 @@ #include "be_visitor_interface/interface_cs.h" #include "be_visitor_interface/interface_sh.h" #include "be_visitor_interface/interface_ih.h" -#include "be_visitor_interface/interface_si.h" #include "be_visitor_interface/interface_ss.h" #include "be_visitor_interface/interface_is.h" #include "be_visitor_interface/interface_ex_idl.h" @@ -54,7 +53,6 @@ // AMH #include "be_visitor_interface/amh_ch.h" #include "be_visitor_interface/amh_sh.h" -#include "be_visitor_interface/amh_si.h" #include "be_visitor_interface/amh_ss.h" #include "be_visitor_interface/amh_rh_sh.h" #include "be_visitor_interface/amh_rh_ss.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h deleted file mode 100644 index 77eb09dc377..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_si.h +++ /dev/null @@ -1,31 +0,0 @@ -//============================================================================= -/** - * @file amh_si.h - * - * $Id$ - * - * Specialized interface visitor for AMH - * - * @author Jeff Parsons <j.parsons@vanderbilt.edu> - */ -//============================================================================= - -#ifndef AMH_SH_I_ -#define AMH_SH_I_ - -class be_visitor_amh_interface_si : public be_visitor_interface_si -{ -public: - be_visitor_amh_interface_si (be_visitor_context *ctx); - ~be_visitor_amh_interface_si (void); - - int visit_interface (be_interface *node); - - // Helper method passed to the template method to generate code for the - // AMH skeletons in the inline files. - static int gen_skel_helper (be_interface *, - be_interface *, - TAO_OutStream *); -}; - -#endif /* AMH_SH_I_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h index c65578519df..d14fdf2ba03 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h @@ -31,8 +31,6 @@ protected: virtual void this_method (be_interface *node); virtual void dispatch_method (be_interface *node); - virtual void generate_send_reply (TAO_OutStream * os); - virtual int generate_amh_classes (be_interface *node); virtual int generate_proxy_classes (be_interface *node); // virtual int generate_downcast_implementation (be_interface *node, diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h deleted file mode 100644 index cbf85d0f780..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- c++ -*- */ -//============================================================================= -/** - * @file interface_si.h - * - * $Id$ - * - * Concrete visitor for the Interface node. - * This provides for code generation in the server inline - * - * - * @author Aniruddha Gokhale - */ -//============================================================================= - -#ifndef _BE_INTERFACE_INTERFACE_SI_H_ -#define _BE_INTERFACE_INTERFACE_SI_H_ - -/** - * @class be_visitor_interface_si - * - * @brief be_visitor_interface_si - * - * This is a concrete visitor to generate the server inline for interface - */ -class be_visitor_interface_si : public be_visitor_interface -{ -public: - be_visitor_interface_si (be_visitor_context *ctx); - ~be_visitor_interface_si (void); - - virtual int visit_interface (be_interface *node); - virtual int visit_component (be_component *node); - virtual int visit_connector (be_connector *node); - -protected: - virtual int generate_amh_classes (be_interface *node); -}; - -#endif /* _BE_INTERFACE_INTERFACE_SI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h index f86a68aa722..440aceef479 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h @@ -46,13 +46,6 @@ protected: virtual void this_method (be_interface *node); virtual void dispatch_method (be_interface *node); - // Some AMH skeletons must explicitly send the reply, for regular - // classes the following function is empty, for AMH code it - // generates the explicit call. - virtual void generate_send_reply (TAO_OutStream * os); - -/// virtual int generate_downcast_implementation (be_interface *node, -/// TAO_OutStream *os); virtual int generate_amh_classes (be_interface *node); virtual int generate_proxy_classes (be_interface *node); virtual int generate_copy_ctor (be_interface *node, diff --git a/TAO/TAO_IDL/be_include/be_visitor_root.h b/TAO/TAO_IDL/be_include/be_visitor_root.h index 7cd109881cb..03bb3e7722a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root.h @@ -24,13 +24,14 @@ #include "be_visitor_root/root_ci.h" #include "be_visitor_root/root_cs.h" #include "be_visitor_root/root_sh.h" -#include "be_visitor_root/root_si.h" #include "be_visitor_root/root_ss.h" #include "be_visitor_root/root_sth.h" #include "be_visitor_root/root_is.h" #include "be_visitor_root/root_ih.h" #include "be_visitor_root/root_svh.h" #include "be_visitor_root/root_svs.h" +#include "be_visitor_root/root_svth.h" +#include "be_visitor_root/root_svts.h" #include "be_visitor_root/root_ex_idl.h" #include "be_visitor_root/root_exh.h" #include "be_visitor_root/root_exs.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h deleted file mode 100644 index f89c54e951d..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- c++ -*- */ - -//============================================================================= -/** - * @file root_si.h - * - * $Id$ - * - * Concrete visitor for the Root class - * This one provides code generation for elements of the Root node in the - * server inline. - * - * - * @author Aniruddha Gokhale - */ -//============================================================================= - -#ifndef _BE_VISITOR_ROOT_ROOT_SI_H_ -#define _BE_VISITOR_ROOT_ROOT_SI_H_ - -/** - * @class be_visitor_root_si - * - * @brief be_visitor_root_si - * - * This is a concrete visitor to generate the server inline for root - */ -class be_visitor_root_si : public be_visitor_root -{ -public: - be_visitor_root_si (be_visitor_context *ctx); - - ~be_visitor_root_si (void); - - virtual int visit_root (be_root *node); - -private: - /// Open file and initialize stream. - int init (void); -}; - -#endif /* _BE_VISITOR_ROOT_ROOT_SI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h new file mode 100644 index 00000000000..8565fd86c7b --- /dev/null +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h @@ -0,0 +1,43 @@ +/* -*- c++ -*- */ + +//============================================================================= +/** + * @file root_svht.h + * + * $Id$ + * + * Concrete visitor for the Root class + * This one provides code generation for elements of the Root node in the + * CIAO servant header. + * + * + * @author Marcel Smit + */ +//============================================================================= + +#ifndef _BE_VISITOR_ROOT_ROOT_SVTH_H_ +#define _BE_VISITOR_ROOT_ROOT_SVTH_H_ + +/** + * @class be_visitor_root_svth + * + * @brief be_visitor_root_svth + * + * This is a concrete visitor to generate the CIAO template servant + * header for root + */ +class be_visitor_root_svth : public be_visitor_root +{ +public: + be_visitor_root_svth (be_visitor_context *ctx); + + ~be_visitor_root_svth (void); + + virtual int visit_root (be_root *node); + +private: + /// Open file and initialize stream. + int init (void); +}; + +#endif /* _BE_VISITOR_ROOT_ROOT_SVTH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h new file mode 100644 index 00000000000..28dcf4909a3 --- /dev/null +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h @@ -0,0 +1,43 @@ +/* -*- c++ -*- */ + +//============================================================================= +/** + * @file root_svts.h + * + * $Id$ + * + * Concrete visitor for the Root class + * This one provides code generation for elements of the Root node in the + * CIAO servant source. + * + * + * @author Marcel Smit + */ +//============================================================================= + +#ifndef _BE_VISITOR_ROOT_ROOT_SVTS_H_ +#define _BE_VISITOR_ROOT_ROOT_SVTS_H_ + +/** + * @class be_visitor_root_svts + * + * @brief be_visitor_root_svts + * + * This is a concrete visitor to generate the CIAO template servant + * source for root + */ +class be_visitor_root_svts : public be_visitor_root +{ +public: + be_visitor_root_svts (be_visitor_context *ctx); + + ~be_visitor_root_svts (void); + + virtual int visit_root (be_root *node); + +private: + /// Set the right context and make a visitor. + int init (void); +}; + +#endif /* _BE_VISITOR_ROOT_ROOT_SVTS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype.h index d2b8edfb80e..a8a73cc1846 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype.h @@ -26,7 +26,6 @@ #include "be_visitor_valuetype/valuetype_ci.h" #include "be_visitor_valuetype/valuetype_cs.h" #include "be_visitor_valuetype/valuetype_sh.h" -#include "be_visitor_valuetype/valuetype_si.h" #include "be_visitor_valuetype/valuetype_ss.h" #include "be_visitor_valuetype/any_op_ch.h" #include "be_visitor_valuetype/any_op_cs.h" diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h deleted file mode 100644 index 698c702d03e..00000000000 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -*- c++ -*- */ -//============================================================================= -/** - * @file valuetype_si.h - * - * $Id$ - * - * Concrete visitor for the valuetype node. - * This provides for code generation in the server inline - * - * - * @author Jeff Parsons - */ -//============================================================================= - - -#ifndef _BE_VALUETYPE_VALUETYPE_SI_H_ -#define _BE_VALUETYPE_VALUETYPE_SI_H_ - -/** - * @class be_visitor_valuetype_si - * - * @brief be_visitor_valuetype_si - * - * This is a concrete visitor to generate the server inline for valuetype - */ -class be_visitor_valuetype_si : public be_visitor_valuetype -{ -public: - /// constructor - be_visitor_valuetype_si (be_visitor_context *ctx); - - /// destructor - ~be_visitor_valuetype_si (void); - - virtual int visit_valuetype (be_valuetype *node); - virtual int visit_eventtype (be_eventtype *node); -}; - -#endif /* _BE_VALUETYPE_VALUETYPE_SI_H_ */ diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html index bb00c007a0f..a9afc4c9c24 100644 --- a/TAO/docs/compiler.html +++ b/TAO/docs/compiler.html @@ -53,7 +53,7 @@ these files:) <P> <LI> <B><EM>Client stubs</EM></B>, <EM>i.e.</EM>, <tt>*C.h</tt>, <tt>*C.inl</tt>, and <tt>*C.cpp</tt>. Pure client applications only need to <code>#include</code> and link with these files. - <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>, <tt>*S.h</tt>, <tt>*S.inl</tt>, and + <LI> <B><EM>Server skeletons</EM></B>, <EM>i.e.</EM>, <tt>*S.h</tt>, and <tt>*S.cpp</tt>. Servers need to <code>#include</code> and link with these files. Generation of these files may be suppressed with the <tt>-SS</tt> option. <LI> <B><EM>Server skeleton templates</EM></B>, <EM>i.e.</EM>, <tt>*S_T.h</tt>, <tt>S_T.inl</tt>, @@ -745,13 +745,6 @@ also receives other options that are specific to it.<p> <td> </td> </tr> - <tr><a name="si"> - <td><tt>-si</tt></td> - - <td>Server inline skeleton file name ending. Default is "S.inl".</td> - <td> </td> - </tr> - <tr><a name="t"> <td><tt>-t</tt></td> diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/index.html b/TAO/docs/tutorials/Quoter/Simple/Client/index.html index 26adb26483b..33a8cca7092 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Client/index.html +++ b/TAO/docs/tutorials/Quoter/Simple/Client/index.html @@ -105,7 +105,7 @@ $ $ACE_ROOT/TAO/TAO_IDL/tao_idl Quoter.idl generated from <CODE>QuoterC.cpp</CODE>. </P> <P> - Similarly, <CODE>QuoterS.h</CODE>, <CODE>QuoterS.inl</CODE> + Similarly, <CODE>QuoterS.h</CODE>, and <CODE>QuoterS.cpp</CODE> contain the server-side <EM>skeletons</EM>. Servers must link the object files generated from <CODE>QuoterS.cpp</CODE> <STRONG>and</STRONG> <CODE>QuoterC.cpp</CODE>. @@ -149,9 +149,9 @@ int main (int argc, char* argv[]) "" /* the ORB name, it can be anything! */); </PRE> <P>IDL supports variable-length types whose sizes are not known - at compile time, hence they must be dynamically allocated at run + at compile time, hence they must be dynamically allocated at run time. <CODE>_var</CODE> types relieve us of the explicit memory - management of the variable-length types and thus hide the + management of the variable-length types and thus hide the differences between fixed and variable-length structured types. </P> <P>Since the ORB initialization can fail, and in fact, any CORBA @@ -225,9 +225,9 @@ int main (int argc, char* argv[]) Quoter::Stock_Factory_var factory = Quoter::Stock_Factory::_narrow (factory_object.in ()); </PRE> - <P>The <CODE>_narrow()</CODE> is used to test if a reference - is of the specified type. If the reference is of the specified - type, it returns a non-nil reference, else it returns a nil. + <P>The <CODE>_narrow()</CODE> is used to test if a reference + is of the specified type. If the reference is of the specified + type, it returns a non-nil reference, else it returns a nil. </P> <P>There are a few interesting things about TAO: First, it supports the <CODE>file:</CODE> scheme for object references, so the first diff --git a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc index b92be693ead..26dfc3111de 100644 --- a/TAO/examples/AMI/FL_Callback/FL_Callback.mpc +++ b/TAO/examples/AMI/FL_Callback/FL_Callback.mpc @@ -28,7 +28,6 @@ project(*progress): taoexe, messaging, ami, portableserver, tao_flresource { Inline_Files { testC.inl - testS.inl } IDL_Files { @@ -54,7 +53,6 @@ project(*peer): taoexe, strategies, messaging, ami, portableserver { Inline_Files { testC.inl - testS.inl } IDL_Files { diff --git a/TAO/examples/RTScheduling/Job.mpc b/TAO/examples/RTScheduling/Job.mpc index 103df7d95ce..8e46c315901 100644 --- a/TAO/examples/RTScheduling/Job.mpc +++ b/TAO/examples/RTScheduling/Job.mpc @@ -26,6 +26,5 @@ project(Job): portableserver { Inline_Files { JobC.inl - JobS.inl } } diff --git a/TAO/examples/RTScheduling/Synch.mpc b/TAO/examples/RTScheduling/Synch.mpc index 23920a77023..77a2ae1d681 100644 --- a/TAO/examples/RTScheduling/Synch.mpc +++ b/TAO/examples/RTScheduling/Synch.mpc @@ -27,6 +27,5 @@ project(RTSchedSynch): portableserver { Inline_Files { SynchC.inl - SynchS.inl } } diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc index 8c1cce3a75e..f22d6d23160 100644 --- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc +++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc @@ -63,7 +63,6 @@ project(CosConcurrency_Skel): orbsvcslib, orbsvcs_output, install, concurrency, } Inline_Files { - CosConcurrencyControlS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent.mpc b/TAO/orbsvcs/orbsvcs/CosEvent.mpc index af96ca992fe..80efa635a0a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc +++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc @@ -71,8 +71,6 @@ project (CosEvent_Skel) : orbsvcslib, orbsvcs_output, install, avoids_minimum_co } Inline_Files { - CosEventCommS.inl - CosEventChannelAdminS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc index debd95904d2..1820a1ecc27 100644 --- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc +++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc @@ -67,8 +67,6 @@ project(CosLifeCycle_Skel) : orbsvcslib, orbsvcs_output, install, lifecycle, por } Inline_Files { - CosLifeCycleS.inl - LifeCycleServiceS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc index 30a30181bac..f7b411099d9 100644 --- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc @@ -19,7 +19,6 @@ project(CosNaming_Skel) : orbsvcslib, orbsvcs_output, install, naming, portables } Inline_Files { - CosNamingS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.mpc b/TAO/orbsvcs/orbsvcs/CosNotification.mpc index 74027108963..142088974dd 100644 --- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc +++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc @@ -95,12 +95,6 @@ project(CosNotification_Skel) : orbsvcslib, orbsvcs_output, install, notificatio } Inline_Files { - CosNotificationS.inl - CosNotifyCommS.inl - CosNotifyFilterS.inl - CosNotifyChannelAdminS.inl - NotifyExtS.inl - Event_ForwarderS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosProperty.mpc b/TAO/orbsvcs/orbsvcs/CosProperty.mpc index feabcd709f0..1a6d99258fe 100644 --- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc +++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc @@ -62,7 +62,6 @@ project(CosProperty_Skel) : orbsvcslib, orbsvcs_output, install, property, porta } Inline_Files { - CosPropertyS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc index 803b03e131f..712e71e15f2 100644 --- a/TAO/orbsvcs/orbsvcs/CosTime.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTime.mpc @@ -61,7 +61,6 @@ project(CosTime_Skel) : orbsvcslib, orbsvcs_output, install, time, portableserve } Inline_Files { - TimeServiceS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc index 870470e0a30..bd69cd8d01d 100644 --- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc +++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc @@ -77,9 +77,6 @@ project(CosTrading_Skel) : orbsvcslib, orbsvcs_output, install, trading, portabl } Inline_Files { - CosTradingS.inl - CosTradingReposS.inl - CosTradingDynamicS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc index 7b0769e0dd6..657348872be 100644 --- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc @@ -63,7 +63,6 @@ project(DsEventLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dseventloga } Inline_Files { - DsEventLogAdminS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc index aeaa96fab09..8e21e951446 100644 --- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc @@ -70,8 +70,6 @@ project(DsLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dslogadmin, port } Inline_Files { - DsLogAdminS.inl - DsLogNotificationS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc index 03174af7e38..940016b3e03 100644 --- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc @@ -64,7 +64,6 @@ project(DsNotifyLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, dsnotifylo } Inline_Files { - DsNotifyLogAdminS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc index ac0f8b9fbb3..5ccb28ebc3b 100644 --- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc @@ -62,7 +62,6 @@ project(RTEventLogAdmin_Skel) : orbsvcslib, orbsvcs_output, install, rteventloga } Inline_Files { - RTEventLogAdminS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc index e2fa2a25037..e9f5730760b 100644 --- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc +++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc @@ -29,10 +29,6 @@ project(RTEvent_Skel) : orbsvcslib, orbsvcs_output, install, rtevent, portablese } Inline_Files { - RtecDefaultEventDataS.inl - RtecEventCommS.inl - RtecEventChannelAdminS.inl - RtecUDPAdminS.inl } Template_Files { diff --git a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb index b5316d32dab..5eec5e72e58 100644 --- a/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb +++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_skel.mpb @@ -18,8 +18,6 @@ feature(ec_typed_events) { } Inline_Files { - CosTypedEventCommS.inl - CosTypedEventChannelAdminS.inl } Template_Files { diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl index ddfff9c21e6..fffd0bf4161 100755 --- a/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl +++ b/TAO/orbsvcs/tests/Bug_1393_Regression/run_test.pl @@ -10,7 +10,7 @@ use PerlACE::TestTarget; $status = 0; -my @generated_files = ("testC.h", "testC.cpp", "testC.inl", "testS.h", "testS.cpp", "testS.inl"); +my @generated_files = ("testC.h", "testC.cpp", "testC.inl", "testS.h", "testS.cpp"); # The location of the IFR_Service binary my $ifr_service_bin = "../../IFR_Service"; diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h index 064a64844f0..37778759279 100644 --- a/TAO/tao/Abstract_Servant_Base.h +++ b/TAO/tao/Abstract_Servant_Base.h @@ -36,6 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ServerRequest; class TAO_Stub; class TAO_Abstract_ServantBase; +class TAO_ServantBase; namespace CORBA { @@ -61,7 +62,7 @@ namespace TAO typedef void (*TAO_Skeleton)( TAO_ServerRequest &, TAO::Portable_Server::Servant_Upcall *, - void *); + TAO_ServantBase *); typedef void (*TAO_Collocated_Skeleton)( TAO_Abstract_ServantBase *, @@ -158,11 +159,6 @@ protected: TAO_ServerRequest &request, TAO::Portable_Server::Servant_Upcall *servant_upcall) = 0; - virtual void synchronous_upcall_dispatch ( - TAO_ServerRequest &req, - TAO::Portable_Server::Servant_Upcall *servant_upcall, - void *derived_this) = 0; - /// Get this interface's repository id (TAO specific). virtual const char *_interface_repository_id (void) const = 0; }; diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc index 1d50a825948..84c7d98cf6e 100644 --- a/TAO/tao/IFR_Client/IFR_Client.mpc +++ b/TAO/tao/IFR_Client/IFR_Client.mpc @@ -83,10 +83,6 @@ project(IFR_Client_skel) : ifr_client, taolib, tao_output, install, anytypecode, } Inline_Files { - IFR_BaseS.inl - IFR_BasicS.inl - IFR_ComponentsS.inl - IFR_ExtendedS.inl } specific { diff --git a/TAO/tao/ImR_Client/ImR_Client.mpc b/TAO/tao/ImR_Client/ImR_Client.mpc index 6412aa51688..26d5027ea46 100644 --- a/TAO/tao/ImR_Client/ImR_Client.mpc +++ b/TAO/tao/ImR_Client/ImR_Client.mpc @@ -2,7 +2,7 @@ project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { - idlflags += -Gp -Ssi -Gd -Sorb -GA \ + idlflags += -Gp -Gd -Sorb -GA \ -Wb,export_macro=TAO_IMR_Client_Export \ -Wb,export_include=tao/ImR_Client/imr_client_export.h \ -iC tao/ImR_Client @@ -11,7 +11,7 @@ project(*idl) : tao_versioning_idl_defaults, install { } IDL_Files { - idlflags += -Gp -Ssi -Gd -Sorb -GX \ + idlflags += -Gp -Gd -Sorb -GX \ -Wb,export_macro=TAO_IMR_Client_Export \ -Wb,export_include=tao/ImR_Client/imr_client_export.h \ -iC tao/ImR_Client diff --git a/TAO/tao/Messaging/AMH_Skeletons.cpp b/TAO/tao/Messaging/AMH_Skeletons.cpp index 8286de08865..3afeb52af8a 100644 --- a/TAO/tao/Messaging/AMH_Skeletons.cpp +++ b/TAO/tao/Messaging/AMH_Skeletons.cpp @@ -45,7 +45,7 @@ _is_a_amh_Upcall_Command::execute (void) void TAO_AMH_Skeletons::_is_a_amh_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -63,11 +63,8 @@ TAO_AMH_Skeletons::_is_a_amh_skel (TAO_ServerRequest & server_request, static size_t const nargs = 2; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - _is_a_amh_Upcall_Command command ( - impl, + servant, server_request.operation_details (), args); @@ -101,7 +98,7 @@ _non_existent_amh_Upcall_Command::execute (void) void TAO_AMH_Skeletons::_non_existent_amh_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -116,11 +113,9 @@ void TAO_AMH_Skeletons::_non_existent_amh_skel (TAO_ServerRequest & server_reque }; static size_t const nargs = 1; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); _non_existent_amh_Upcall_Command command ( - impl, + servant, server_request.operation_details (), args); @@ -143,7 +138,7 @@ void TAO_AMH_Skeletons::_non_existent_amh_skel (TAO_ServerRequest & server_reque void TAO_AMH_Skeletons::_interface_amh_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* /* servant_upcall */, - void * servant) + TAO_ServantBase *servant) { TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -154,9 +149,7 @@ TAO_AMH_Skeletons::_interface_amh_skel (TAO_ServerRequest & server_request, throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); } - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); + ::CORBA::InterfaceDef_ptr _tao_retval = servant->_get_interface (); server_request.init_reply (); TAO_OutputCDR &_tao_out = *server_request.outgoing (); @@ -186,7 +179,7 @@ _get_component_amh_Upcall_Command::execute (void) void TAO_AMH_Skeletons::_component_amh_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -202,11 +195,8 @@ TAO_AMH_Skeletons::_component_amh_skel (TAO_ServerRequest & server_request, static size_t const nargs = 1; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - _get_component_amh_Upcall_Command command ( - impl, + servant, server_request.operation_details (), args); @@ -240,7 +230,7 @@ _repository_id_amh_Upcall_Command::execute (void) void TAO_AMH_Skeletons::_repository_id_amh_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -256,11 +246,8 @@ TAO_AMH_Skeletons::_repository_id_amh_skel (TAO_ServerRequest & server_request, static size_t const nargs = 1; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - _repository_id_amh_Upcall_Command command ( - impl, + servant, server_request.operation_details (), args); diff --git a/TAO/tao/Messaging/AMH_Skeletons.h b/TAO/tao/Messaging/AMH_Skeletons.h index 71941de0eca..3f9af9046c4 100644 --- a/TAO/tao/Messaging/AMH_Skeletons.h +++ b/TAO/tao/Messaging/AMH_Skeletons.h @@ -170,25 +170,25 @@ class TAO_Messaging_Export TAO_AMH_Skeletons public: static void _is_a_amh_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); #if (TAO_HAS_MINIMUM_CORBA == 0) static void _non_existent_amh_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); # if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) static void _interface_amh_skel (TAO_ServerRequest & server_request, - TAO::Portable_Server::Servant_Upcall* /* servant_upcall */, - void * servant); + TAO::Portable_Server::Servant_Upcall* servant_upcall, + TAO_ServantBase *servant); static void _component_amh_skel (TAO_ServerRequest & server_request, - TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO::Portable_Server::Servant_Upcall* servant_upcall, + TAO_ServantBase *servant); # endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ static void _repository_id_amh_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); #endif /* TAO_HAS_MINIMUM_CORBA */ }; diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc index 557d5dc7327..06d2cc6ddc2 100644 --- a/TAO/tao/Messaging/Messaging.mpc +++ b/TAO/tao/Messaging/Messaging.mpc @@ -51,7 +51,7 @@ project(*idl) : tao_versioning_idl_defaults, install { } IDL_Files { - idlflags += -Ssi -GA -Gp -Gd -Sorb -Sal \ + idlflags += -GA -Gp -Gd -Sorb -Sal \ -Wb,export_macro=TAO_Messaging_Export \ -Wb,export_include=tao/Messaging/messaging_export.h \ -Wb,include_guard=TAO_MESSAGING_SAFE_INCLUDE \ diff --git a/TAO/tao/Monitor/Monitor.mpc b/TAO/tao/Monitor/Monitor.mpc index c4e7f7c083d..7b8f3cb270d 100644 --- a/TAO/tao/Monitor/Monitor.mpc +++ b/TAO/tao/Monitor/Monitor.mpc @@ -12,7 +12,7 @@ project (*idl): tao_versioning_idl_defaults, install { IDL_Files { idlflags += -Wb,include_guard=TAO_MONITOR_SAFE_INCLUDE \ - -Wb,safe_include=tao/Monitor/Monitor.h -Ssi + -Wb,safe_include=tao/Monitor/Monitor.h Monitor.pidl } diff --git a/TAO/tao/PortableServer/Local_Servant_Base.cpp b/TAO/tao/PortableServer/Local_Servant_Base.cpp deleted file mode 100644 index 6b61c270ce8..00000000000 --- a/TAO/tao/PortableServer/Local_Servant_Base.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// $Id$ - -#include "tao/PortableServer/Local_Servant_Base.h" -#include "tao/SystemException.h" - -#if !defined (__ACE_INLINE__) -# include "tao/PortableServer/Local_Servant_Base.inl" -#endif /* ! __ACE_INLINE__ */ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -void -TAO_Local_ServantBase::_dispatch ( - TAO_ServerRequest &, - TAO::Portable_Server::Servant_Upcall*) -{ - throw ::CORBA::BAD_OPERATION (); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Local_Servant_Base.h b/TAO/tao/PortableServer/Local_Servant_Base.h deleted file mode 100644 index fe1f556b62f..00000000000 --- a/TAO/tao/PortableServer/Local_Servant_Base.h +++ /dev/null @@ -1,62 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Local_Servant_Base.h - * - * $Id$ - * - * @author Irfan Pyarali <irfan@cs.wustl.edu> - */ -//============================================================================= - -#ifndef TAO_LOCAL_SERVANT_BASE_H -#define TAO_LOCAL_SERVANT_BASE_H - -#include /**/ "ace/pre.h" - -#include "tao/PortableServer/portableserver_export.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableServer/Servant_Base.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_Local_ServantBase - * - * @brief Base class for local servants. - * - * This servant does not register with the POA and does not - * produce a valid stub, i.e., object references of this servant - * cannot be exported. The (collocated) stubs of these servants - * will always be direct, i.e., call directly to the servant and - * don't call through the POA since this servant is not - * registered with the POA. - */ -class TAO_PortableServer_Export TAO_Local_ServantBase - : public virtual TAO_ServantBase -{ -protected: - /// This is an auxiliary method for _this(). Make sure *not* to - /// register with the default POA. - TAO_Stub *_create_stub (void); - - /// Throws CORBA::BAD_OPERATION exception. - void _dispatch ( - TAO_ServerRequest &request, - TAO::Portable_Server::Servant_Upcall* servant_upcall); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined (__ACE_INLINE__) -# include "tao/PortableServer/Local_Servant_Base.inl" -#endif /* __ACE_INLINE__ */ - -#include /**/ "ace/post.h" - -#endif /* TAO_LOCAL_SERVANT_BASE_H */ diff --git a/TAO/tao/PortableServer/Local_Servant_Base.inl b/TAO/tao/PortableServer/Local_Servant_Base.inl deleted file mode 100644 index 20eaf3f2e55..00000000000 --- a/TAO/tao/PortableServer/Local_Servant_Base.inl +++ /dev/null @@ -1,13 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE TAO_Stub * -TAO_Local_ServantBase::_create_stub (void) -{ - return 0; -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index 76047c9eb5e..c0dc04faba3 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -28,6 +28,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_ServerRequest; class TAO_Abstract_ServantBase; +class TAO_ServantBase; namespace TAO { @@ -40,7 +41,7 @@ namespace TAO typedef void (*TAO_Skeleton)( TAO_ServerRequest &, TAO::Portable_Server::Servant_Upcall *, - void *); + TAO_ServantBase *); typedef void (*TAO_Collocated_Skeleton)( TAO_Abstract_ServantBase *, diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h index 592be9ab1e9..6f45d439eeb 100644 --- a/TAO/tao/PortableServer/PS_ForwardC.h +++ b/TAO/tao/PortableServer/PS_ForwardC.h @@ -69,7 +69,6 @@ namespace PortableServer typedef Servant_var<TAO_ServantBase> ServantBase_var; typedef ServantBase *Servant; - typedef TAO_Local_ServantBase LocalServantBase; typedef TAO_DynamicImplementation DynamicImplementation; // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp index 517e63547ec..7e72a2fd245 100644 --- a/TAO/tao/PortableServer/PolicyS.cpp +++ b/TAO/tao/PortableServer/PolicyS.cpp @@ -175,15 +175,15 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len { {"",0,0},{"",0,0},{"",0,0},{"",0,0}, {"copy", &POA_CORBA::Policy::copy_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy}, - {"_is_a", &POA_CORBA::Policy::_is_a_skel, 0}, + {"_is_a", &TAO_ServantBase::_is_a_skel, 0}, {"",0,0}, {"destroy", &POA_CORBA::Policy::destroy_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy}, {"",0,0},{"",0,0}, - {"_component", &POA_CORBA::Policy::_component_skel, 0}, + {"_component", &TAO_ServantBase::_component_skel, 0}, {"",0,0},{"",0,0}, - {"_non_existent", &POA_CORBA::Policy::_non_existent_skel, 0}, + {"_non_existent", &TAO_ServantBase::_non_existent_skel, 0}, {"",0,0}, - {"_interface", &POA_CORBA::Policy::_interface_skel, 0}, + {"_interface", &TAO_ServantBase::_interface_skel, 0}, {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0}, {"_get_policy_type", &POA_CORBA::Policy::_get_policy_type_skel, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type}, }; @@ -325,7 +325,7 @@ namespace POA_CORBA void POA_CORBA::Policy::_get_policy_type_skel ( TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase* servant) { #if TAO_HAS_INTERCEPTORS == 1 @@ -343,7 +343,7 @@ void POA_CORBA::Policy::_get_policy_type_skel ( static size_t const nargs = 1; POA_CORBA::Policy * const impl = - static_cast<POA_CORBA::Policy *> (servant); + dynamic_cast<POA_CORBA::Policy *> (servant); _get_policy_type_Policy command ( impl, @@ -411,9 +411,7 @@ namespace POA_CORBA void POA_CORBA::Policy::copy_skel ( TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall), - void * servant - - ) + TAO_ServantBase * servant) { @@ -432,7 +430,7 @@ void POA_CORBA::Policy::copy_skel ( static size_t const nargs = 1; POA_CORBA::Policy * const impl = - static_cast<POA_CORBA::Policy *> (servant); + dynamic_cast<POA_CORBA::Policy *> (servant); copy_Policy command ( impl, @@ -471,8 +469,7 @@ namespace POA_CORBA virtual void execute (void) { - this->servant_->destroy ( - ); + this->servant_->destroy (); } @@ -489,9 +486,7 @@ namespace POA_CORBA void POA_CORBA::Policy::destroy_skel ( TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall), - void * servant - - ) + TAO_ServantBase * servant) { @@ -510,7 +505,7 @@ void POA_CORBA::Policy::destroy_skel ( static size_t const nargs = 1; POA_CORBA::Policy * const impl = - static_cast<POA_CORBA::Policy *> (servant); + dynamic_cast<POA_CORBA::Policy *> (servant); destroy_Policy command ( impl); @@ -529,329 +524,7 @@ void POA_CORBA::Policy::destroy_skel ( } -// TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:169 - -namespace POA_CORBA -{ - - - // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:127 - - class _is_a_Policy_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _is_a_Policy_Upcall_Command ( - POA_CORBA::Policy * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 = - TAO::Portable_Server::get_in_arg< CORBA::Char *> ( - this->operation_details_, - this->args_, - 1); - - - retval = - this->servant_-> _is_a ( - arg_1 - ); - - } - - private: - POA_CORBA::Policy * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; - -} -void POA_CORBA::Policy::_is_a_skel ( - TAO_ServerRequest & server_request, - TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall), - void * servant - - ) -{ - - -#if TAO_HAS_INTERCEPTORS == 1 - static CORBA::TypeCode_ptr const * const exceptions = 0; - static CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id; - - TAO::Argument * const args[] = - { - &retval, - &_tao_repository_id - }; - - static size_t const nargs = 2; - - POA_CORBA::Policy * const impl = - static_cast<POA_CORBA::Policy *> (servant); - - _is_a_Policy_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); - -} - -namespace POA_CORBA -{ - - - // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:127 - - class _non_existent_Policy_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _non_existent_Policy_Upcall_Command ( - POA_CORBA::Policy * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( - this->operation_details_, - this->args_); - - - retval = - this->servant_-> _non_existent ( - ); - - } - - private: - POA_CORBA::Policy * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; - -} -void POA_CORBA::Policy::_non_existent_skel ( - TAO_ServerRequest & server_request, - TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall), - void * servant - - ) -{ - - -#if TAO_HAS_INTERCEPTORS == 1 - static CORBA::TypeCode_ptr const * const exceptions = 0; - static CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_CORBA::Policy * const impl = - static_cast<POA_CORBA::Policy *> (servant); - - _non_existent_Policy_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); - -} - - - -// TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:393 - - - -void POA_CORBA::Policy::_interface_skel ( - TAO_ServerRequest & server_request, - TAO::Portable_Server::Servant_Upcall * /* servant_upcall */, - void * servant - - ) -{ - TAO_IFR_Client_Adapter *_tao_adapter = - ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( - TAO_ORB_Core::ifr_client_adapter_name () - ); - - if (_tao_adapter == 0) - { - throw ::CORBA::INTF_REPOS (CORBA::OMGVMCID | 1, CORBA::COMPLETED_NO); - } - - POA_CORBA::Policy * const impl = - static_cast<POA_CORBA::Policy *> (servant); - CORBA::InterfaceDef_ptr _tao_retval = - impl->_get_interface (); - - server_request.init_reply (); - TAO_OutputCDR &_tao_out = *server_request.outgoing (); - - CORBA::Boolean const _tao_result = - _tao_adapter->interfacedef_cdr_insert ( - _tao_out, - _tao_retval - ); - - _tao_adapter->dispose (_tao_retval); - - if (_tao_result == 0) - { - throw ::CORBA::MARSHAL (); - } -} - -namespace POA_CORBA -{ - - - // TAO_IDL - Generated from - // be\be_visitor_operation/upcall_command_ss.cpp:127 - - class _get_component_Policy_Upcall_Command - : public TAO::Upcall_Command - { - public: - inline _get_component_Policy_Upcall_Command ( - POA_CORBA::Policy * servant, - TAO_Operation_Details const * operation_details, - TAO::Argument * const args[]) - : servant_ (servant) - , operation_details_ (operation_details) - , args_ (args) - { - } - - virtual void execute (void) - { - TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = - TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( - this->operation_details_, - this->args_); - - - retval = - this->servant_-> _get_component ( - ); - - } - - private: - POA_CORBA::Policy * const servant_; - TAO_Operation_Details const * const operation_details_; - TAO::Argument * const * const args_; - }; - -} -void POA_CORBA::Policy::_component_skel ( - TAO_ServerRequest & server_request, - TAO::Portable_Server::Servant_Upcall * TAO_INTERCEPTOR (servant_upcall), - void * servant - - ) -{ - - -#if TAO_HAS_INTERCEPTORS == 1 - static CORBA::TypeCode_ptr const * const exceptions = 0; - static CORBA::ULong const nexceptions = 0; -#endif /* TAO_HAS_INTERCEPTORS */ - - TAO::SArg_Traits< ::CORBA::Object>::ret_val retval; - - TAO::Argument * const args[] = - { - &retval - }; - - static size_t const nargs = 1; - - POA_CORBA::Policy * const impl = - static_cast<POA_CORBA::Policy *> (servant); - - _get_component_Policy_Upcall_Command command ( - impl, - server_request.operation_details (), - args); - - TAO::Upcall_Wrapper upcall_wrapper; - upcall_wrapper.upcall (server_request - , args - , nargs - , command -#if TAO_HAS_INTERCEPTORS == 1 - , servant_upcall - , exceptions - , nexceptions -#endif /* TAO_HAS_INTERCEPTORS == 1 */ - ); - -} - -CORBA::Boolean POA_CORBA::Policy::_is_a ( - const char* value - - ) +CORBA::Boolean POA_CORBA::Policy::_is_a (const char* value) { return ( @@ -871,13 +544,9 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const return "IDL:omg.org/CORBA/Policy:1.0"; } -// TAO_IDL - Generated from -// be\be_visitor_interface/interface_ss.cpp:940 - void POA_CORBA::Policy::_dispatch ( TAO_ServerRequest & req, - TAO::Portable_Server::Servant_Upcall *servant_upcall - ) + TAO::Portable_Server::Servant_Upcall *servant_upcall) { this->synchronous_upcall_dispatch (req, servant_upcall, diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h index a502311b859..2c7cea47a5e 100644 --- a/TAO/tao/PortableServer/PolicyS.h +++ b/TAO/tao/PortableServer/PolicyS.h @@ -90,26 +90,6 @@ namespace POA_CORBA virtual CORBA::Boolean _is_a ( const char* logical_type_id); - static void _is_a_skel ( - TAO_ServerRequest & req, - TAO::Portable_Server::Servant_Upcall *servant_upcall, - void * servant); - - static void _non_existent_skel ( - TAO_ServerRequest & req, - TAO::Portable_Server::Servant_Upcall *servant_upcall, - void * servant); - - static void _interface_skel ( - TAO_ServerRequest & req, - TAO::Portable_Server::Servant_Upcall *servant_upcall, - void * servant); - - static void _component_skel ( - TAO_ServerRequest & req, - TAO::Portable_Server::Servant_Upcall *servant_upcall, - void * servant); - virtual void _dispatch ( TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall *servant_upcall); @@ -126,7 +106,7 @@ namespace POA_CORBA static void _get_policy_type_skel ( TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall *servant_upcall, - void * servant); + TAO_ServantBase* servant); // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 @@ -136,7 +116,7 @@ namespace POA_CORBA static void copy_skel ( TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall *servant_upcall, - void * servant); + TAO_ServantBase* servant); // TAO_IDL - Generated from // be\be_visitor_operation/operation_sh.cpp:45 @@ -146,7 +126,7 @@ namespace POA_CORBA static void destroy_skel ( TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall *servant_upcall, - void * servant); + TAO_ServantBase* servant); }; // TAO_IDL - Generated from diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index b8693bf5abb..596058997e6 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -96,7 +96,7 @@ TAO_ServantBase::_default_POA (void) void TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -114,11 +114,8 @@ TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request, static size_t const nargs = 2; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - _is_a_Upcall_Command command ( - impl, + servant, args); TAO::Upcall_Wrapper upcall_wrapper; @@ -137,7 +134,7 @@ TAO_ServantBase::_is_a_skel (TAO_ServerRequest & server_request, void TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -155,11 +152,8 @@ TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request, static size_t const nargs = 2; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - _is_a_thru_poa_Upcall_Command command ( - impl, + servant, server_request.operation_details (), args); @@ -181,7 +175,7 @@ TAO_ServantBase::_is_a_thru_poa_skel (TAO_ServerRequest & server_request, void TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -197,10 +191,8 @@ TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request, static size_t const nargs = 1; - TAO_ServantBase * const impl = static_cast<TAO_ServantBase *> (servant); - _non_existent_Upcall_Command command ( - impl, + servant, args); TAO::Upcall_Wrapper upcall_wrapper; @@ -218,7 +210,7 @@ TAO_ServantBase::_non_existent_skel (TAO_ServerRequest & server_request, void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -233,11 +225,9 @@ void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_re }; static size_t const nargs = 1; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); _non_existent_thru_poa_Upcall_Command command ( - impl, + servant, server_request.operation_details (), args); @@ -259,7 +249,7 @@ void TAO_ServantBase::_non_existent_thru_poa_skel (TAO_ServerRequest & server_re void TAO_ServantBase::_interface_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* /* servant_upcall */, - void * servant) + TAO_ServantBase *servant) { TAO_IFR_Client_Adapter *_tao_adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -270,9 +260,7 @@ TAO_ServantBase::_interface_skel (TAO_ServerRequest & server_request, throw ::CORBA::INTF_REPOS (::CORBA::OMGVMCID | 1, ::CORBA::COMPLETED_NO); } - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - ::CORBA::InterfaceDef_ptr _tao_retval = impl->_get_interface (); + ::CORBA::InterfaceDef_ptr _tao_retval = servant->_get_interface (); server_request.init_reply (); TAO_OutputCDR &_tao_out = *server_request.outgoing (); @@ -290,7 +278,7 @@ TAO_ServantBase::_interface_skel (TAO_ServerRequest & server_request, void TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -306,11 +294,8 @@ TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request, static size_t const nargs = 1; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - _get_component_Upcall_Command command ( - impl, + servant, args); TAO::Upcall_Wrapper upcall_wrapper; @@ -329,7 +314,7 @@ TAO_ServantBase::_component_skel (TAO_ServerRequest & server_request, void TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -345,11 +330,8 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request, static size_t const nargs = 1; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - _get_component_thru_poa_Upcall_Command command ( - impl, + servant, server_request.operation_details (), args); @@ -373,7 +355,7 @@ TAO_ServantBase::_component_thru_poa_skel (TAO_ServerRequest & server_request, void TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -389,11 +371,8 @@ TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request, static size_t const nargs = 1; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - _repository_id_Upcall_Command command ( - impl, + servant, args); TAO::Upcall_Wrapper upcall_wrapper; @@ -412,7 +391,7 @@ TAO_ServantBase::_repository_id_skel (TAO_ServerRequest & server_request, void TAO_ServantBase::_repository_id_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* TAO_INTERCEPTOR (servant_upcall), - void * servant) + TAO_ServantBase *servant) { #if TAO_HAS_INTERCEPTORS == 1 static ::CORBA::TypeCode_ptr const * const exceptions = 0; @@ -428,11 +407,8 @@ TAO_ServantBase::_repository_id_thru_poa_skel (TAO_ServerRequest & server_reques static size_t const nargs = 1; - TAO_ServantBase * const impl = - static_cast<TAO_ServantBase *> (servant); - _repository_id_thru_poa_Upcall_Command command ( - impl, + servant, server_request.operation_details (), args); @@ -558,7 +534,7 @@ void TAO_ServantBase::synchronous_upcall_dispatch ( TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * derived_this) + TAO_ServantBase *derived_this) { TAO_Skeleton skel; char const * const opname = req.operation (); @@ -590,7 +566,7 @@ TAO_ServantBase::synchronous_upcall_dispatch ( { // Invoke the skeleton, it will demarshal the arguments, invoke // the right operation on the skeleton class, and marshal any - // results. De/marshaling will only occur in the uncollocated + // results. De/marshaling will only occur in the not collocated // case. skel (req, servant_upcall, derived_this); @@ -629,9 +605,9 @@ TAO_ServantBase::synchronous_upcall_dispatch ( void TAO_ServantBase::asynchronous_upcall_dispatch ( - TAO_ServerRequest & req, - TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * derived_this) + TAO_ServerRequest &req, + TAO::Portable_Server::Servant_Upcall *servant_upcall, + TAO_ServantBase *derived_this) { TAO_Skeleton skel; const char *opname = req.operation (); @@ -658,7 +634,7 @@ TAO_ServantBase::asynchronous_upcall_dispatch ( { // Invoke the skeleton, it will demarshal the arguments, invoke // the right operation on the skeleton class, and marshal any - // results. De/marshaling will only occur in the uncollocated + // results. De/marshaling will only occur in the not collocated // case. skel (req, servant_upcall, derived_this); @@ -675,8 +651,6 @@ TAO_ServantBase::asynchronous_upcall_dispatch ( // the appropriate reply to the client req.tao_send_reply_exception (ex); } - - return; } void diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 12eee3ffd64..9755cb393f6 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -70,41 +70,40 @@ public: /// Destructor. virtual ~TAO_ServantBase (void); - static void _is_a_skel (TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); static void _is_a_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); #if (TAO_HAS_MINIMUM_CORBA == 0) static void _non_existent_skel (TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); static void _non_existent_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); # if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) static void _interface_skel (TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); static void _component_skel (TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); static void _component_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); # endif /* !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ static void _repository_id_skel (TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); static void _repository_id_thru_poa_skel (TAO_ServerRequest & server_request, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * servant); + TAO_ServantBase *servant); #endif /* TAO_HAS_MINIMUM_CORBA */ /// Returns the default POA for this servant. @@ -193,15 +192,15 @@ protected: /// Assignment operator. TAO_ServantBase &operator= (const TAO_ServantBase &); - virtual void synchronous_upcall_dispatch ( + void synchronous_upcall_dispatch ( TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * derived_this); + TAO_ServantBase *derived_this); - virtual void asynchronous_upcall_dispatch ( + void asynchronous_upcall_dispatch ( TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, - void * derived_this); + TAO_ServantBase *derived_this); protected: /// Reference counter. diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp index 4145de92f4b..1f6cb71e638 100644 --- a/TAO/tests/AMH_Exceptions/client.cpp +++ b/TAO/tests/AMH_Exceptions/client.cpp @@ -70,6 +70,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) roundtrip->shutdown (); } + + orb->destroy (); } catch (const CORBA::Exception& ex) { diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index f8132bca70e..7f724da1493 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -84,7 +84,7 @@ public: virtual void run_event_loop (); public: - /// Accesor method (for servants) to the initialised ORB + /// Accesor method (for servants) to the initialized ORB CORBA::ORB_ptr orb () { return this->orb_.in (); } protected: diff --git a/TAO/tests/Alt_Mapping/alt_mapping.mpc b/TAO/tests/Alt_Mapping/alt_mapping.mpc index 302f66953ee..44dd5ab336a 100644 --- a/TAO/tests/Alt_Mapping/alt_mapping.mpc +++ b/TAO/tests/Alt_Mapping/alt_mapping.mpc @@ -30,7 +30,6 @@ project(*Server): taoserver, codeset, avoids_minimum_corba, avoids_corba_e_compa } Inline_Files { - alt_mappingS.inl alt_mappingC.inl } } diff --git a/TAO/tests/Bug_3743_Regression/run_test.pl b/TAO/tests/Bug_3743_Regression/run_test.pl index d1079904971..1ddd6b7b05c 100755 --- a/TAO/tests/Bug_3743_Regression/run_test.pl +++ b/TAO/tests/Bug_3743_Regression/run_test.pl @@ -21,7 +21,7 @@ if (exists $ENV{HOST_ROOT}) { my $test_idlfile = $test->LocalFile ("Test.idl"); # Files to delete after test -my @generated_files = ("TestC.cpp", "TestS.cpp", "TestC.inl", "TestS.inl", "Test.skel.h", "Test.stub.h"); +my @generated_files = ("TestC.cpp", "TestS.cpp", "TestC.inl", "Test.skel.h", "Test.stub.h"); # The IDL compiler $TAO_IDL = $test->CreateProcess ("$tao_idl"); diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc index ab64f74834c..40f1c93b523 100644 --- a/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc +++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp.mpc @@ -26,7 +26,6 @@ project(*Server): taoserver { Inline_Files { InheritedOpC.inl - InheritedOpS.inl } IDL_Files { diff --git a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc index c96fdb5f6f3..200b4ec6fa6 100644 --- a/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc +++ b/TAO/tests/Monitor/Marshal_Buffer/marshal_buffer.mpc @@ -50,7 +50,6 @@ project(*server): taoserver { Inline_Files { testC.inl - testS.inl } } diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc index 97a74931b30..0b887ef7890 100644 --- a/TAO/tests/Param_Test/Param_Test.mpc +++ b/TAO/tests/Param_Test/Param_Test.mpc @@ -26,7 +26,6 @@ project(*Server): taoserver, codeset, avoids_minimum_corba, avoids_corba_e_compa } Inline_Files { - param_testS.inl param_testC.inl } |