From ff54435135da5d82af0399106405218e56b61ee3 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 11 Dec 2008 05:24:36 +0000 Subject: --- flat/CIAO/DAnCE/Interfaces/README | 2 +- flat/CIAO/DAnCE/Utils/Plan_Handler.cpp | 2 +- flat/CIAO/ciao/Client_init.cpp | 42 +++++++++++----------- flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl | 8 ++--- .../ciao/ComponentServer/CIAO_ComponentServer.idl | 3 +- .../ciao/ComponentServer/CIAO_ComponentServer.mpc | 2 ++ flat/CIAO/ciao/Containers/Container_Base.h | 10 +++--- flat/CIAO/ciao/Contexts/Context.mpc | 2 +- 8 files changed, 36 insertions(+), 35 deletions(-) diff --git a/flat/CIAO/DAnCE/Interfaces/README b/flat/CIAO/DAnCE/Interfaces/README index 0118689ad70..e2ca262a62f 100644 --- a/flat/CIAO/DAnCE/Interfaces/README +++ b/flat/CIAO/DAnCE/Interfaces/README @@ -1,2 +1,2 @@ To resolve the MPC issue of directory dependency, we have to put some IDL -files into a separate directory. This directory servers for this purpose. +files into a separate directory. This directory serves for this purpose. diff --git a/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp b/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp index c72e61a1378..cef28ead45e 100644 --- a/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp +++ b/flat/CIAO/DAnCE/Utils/Plan_Handler.cpp @@ -28,7 +28,7 @@ namespace DAnCE ::Deployment::MonolithicDeploymentDescriptions implementation = deployment_plan.implementation; - CORBA::ULong i; + CORBA::ULong i = 0; for (i = 0; i < implementation.length(); ++i) if (ACE_OS::strcmp (implementation[i].name.in(), impl_name) == 0) break; diff --git a/flat/CIAO/ciao/Client_init.cpp b/flat/CIAO/ciao/Client_init.cpp index 71392596fa0..8528cd1ad5f 100644 --- a/flat/CIAO/ciao/Client_init.cpp +++ b/flat/CIAO/ciao/Client_init.cpp @@ -46,21 +46,21 @@ namespace CIAO for (CORBA::ULong i = 0; i < config.length (); ++i) { - int retval = map.rebind (config[i]->name (), config[i]->value ()); + int retval = map.rebind (config[i]->name (), config[i]->value ()); - if (retval == 1) - { - CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Duplicate value for %C encountered, " - "old value overwritten.\n", - config[i]->name ())); - } - else if (retval == -1) - { - CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Error binding value for %C, ignoring.\n", - config[i]->name ())); - } - CIAO_DEBUG ((LM_TRACE, CLINFO - "build_config_values_map: Bound value for config value %C\n", + if (retval == 1) + { + CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Duplicate value for %C encountered, " + "old value overwritten.\n", + config[i]->name ())); + } + else if (retval == -1) + { + CIAO_ERROR ((LM_WARNING, CLINFO "build_config_values_map: Error binding value for %C, ignoring.\n", + config[i]->name ())); + } + CIAO_DEBUG ((LM_TRACE, CLINFO + "build_config_values_map: Bound value for config value %C\n", config[i]->name ())); } } @@ -76,13 +76,13 @@ namespace CIAO for (CONFIGVALUE_MAP::const_iterator i = map.begin (); (i.advance ()) != 0; ++pos) - { - Components::ConfigValue_var newval; - ACE_NEW_THROW_EX (newval, - ConfigValue_impl (i->ext_id_.c_str (), i->int_id_), - CORBA::NO_MEMORY ()); - config[pos] = newval._retn (); - } + { + Components::ConfigValue_var newval; + ACE_NEW_THROW_EX (newval, + ConfigValue_impl (i->ext_id_.c_str (), i->int_id_), + CORBA::NO_MEMORY ()); + config[pos] = newval._retn (); + } } /* diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl b/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl index 883c87450d3..a8d30a796e3 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl +++ b/flat/CIAO/ciao/ComponentServer/CIAO_CS_Client.idl @@ -17,10 +17,10 @@ module CIAO { interface ServerActivator : ::Components::Deployment::ServerActivator { - /// Used by spawned component servers to notify the server - /// activator of their object reference and retrieve - /// configuration information. - void component_server_callback (in ::Components::Deployment::ComponentServer serverref, + /// Used by spawned component servers to notify the server + /// activator of their object reference and retrieve + /// configuration information. + void component_server_callback (in ::Components::Deployment::ComponentServer serverref, in string server_UUID, out ::Components::ConfigValues config); diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl index 95750dd486e..a0a5de6514a 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl +++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.idl @@ -40,8 +40,7 @@ module CIAO ::Components::Deployment::ImplEntryPointNotFound, ::Components::Deployment::InstallationFailure, ::Components::Deployment::InvalidConfiguration); - - + /// Activate component with specified ID, if no ID provided, /// activates all components. void activate_component (in ::Components::CCMObject comp) diff --git a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc index ef697eba79c..24b9500d1bb 100644 --- a/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc +++ b/flat/CIAO/ciao/ComponentServer/CIAO_ComponentServer.mpc @@ -92,6 +92,8 @@ project(CIAO_ComponentServer_exe) : ccm_componentserver_svnt, portableserver, ci Source_Files { CIAO_ComponentServer.cpp } + Inline_Files { + } IDL_Files { } } diff --git a/flat/CIAO/ciao/Containers/Container_Base.h b/flat/CIAO/ciao/Containers/Container_Base.h index cadfc64d314..4efededf626 100644 --- a/flat/CIAO/ciao/Containers/Container_Base.h +++ b/flat/CIAO/ciao/Containers/Container_Base.h @@ -150,11 +150,11 @@ namespace CIAO }; } -// Macro for registration of an OBV factory in the generated -// servant class. Similar to the macro for TAO in -// tao/ValueType/ValueFactory.h but here we take advantage of -// the fact that we have access to the current ORB indirectly -// through the context and container. +/// Macro for registration of an OBV factory in the generated +/// servant class. Similar to the macro for TAO in +/// tao/ValueType/ValueFactory.h but here we take advantage of +/// the fact that we have access to the current ORB indirectly +/// through the context and container. #define CIAO_REGISTER_OBV_FACTORY(FACTORY, VALUETYPE) \ { \ CORBA::ValueFactory factory = new FACTORY; \ diff --git a/flat/CIAO/ciao/Contexts/Context.mpc b/flat/CIAO/ciao/Contexts/Context.mpc index 9c9de111467..e5618d4aec0 100644 --- a/flat/CIAO/ciao/Contexts/Context.mpc +++ b/flat/CIAO/ciao/Contexts/Context.mpc @@ -10,6 +10,6 @@ project(CIAO_Context_Impl) : ccm_svnt, ciao_container_base, portableserver { Context_Impl_export.h } Inline_Files { - Context_Impl_Base.cpp + Context_Impl_Base.inl } } -- cgit v1.2.1