diff options
| author | Steve Huston <shuston@riverace.com> | 2007-02-16 12:49:01 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2007-02-16 12:49:01 +0000 |
| commit | c7daf70142c51620783c75be84c1c8e319c45ec2 (patch) | |
| tree | d6a920b868131b314ac4281d81803741f80ca86d | |
| parent | 2323f6092abd64d05e57161fb6571d713c88166f (diff) | |
| download | ATCD-c7daf70142c51620783c75be84c1c8e319c45ec2.tar.gz | |
ChangeLogTag:Fri Feb 16 12:47:03 UTC 2007 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/ace/Service_Config.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/Service_Config.h | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 621e6d67569..621a12b9fc4 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,11 @@ +Fri Feb 16 12:47:03 UTC 2007 Steve Huston <shuston@localhost.localdomain> + + * ace/Service_Config.cpp (global): Removed the ACE_INLINE qualifier + from global() - if it's in the .cpp file, it shouldn't be marked + as inline, and isn't marked thusly in the .h file. Fixes unsats. + + * ace/Service_Config.h: Fixed spelling error. + Thu Feb 15 20:04:01 UTC 2007 Ossama Othman <ossama_othman at symantec dot com> * ace/OS_NS_stdlib.cpp (mkstemp_emulation): diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp index 94cc1cfb9c0..7a2d958d854 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -336,9 +336,9 @@ ACE_Service_Config::static_svcs (void) return ACE_Service_Config::instance (); } -/// Return the global configuration instance. Allways returns the same +/// Return the global configuration instance. Always returns the same /// instance -ACE_INLINE ACE_Service_Config * +ACE_Service_Config * ACE_Service_Config::global (void) { return ACE_SERVICE_CONFIG_SINGLETON::instance (); diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index f6c7e5f0975..423e174d6fe 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -144,7 +144,7 @@ public: * * Another facet of ACE_Service_Config is that for a given thread, * it provides access to its current, process-global - * ACE_Service_Gestalt instance through its curent() method. + * ACE_Service_Gestalt instance through its current() method. * * @note The signal_handler_ static member is allocated by the * ACE_Object_Manager. The ACE_Service_Config constructor |