diff options
| author | johnsonb <johnsonb@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-08 20:53:14 +0000 |
|---|---|---|
| committer | johnsonb <johnsonb@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-01-08 20:53:14 +0000 |
| commit | d7d67ad177f42ceadeb1013bdd02d4537d7c023f (patch) | |
| tree | f8eaaa066cfdd9d86c38bc8ca5b2438c89eb7c86 | |
| parent | b2d764afd1f7d7b5ece9f7437ad4b7694fa058f2 (diff) | |
| download | ATCD-d7d67ad177f42ceadeb1013bdd02d4537d7c023f.tar.gz | |
ChangeLogTag: Tue Jan 8 20:52:42 UTC 2013 Brian Johnson <johnsonb@ociweb.com>
| -rw-r--r-- | TAO/OCI_RE_ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog index fea3e08b38a..05733778d9a 100644 --- a/TAO/OCI_RE_ChangeLog +++ b/TAO/OCI_RE_ChangeLog @@ -1,3 +1,10 @@ +Tue Jan 8 20:52:42 UTC 2013 Brian Johnson <johnsonb@ociweb.com> + + * orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp: + * orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp: + + Removed unused parameters. + Tue Jan 8 20:44:08 UTC 2013 Brian Johnson <johnsonb@ociweb.com> * orbsvcs/tests/ImplRepo/run_test.pl: diff --git a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp index e903d2f6497..8f9ed991ad3 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Shared_Backing_Store.cpp @@ -951,10 +951,10 @@ Shared_Backing_Store::load_server ( bool server_started, const NameValues& extra_params) { - const ServerUIMap::ENTRY& entry = - unique_id(server_name, this->repo_values_, extra_params, - this->server_uids_, this->imr_type_, this->repo_id_, - this->opts_.debug()); + // ensure there is an entry for this server + unique_id(server_name, this->repo_values_, extra_params, + this->server_uids_, this->imr_type_, this->repo_id_, + this->opts_.debug()); Server_Info_Ptr si; const bool new_server = (this->servers ().find (server_name, si) != 0); diff --git a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp index 76852ec8fe3..e4eaa33a4b4 100644 --- a/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/XML_Backing_Store.cpp @@ -291,7 +291,7 @@ void XML_Backing_Store::load_activator (const ACE_CString& activator_name, long token, const ACE_CString& ior, - const NameValues& extra_params) + const NameValues& ) { Activator_Info_Ptr info (new Activator_Info (activator_name, token, ior)); this->activators().rebind(activator_name, info); |