diff options
Diffstat (limited to 'TAO/tao/PortableServer/Active_Object_Map.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Active_Object_Map.cpp | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp index b5822a2d438..a0996627247 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.cpp +++ b/TAO/tao/PortableServer/Active_Object_Map.cpp @@ -322,37 +322,32 @@ TAO_Active_Object_Map::~TAO_Active_Object_Map (void) delete this->user_id_map_; } -int +bool TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_id, CORBA::Short priority, - int &priorities_match, - int &deactivated) + bool &priorities_match, + bool &deactivated) { TAO_Active_Object_Map_Entry *entry = 0; - int result = this->user_id_map_->find (user_id, - entry); - if (result == 0) + bool result = false; + int const find_result = this->user_id_map_->find (user_id, + entry); + if (find_result == 0) { if (entry->servant_ == 0) { - result = 0; - if (entry->priority_ != priority) - priorities_match = 0; + priorities_match = false; } else { - result = 1; + result = true; if (entry->deactivated_) { - deactivated = 1; + deactivated = true; } } } - else - { - result = 0; - } return result; } @@ -371,7 +366,7 @@ TAO_Id_Uniqueness_Strategy::set_active_object_map (TAO_Active_Object_Map *active int TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant, - int &deactivated) + bool &deactivated) { TAO_Active_Object_Map_Entry *entry = 0; int result = this->active_object_map_->servant_map_->find (servant, @@ -381,7 +376,7 @@ TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant, result = 1; if (entry->deactivated_) { - deactivated = 1; + deactivated = true; } } else @@ -528,7 +523,7 @@ TAO_Unique_Id_Strategy::remaining_activations (PortableServer::Servant servant) int TAO_Multiple_Id_Strategy::is_servant_in_map (PortableServer::Servant, - int &) + bool &) { return -1; } |