From d8ad205eaec751849d65709265c89087912cb58a Mon Sep 17 00:00:00 2001 From: nanbor Date: Sat, 12 Apr 2003 15:50:16 +0000 Subject: *** empty log message *** --- TAO/CIAO/ChangeLog | 13 ++++++++ .../docs/templates/CIAO_Glue_Session_Template.cpp | 10 +++--- .../docs/templates/CIAO_Glue_Session_Template.inl | 2 +- .../Display/descriptors/CIAO_Installation_Data.ini | 6 ++-- .../tools/Assembly_Deployer/Assembly_Manager.cpp | 6 ++-- TAO/CIAO/tools/ComponentServer/ComponentServer.cpp | 8 ++--- .../ComponentServer_test_client.cpp | 4 +-- TAO/CIAO/tools/Daemon/CIAO_Daemon.cpp | 12 +++---- .../Simple_Component_Server.cpp | 39 +++++++++++----------- 9 files changed, 56 insertions(+), 44 deletions(-) diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index b27825bb164..efa8ee3830e 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,16 @@ +Sat Apr 12 10:48:13 2003 Nanbor Wang + + * docs/templates/CIAO_Glue_Session_Template.cpp: + * docs/templates/CIAO_Glue_Session_Template.inl: Incorporated + changes for fixing gcc compilation warnings. + + * tools/Assembly_Deployer/Assembly_Manager.cpp: + * tools/ComponentServer/ComponentServer.cpp: + * tools/ComponentServer/ComponentServer_test_client.cpp: + * tools/Daemon/CIAO_Daemon.cpp: + * tools/Simple_Component_Server/Simple_Component_Server.cpp: Added + misiing newlines in usage messages. + Sat Apr 12 01:25:35 2003 Nanbor Wang * CIDLC/parser_examples/README: diff --git a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp index 376d6e3ffdb..6168d3db958 100644 --- a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp +++ b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.cpp @@ -37,13 +37,13 @@ CORBA::Object_ptr ACE_THROW_SPEC ((CORBA::SystemException)) { ::Components::SessionContext_var sc = - ::Components::SessionContext::_narrow (this->ctx_); + ::Components::SessionContext::_narrow (this->ctx_.in ()); if (! CORBA::is_nil(sc.in ())) return sc->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER); ::Components::EntityContext_var ec = - ::Components::EntityContext::_narrow (this->ctx_); + ::Components::EntityContext::_narrow (this->ctx_.in ()); if (! CORBA::is_nil(ec.in ())) return ec->get_CCM_object (ACE_ENV_SINGLE_ARG_PARAMETER); @@ -401,15 +401,15 @@ void if (CORBA::is_nil (this->consumes_[consumer name]_.in ())) { [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant *svt = - new [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant (this->executor_, - this->context_); + new [ciao module name]::[component name]_Servant::[eventtype]Consumer_[consumer name]_Servant (this->executor_.in (), + this->context_); PortableServer::ServantBase_var safe_servant (svt); CORBA::Object_var obj = this->container_->install_servant (svt ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - [eventtype]Consumer_var eco = [eventtype]Consumer::_narrow (obj + [eventtype]Consumer_var eco = [eventtype]Consumer::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); diff --git a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.inl b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.inl index 9c816d06688..0df2a043875 100644 --- a/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.inl +++ b/TAO/CIAO/docs/templates/CIAO_Glue_Session_Template.inl @@ -28,7 +28,7 @@ ACE_INLINE [ciao module name]::[facet type]_Servant::[facet type]_Servant (CCM_[facet type]_ptr executor, ::Components::CCMContext_ptr c) : executor_ (CCM_[facet type]::_duplicate (executor)), - ctx_ (c) + ctx_ (Components::CCMContext::_duplicate (c)) { } diff --git a/TAO/CIAO/examples/handcrafted/Display/descriptors/CIAO_Installation_Data.ini b/TAO/CIAO/examples/handcrafted/Display/descriptors/CIAO_Installation_Data.ini index 21919e4e9bb..245a0c5e4d9 100644 --- a/TAO/CIAO/examples/handcrafted/Display/descriptors/CIAO_Installation_Data.ini +++ b/TAO/CIAO/examples/handcrafted/Display/descriptors/CIAO_Installation_Data.ini @@ -1,9 +1,9 @@ [ComponentInstallation] DCE:75309233-0E0A-4cfb-B186-3E99F69B1D40=GPS_svnt DCE:82C2B032-37F0-4315-A59F-7020D3264E4D=RateGen_exec +DCE:8E92655E-CA07-46C8-B127-0F0872A8CC29=GPS_tracing_exec DCE:93D254CF-9538-44e8-BB98-AABCD134ADD3=RateGen_svnt -DCE:8E6C468D-A39F-46b4-962B-265F1AA8D538=NavDisplay_exec DCE:CDC06FCA-50FC-43ca-8ECC-BEFBD33FEE78=NavDisplay_svnt -DCE:3148F760-F2ED-4204-A775-6B972C10E8CB=GPS_exec -DCE:8E92655E-CA07-46C8-B127-0F0872A8CC29=GPS_tracing_exec +DCE:8E6C468D-A39F-46b4-962B-265F1AA8D538=NavDisplay_exec DCE:D7984625-8561-431d-9927-4E498B317C02=NavDisplayGUI_exec +DCE:3148F760-F2ED-4204-A775-6B972C10E8CB=GPS_exec diff --git a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp index 6c9663ac3a5..054463da46b 100644 --- a/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp +++ b/TAO/CIAO/tools/Assembly_Deployer/Assembly_Manager.cpp @@ -39,9 +39,9 @@ parse_args (int argc, char *argv[]) case '?': // display help for use of the server. default: ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s" - "-c " - "-o " + "usage: %s\n" + "-c \n" + "-o \n" "\n", argv [0]), -1); diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp index aa9cd419509..16c1877b822 100644 --- a/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp +++ b/TAO/CIAO/tools/ComponentServer/ComponentServer.cpp @@ -43,10 +43,10 @@ parse_args (int argc, char *argv[]) case '?': // display help for use of the server. default: ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s" - "-n Don't not try to callback ServerActivator (testing)" - "-o " - "-k " + "usage: %s\n" + "-n Don't not try to callback ServerActivator (testing)\n" + "-o \n" + "-k \n" "\n", argv [0]), -1); diff --git a/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp b/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp index 10988b52018..4024f96a024 100644 --- a/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp +++ b/TAO/CIAO/tools/ComponentServer/ComponentServer_test_client.cpp @@ -22,8 +22,8 @@ parse_args (int argc, char *argv[]) case '?': default: ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k " + "usage: %s \n" + "-k \n" "\n", argv [0]), -1); diff --git a/TAO/CIAO/tools/Daemon/CIAO_Daemon.cpp b/TAO/CIAO/tools/Daemon/CIAO_Daemon.cpp index 3a43a803ccb..4f2494bdbc3 100644 --- a/TAO/CIAO/tools/Daemon/CIAO_Daemon.cpp +++ b/TAO/CIAO/tools/Daemon/CIAO_Daemon.cpp @@ -58,12 +58,12 @@ parse_args (int argc, char *argv[]) case '?': // display help for use of the server. default: ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s" - "-n " - "-o " - "-d