diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2007-02-19 19:33:08 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2007-02-19 19:33:08 +0000 |
| commit | c86359f8aa429c549716eb9a72ff13bd486e9100 (patch) | |
| tree | 1aa0bf78518556b4dad21ba443d158fcf8e5f69a | |
| parent | 40bd4b6b298509fa9f5d952961682eecb10e07f8 (diff) | |
| download | ATCD-c86359f8aa429c549716eb9a72ff13bd486e9100.tar.gz | |
ChangeLogTag:Mon Feb 19 19:20:35 UTC 2007 William R. Otte <wotte@dre.vanderbilt.edu>
| -rw-r--r-- | ciao_core_2/CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | ciao_core_2/CIAO/ciao/CCM_Context.idl | 3 | ||||
| -rw-r--r-- | ciao_core_2/CIAO/ciao/Container_Base.cpp | 24 |
3 files changed, 20 insertions, 17 deletions
diff --git a/ciao_core_2/CIAO/ChangeLog b/ciao_core_2/CIAO/ChangeLog index 66886b319cf..5be5fc23877 100644 --- a/ciao_core_2/CIAO/ChangeLog +++ b/ciao_core_2/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Mon Feb 19 19:32:34 UTC 2007 William R. Otte <wotte@dre.vanderbilt.edu> + + * ciao/Container_Base.cpp + + Cosmetic format changes. + + * ciao/CCM_Context.idl + + re-added removed comment. + Mon Feb 19 19:25:06 UTC 2007 William R. Otte <wotte@dre.vanderbilt.edu> * ccd.hpp diff --git a/ciao_core_2/CIAO/ciao/CCM_Context.idl b/ciao_core_2/CIAO/ciao/CCM_Context.idl index 652a4791724..8b94ec35d2a 100644 --- a/ciao_core_2/CIAO/ciao/CCM_Context.idl +++ b/ciao_core_2/CIAO/ciao/CCM_Context.idl @@ -33,7 +33,8 @@ module Components void set_rollback_only() raises (IllegalState); - + + // QoS4CCM Object resolve_service_reference(in string service_id); }; diff --git a/ciao_core_2/CIAO/ciao/Container_Base.cpp b/ciao_core_2/CIAO/ciao/Container_Base.cpp index 593757bc493..0695773c4fe 100644 --- a/ciao_core_2/CIAO/ciao/Container_Base.cpp +++ b/ciao_core_2/CIAO/ciao/Container_Base.cpp @@ -307,7 +307,7 @@ namespace CIAO ACE_THROW_RETURN (Deployment::UnknownImplId ( "Session_Container::ciao_install_home", - exception.c_str ()), + exception.c_str ()), Components::CCMHome::_nil ()); } @@ -401,16 +401,12 @@ namespace CIAO } ACE_CString exe_entrypt_str (exe_entrypt); - static_entrypts_maps_->home_creator_funcptr_map_->find ( - exe_entrypt_str, - hcreator - ); + static_entrypts_maps_->home_creator_funcptr_map_->find (exe_entrypt_str, + hcreator); ACE_CString sv_entrypt_str (sv_entrypt); - static_entrypts_maps_->home_servant_creator_funcptr_map_->find ( - sv_entrypt_str, - screator - ); + static_entrypts_maps_->home_servant_creator_funcptr_map_->find (sv_entrypt_str, + screator); } if (hcreator == 0 || screator == 0) @@ -545,10 +541,8 @@ namespace CIAO } void - Session_Container::add_servant_map ( - PortableServer::ObjectId &, - Dynamic_Component_Servant_Base* - ) + Session_Container::add_servant_map (PortableServer::ObjectId &, + Dynamic_Component_Servant_Base*) { CIAO_TRACE ("Session_Container::add_servant_map"); } @@ -561,9 +555,7 @@ namespace CIAO } void - Session_Container::delete_servant_map ( - PortableServer::ObjectId & - ) + Session_Container::delete_servant_map (PortableServer::ObjectId &) { CIAO_TRACE ("Session_Container::delete_servant_map"); } |