diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-05-02 07:31:52 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-05-02 07:31:52 +0000 |
| commit | 9738a1e728a49c1959154a0307f9027da307d36f (patch) | |
| tree | ba7991eef50738cb3de01657f3cd057bc10b9595 | |
| parent | dea7b81a306ea73711a626463b9029f16d2eaa1a (diff) | |
| download | ATCD-9738a1e728a49c1959154a0307f9027da307d36f.tar.gz | |
ChangeLogTag: Mon May 2 07:13:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 2 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp | 2 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 02f736c708b..211665b2f1e 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -4,6 +4,8 @@ Mon May 2 07:19:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tools/Assembly_Deployer/Assembly_Impl.cpp: * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp: + * DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp: + * DAnCE/ciao/Dynamic_Component_Servant_T.cpp: Fixed gcc 4 warnings Sat May 1 03:11:17 2005 Jaiganesh B <jai@dre.vanderbilt.edu> diff --git a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp index 82af0de5b3f..f4e2263cbd6 100644 --- a/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Dynamic_Component_Servant_T.cpp @@ -67,7 +67,7 @@ namespace CIAO // having a list of servants and you turn on a bit. What is the // granularity of the bit? Looks like its too coarse. Do you see // what I am saying? - COMP_SVNT *servant; + COMP_SVNT *servant = 0; if (this->servant_map_.find (oid, servant) == 0) { servant->remove (); diff --git a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp index 41af227b6ca..21334d6c109 100644 --- a/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp +++ b/TAO/CIAO/DAnCE/ciao/Swapping_Servant_Home_Impl_T.cpp @@ -25,10 +25,10 @@ namespace CIAO COMP_EXEC_VAR, COMP_SVNT>::Swapping_Home_Servant_Impl ( EXEC * exe, - Session_Container * c, + Session_Container * c, const char* ins_name, const char* obj_id, const char* repo_id) : Home_Servant_Impl_Base (c), - executor_ (EXEC::_duplicate (exe)), + executor_ (EXEC::_duplicate (exe)), ins_name_ (ins_name), obj_id_ (obj_id), repo_id_ (repo_id) { } @@ -50,7 +50,7 @@ namespace CIAO COMP_EXEC_VAR, COMP_SVNT>::~Swapping_Home_Servant_Impl () { - const DYNAMIC_SERVANT_MAP_ITERATOR end = + const DYNAMIC_SERVANT_MAP_ITERATOR end = this->dynamic_servant_map_.end (); PortableServer::ObjectId_var oid = @@ -68,7 +68,7 @@ namespace CIAO } ACE_ENDTRY; - for (DYNAMIC_SERVANT_MAP_ITERATOR iter = + for (DYNAMIC_SERVANT_MAP_ITERATOR iter = this->dynamic_servant_map_.begin (); iter != end; ++iter) { @@ -95,7 +95,7 @@ namespace CIAO COMP_EXEC, COMP_EXEC_VAR, COMP_SVNT>::remove_component ( - ::Components::CCMObject_ptr + ::Components::CCMObject_ptr ACE_ENV_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException, @@ -104,7 +104,7 @@ namespace CIAO PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId (this->obj_id_); - Dynamic_Component_Servant_Base *servant; + Dynamic_Component_Servant_Base *servant = 0; if (this->dynamic_servant_map_.find (oid, servant) == 0) { servant->destroy (oid); @@ -258,7 +258,7 @@ namespace CIAO COMP_SVNT>::update_component_map ( PortableServer::ObjectId &oid) { - Dynamic_Component_Servant_Base *servant; + Dynamic_Component_Servant_Base *servant = 0; if (this->dynamic_servant_map_.find (oid, servant) == 0) { servant->update_destroy_count (); |