diff options
Diffstat (limited to 'ACE/ace/Service_Config.inl')
| -rw-r--r-- | ACE/ace/Service_Config.inl | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ACE/ace/Service_Config.inl b/ACE/ace/Service_Config.inl index c0cd157d566..ec07c3847a7 100644 --- a/ACE/ace/Service_Config.inl +++ b/ACE/ace/Service_Config.inl @@ -52,15 +52,6 @@ ACE_Service_Config::parse_args (int argc, ACE_TCHAR *argv[]) } -/// Return the global configuration instance. Allways returns the same -/// instance -ACE_INLINE ACE_Service_Gestalt * -ACE_Service_Config::global (void) -{ - return ACE_SERVICE_CONFIG_SINGLETON::instance (); -} - - /// Return the configuration instance, considered "global" in the /// current thread. This may be the same as instance(), but on some /// occasions, it may be a different one. For example, @@ -69,7 +60,7 @@ ACE_Service_Config::global (void) ACE_INLINE ACE_Service_Gestalt * ACE_Service_Config::instance (void) { - return ACE_SERVICE_CONFIG_SINGLETON::instance ()->tss_->ptr (); + return ACE_Service_Config::global ()->tss_->ptr (); } @@ -81,14 +72,14 @@ ACE_Service_Config::instance (void) ACE_INLINE ACE_Service_Gestalt * ACE_Service_Config::current (void) { - return ACE_SERVICE_CONFIG_SINGLETON::instance ()->tss_->ptr (); + return ACE_Service_Config::global ()->tss_->ptr (); } /// A mutator to set the "current" (TSS) gestalt instance. ACE_INLINE ACE_Service_Gestalt* ACE_Service_Config::current (ACE_Service_Gestalt *newcurrent) { - return ACE_SERVICE_CONFIG_SINGLETON::instance ()->tss_->ptr (newcurrent); + return ACE_Service_Config::global ()->tss_->ptr (newcurrent); } |