diff options
Diffstat (limited to 'TAO/tao/ValueFactory_Map.cpp')
| -rw-r--r-- | TAO/tao/ValueFactory_Map.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/TAO/tao/ValueFactory_Map.cpp b/TAO/tao/ValueFactory_Map.cpp index 347d6bde062..c56a85c8dc2 100644 --- a/TAO/tao/ValueFactory_Map.cpp +++ b/TAO/tao/ValueFactory_Map.cpp @@ -61,11 +61,9 @@ TAO_ValueFactory_Map::rebind (const char *repo_id, // --- but must be recursive const char *prev_repo_id; CORBA_ValueFactory_ptr prev_factory; - int ret = 0; - ret = this->map_.rebind (CORBA::string_dup (repo_id), - factory, - prev_repo_id, - prev_factory); + int ret = this->map_.rebind (CORBA::string_dup (repo_id), + factory, + prev_repo_id, prev_factory); if (ret > -1) // ok, no error { factory->_add_ref (); // The map owns one reference. @@ -84,9 +82,7 @@ TAO_ValueFactory_Map::unbind (const char *repo_id, { // ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr> *prev_entry; FACTORY_MAP_MANAGER::ENTRY *prev_entry; - int ret = 0; - ret = this->map_.find (repo_id, - prev_entry); + int ret = this->map_.find (repo_id, prev_entry); if (ret == 0) // there was a matching factory { // set factory to the previous factory, @@ -106,9 +102,7 @@ int TAO_ValueFactory_Map::find (const char *repo_id, CORBA_ValueFactory_ptr &factory) { - int ret = 0; - ret = this->map_.find (repo_id, - factory); + int ret = this->map_.find (repo_id, factory); // %! this must be guarded to be atomic !!!!!!!!!!!!!!!!!! if (ret > -1) { |