diff options
Diffstat (limited to 'ACE/ace/Service_Gestalt.inl')
| -rw-r--r-- | ACE/ace/Service_Gestalt.inl | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/ACE/ace/Service_Gestalt.inl b/ACE/ace/Service_Gestalt.inl index db9e9ad6d80..9897b83c681 100644 --- a/ACE/ace/Service_Gestalt.inl +++ b/ACE/ace/Service_Gestalt.inl @@ -12,9 +12,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE int ACE_Service_Gestalt::open (const ACE_TCHAR program_name[], const ACE_TCHAR *logger_key, - bool ignore_static_svcs, - bool ignore_default_svc_conf, - bool ignore_debug_flag) + int ignore_static_svcs, + int ignore_default_svc_conf, + int ignore_debug_flag) { ACE_TRACE ("ACE_Service_Gestalt::open"); this->no_static_svcs_ = ignore_static_svcs; @@ -30,9 +30,9 @@ ACE_INLINE int ACE_Service_Gestalt::open (int argc, ACE_TCHAR *argv[], const ACE_TCHAR *logger_key, - bool ignore_static_svcs, - bool ignore_default_svc_conf, - bool ignore_debug_flag) + int ignore_static_svcs, + int ignore_default_svc_conf, + int ignore_debug_flag) { ACE_TRACE ("ACE_Service_Gestalt::open"); this->no_static_svcs_ = ignore_static_svcs; @@ -55,14 +55,8 @@ ACE_Service_Gestalt::find (const ACE_TCHAR name[], const ACE_Service_Type **srp, int ignore_suspended) const { - // Closing the gestalt will have disassociated it from the - // repository. If the repository used to be owned by the gestalt, it - // will also have been destroyed - so just check for repo_ before - // doing anything with it. - if (this->repo_ != 0) - return this->repo_->find (name, srp, ignore_suspended); - - return 0; + ACE_ASSERT (this->repo_ != 0); + return this->repo_->find (name, srp, ignore_suspended); } |