From b83f3ca3b4063bc7e1607edbdab8910be56ab0d8 Mon Sep 17 00:00:00 2001 From: jai Date: Fri, 26 Nov 2004 01:19:01 +0000 Subject: *** empty log message *** --- TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp | 3 +-- TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h | 9 ++++++--- TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp | 5 +++-- TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.h | 11 +++++++---- TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp | 11 ++++++----- TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.h | 11 +++++++---- .../examples/Hello/Sender/Sender_svnt.cpp.with-connections | 8 -------- 7 files changed, 30 insertions(+), 28 deletions(-) diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp index 8ea89c5ed0b..bfd3e8692a4 100644 --- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp +++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.cpp @@ -69,8 +69,7 @@ Sender_Impl::SenderSwap_exec_i::incarnate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) second_dll.symbol (second_exe_entrypt); Components::EnterpriseComponent_var second_executor = second_exec_creator (this); - - --count; + --count_; return second_executor._retn (); } } diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h index 7ee60e9b87c..0b23ea5bac2 100644 --- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h +++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec.h @@ -15,11 +15,14 @@ #include "Sender_exec_export.h" #include "tao/LocalObject.h" #include "ace/DLL.h" +#include "ciao/CCM_EventC.h" namespace Sender_Impl { + class SenderSwap_exec_i; - typedef ::Components::EnterpriseComponent_ptr (*ExecFactory) (void); + + typedef ::Components::EnterpriseComponent_ptr (*ExecFactory) (SenderSwap_exec_i *); /** * @class Sender_exec_i @@ -44,12 +47,12 @@ namespace Sender_Impl etherealize (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void consumers (::Components::ConsumerDescriptions_ptr p) + void consumers (::Components::ConsumerDescriptions *p) { this->consumers_ = p; } - ::Components::ConsumerDescriptions_ptr consumers (void) + ::Components::ConsumerDescriptions *consumers (void) { return this->consumers_._retn (); } diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp index 1d171364681..00938e190ac 100644 --- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp +++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.cpp @@ -1,6 +1,7 @@ //$Id$ #include "Sender_exec_1.h" +#include "Sender_exec.h" char* Sender_Impl::Message_Impl_1::get_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -133,9 +134,9 @@ Sender_Impl::Sender_exec_1_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr -createSenderExec_Impl (SenderSwap_exec_i *p) +createSenderExec_Impl (Sender_Impl::SenderSwap_exec_i *p) { - Sender_exec_1_i *tmp = + Sender_Impl::Sender_exec_1_i *tmp = new Sender_Impl::Sender_exec_1_i (); tmp->swap_exec (p); diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.h b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.h index 3f5e776ff4e..9455f07b236 100644 --- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.h +++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_1.h @@ -7,8 +7,8 @@ */ //============================================================ -#ifndef SENDER_EXEC_H -#define SENDER_EXEC_H +#ifndef SENDER_EXEC_1_H +#define SENDER_EXEC_1_H #include "SwapExecC.h" #include "SenderEC.h" @@ -17,6 +17,9 @@ namespace Sender_Impl { + class SenderSwap_exec_i; + + class SENDER_EXEC_Export Sender_exec_1_i : public virtual Sender_Exec, public virtual TAO_Local_RefCounted_Object @@ -27,7 +30,7 @@ namespace Sender_Impl Sender_exec_1_i () {}; /// Secondary construction. - Sender_exec_1_i (const char* local_message + Sender_exec_1_i (const char* local_message, SenderSwap_exec_i *e) : message_ (CORBA::string_dup (local_message)) , base_exec_ (e) @@ -125,6 +128,6 @@ namespace Sender_Impl } extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr -createSenderExec_Impl (SenderSwap_exec_i *p); +createSenderExec_Impl (Sender_Impl::SenderSwap_exec_i *p); #endif /* SENDER_EXEC_H */ diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp index e8a6d547201..2483b842922 100644 --- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp +++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.cpp @@ -1,6 +1,7 @@ //$Id$ #include "Sender_exec_2.h" +#include "Sender_exec.h" char* Sender_Impl::Message_Impl_2::get_message (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) @@ -89,7 +90,7 @@ Sender_Impl::Sender_exec_2_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL) this->context_->get_CCM_object (); Hello::Sender_var sender = - Hello::Sender::_narrow (comp_object.in () + Hello::Sender::_narrow (o.in () ACE_ENV_ARG_PARAMETER); for (CORBA::ULong cnt = 0; @@ -97,7 +98,7 @@ Sender_Impl::Sender_exec_2_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL) ++cnt) { sender->connect_consumer (c[cnt]->name (), - c[cnt] + (*c)[cnt]->consumer () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -130,10 +131,10 @@ Sender_Impl::Sender_exec_2_i::ccm_remove (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr -createSenderExec_Impl (SenderSwap_exec_i *p) +createSenderExec_Impl (Sender_Impl::SenderSwap_exec_i *p) { - Sender_exec_2_i *tmp = - new Sender_Impl::Sender_exec_1_i (); + Sender_Impl::Sender_exec_2_i *tmp = + new Sender_Impl::Sender_exec_2_i (); tmp->swap_exec (p); diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.h b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.h index 352cabc6efd..e1932e6b90c 100644 --- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.h +++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_exec_2.h @@ -7,8 +7,8 @@ */ //============================================================ -#ifndef SENDER_EXEC_H -#define SENDER_EXEC_H +#ifndef SENDER_EXEC_2_H +#define SENDER_EXEC_2_H #include "SwapExecC.h" #include "SenderEC.h" @@ -17,6 +17,9 @@ namespace Sender_Impl { + class SenderSwap_exec_i; + + class SENDER_EXEC_Export Sender_exec_2_i : public virtual Sender_Exec, public virtual TAO_Local_RefCounted_Object @@ -30,7 +33,7 @@ namespace Sender_Impl } /// Secondary construction. - Sender_exec_2_i (const char* local_message + Sender_exec_2_i (const char* local_message, SenderSwap_exec_i *e) : message_ (CORBA::string_dup (local_message)) , base_exec_ (e) @@ -127,6 +130,6 @@ namespace Sender_Impl } extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr -createSenderExec_Impl (SenderSwap_exec_i *p); +createSenderExec_Impl (Sender_Impl::SenderSwap_exec_i *p); #endif /* SENDER_EXEC_H */ diff --git a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections index 21a01b2b0ab..e13b182d578 100644 --- a/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections +++ b/TAO/CIAO/DAnCE/examples/Hello/Sender/Sender_svnt.cpp.with-connections @@ -305,8 +305,6 @@ namespace Sender_Impl return ret; } - ACE_DEBUG ((LM_DEBUG, "looked up the facet correctly\n")); - CIAO::Port_Activator_T< CIAO_GLUE_Hello::ReadMessage_Servant, ::Hello::CCM_ReadMessage, @@ -333,20 +331,14 @@ namespace Sender_Impl this), CORBA::NO_MEMORY ()); - ACE_DEBUG ((LM_DEBUG, "created the port activator\n")); - CIAO::Servant_Activator *sa = this->container_->ports_servant_activator (); - ACE_DEBUG ((LM_DEBUG, "got the servant activator\n")); - if (!sa->register_port_activator (tmp)) { return 0; } - ACE_DEBUG ((LM_DEBUG, "registered the port activator\n")); - ::CORBA::Object_var obj = this->container_->generate_reference ( "Hello_Sender_push_message", -- cgit v1.2.1