From d119115ff23aa0d2433518b0bb2590400cbfea70 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Mon, 20 Jun 2011 15:39:27 +0000 Subject: Mon Jun 20 15:38:24 UTC 2011 Johnny Willemsen * examples/DevGuideExamples/Messenger/Administrator_exec_i.h: * examples/DevGuideExamples/Messenger/History_exec_i.cpp: * examples/DevGuideExamples/Messenger/Messenger.mpc: * examples/DevGuideExamples/Messenger/Messenger_exec_i.h: * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp: * examples/DevGuideExamples/Messenger/Receiver_exec_i.h: * examples/DevGuideExamples/Messenger/descriptors/run_test.pl: Some cleanup and simplifications but this example doesn't deploy yet --- .../DevGuideExamples/Messenger/Administrator_exec_i.h | 4 ++-- .../DevGuideExamples/Messenger/History_exec_i.cpp | 2 +- CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc | 18 ++++++++++-------- .../DevGuideExamples/Messenger/Messenger_exec_i.cpp | 16 ++-------------- .../DevGuideExamples/Messenger/Messenger_exec_i.h | 4 ++-- .../DevGuideExamples/Messenger/Receiver_exec_i.h | 4 ++-- .../DevGuideExamples/Messenger/descriptors/run_test.pl | 3 --- 7 files changed, 19 insertions(+), 32 deletions(-) (limited to 'CIAO/examples') diff --git a/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h index 796395a2042..80a0a63a110 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h +++ b/CIAO/examples/DevGuideExamples/Messenger/Administrator_exec_i.h @@ -36,7 +36,7 @@ namespace CIAO_Administrator_Impl { - class ADMINISTRATOR_EXEC_Export Administrator_exec_i + class Administrator_exec_i : public virtual Administrator_Exec, public virtual ::CORBA::LocalObject, public virtual ACE_Task_Base @@ -81,7 +81,7 @@ namespace CIAO_Administrator_Impl extern "C" ADMINISTRATOR_EXEC_Export ::Components::EnterpriseComponent_ptr create_Administrator_Impl (void); - class ADMINISTRATOR_EXEC_Export AdministratorHome_exec_i + class AdministratorHome_exec_i : public virtual AdministratorHome_Exec, public virtual ::CORBA::LocalObject { diff --git a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp index 618f714c696..10498bbdf71 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp +++ b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp @@ -89,7 +89,7 @@ namespace CIAO_Messenger_Impl // bump up the reference count; we don't own it. // the _var in the STL list takes ownership of the "copy" message->_add_ref(); - this->messages_.push_back( message ); + this->messages_.push_back(message); } } diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc index a11f5407c40..fc381000da8 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc +++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger.mpc @@ -1,14 +1,12 @@ // $Id$ // This file is generated with "generate_component_mpc.pl Messenger" -project(Messenge_idl_gen) : componentidldefaults, avoids_ccm_noevent { +project(Messenge_idl_gen) : ciaoidldefaults, avoids_ccm_noevent, anytypecode { custom_only = 1 idlflags += -Wb,stub_export_macro=MESSENGER_STUB_Export \ -Wb,stub_export_include=Messenger_stub_export.h \ -Wb,skel_export_macro=MESSENGER_SVNT_Export \ -Wb,skel_export_include=Messenger_svnt_export.h \ - -Wb,exec_export_macro=MESSENGER_EXEC_Export \ - -Wb,exec_export_include=Messenger_exec_export.h \ -Wb,svnt_export_macro=MESSENGER_SVNT_Export \ -Wb,svnt_export_include=Messenger_svnt_export.h \ @@ -20,16 +18,22 @@ project(Messenge_idl_gen) : componentidldefaults, avoids_ccm_noevent { project(Messenger_idl_gen) : componentidldefaults, avoids_ccm_noevent { after += Messenge_idl_gen custom_only = 1 - idlflags -= -Gxhst -Gxhsk -Gxhsv -Gxhex + idlflags -= -Gxhst -Gxhsk -Gxhsv idlflags += -Wb,stub_export_macro=MESSENGER_STUB_Export \ -Wb,stub_export_include=Messenger_stub_export.h \ -Wb,skel_export_macro=MESSENGER_SVNT_Export \ - -Wb,skel_export_include=Messenger_svnt_export.h + -Wb,skel_export_include=Messenger_svnt_export.h \ + -Wb,exec_export_macro=MESSENGER_EXEC_Export \ + -Wb,exec_export_include=Messenger_exec_export.h IDL_Files { - Runnable.idl + idlflags -= -Gxhex Publication.idl History.idl } + + IDL_Files { + Runnable.idl + } } project(Messenger_messenger_idl_gen) : componentidldefaults, avoids_ccm_noevent { @@ -56,7 +60,6 @@ project(Messenger_lem_gen) : ciaoidldefaults, avoids_ccm_noevent { MessengerE.idl RunnableE.idl PublicationE.idl - MessageE.idl HistoryE.idl } } @@ -110,7 +113,6 @@ project(Messenger_exec) : ciao_executor, avoids_ccm_noevent { MessengerEC.cpp RunnableEC.cpp PublicationEC.cpp - MessageEC.cpp HistoryEC.cpp Messenger_exec_i.cpp Publication_exec_i.cpp diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp index fe205131e97..eef2a8b6a61 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp +++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp @@ -122,25 +122,13 @@ namespace CIAO_Messenger_Impl ::CCM_Publication_ptr Messenger_exec_i::get_content () { - // Your code here. - - // MY CODE - - // bump up ref count because we give up ownership when we return this - this->content_->_add_ref(); - return this->content_; + return ::CCM_Publication::_duplicate (this->content_); } ::CCM_History_ptr Messenger_exec_i::get_message_history () { - // Your code here. - - // MY CODE - - // bump up ref count because we give up ownership when we return this - this->history_->_add_ref(); - return this->history_; + return ::CCM_History::_duplicate (this->history_); } // Operations from Components::SessionComponent diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h index 50e53e211ff..406996d4f47 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h +++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.h @@ -42,7 +42,7 @@ namespace CIAO_Messenger_Impl class Publication_exec_i; class History_exec_i; - class MESSENGER_EXEC_Export Messenger_exec_i + class Messenger_exec_i : public virtual Messenger_Exec, public virtual ::CORBA::LocalObject, public virtual ACE_Task_Base @@ -97,7 +97,7 @@ namespace CIAO_Messenger_Impl extern "C" MESSENGER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Messenger_Impl (void); - class MESSENGER_EXEC_Export MessengerHome_exec_i + class MessengerHome_exec_i : public virtual MessengerHome_Exec, public virtual ::CORBA::LocalObject { diff --git a/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h b/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h index a42f79f36b7..7ef677e9f02 100644 --- a/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h +++ b/CIAO/examples/DevGuideExamples/Messenger/Receiver_exec_i.h @@ -34,7 +34,7 @@ namespace CIAO_Receiver_Impl { - class RECEIVER_EXEC_Export Receiver_exec_i + class Receiver_exec_i : public virtual Receiver_Exec, public virtual ::CORBA::LocalObject { @@ -70,7 +70,7 @@ namespace CIAO_Receiver_Impl extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr create_Receiver_Impl (void); - class RECEIVER_EXEC_Export ReceiverHome_exec_i + class ReceiverHome_exec_i : public virtual ReceiverHome_Exec, public virtual ::CORBA::LocalObject { diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl index 5a683f72a4e..ed00c7e856c 100755 --- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl +++ b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl @@ -107,7 +107,4 @@ $EM->Kill(); $tg->DeleteFile ($embase); $tg->DeleteFile ($plior); -# in case shutdown did not perform as expected -$tg->KillAll ('ciao_componentserver'); - exit 0; -- cgit v1.2.1