summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-02-17 00:07:40 +0000
committeriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-02-17 00:07:40 +0000
commitdcd3d77e0c9c0255c5d50d2df96f0c86ca3fdc9d (patch)
treeb0dd102196465ad93057ae3e83b497dfeca73d17
parent58c15cbcd2faef5841c90a7cda7e0448c6ad45be (diff)
downloadATCD-dcd3d77e0c9c0255c5d50d2df96f0c86ca3fdc9d.tar.gz
ChangeLogTag: Fri Feb 16 23:48:55 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>
-rw-r--r--ACE/ChangeLog12
-rw-r--r--ACE/ace/Service_Config.cpp2
2 files changed, 10 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index deb9e160d90..d9ef7ca67ec 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 16 23:48:55 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>
+
+ * ace/Service_Config.cpp:
+
+ ACE_INLINE makes sense in .inl files (thanks Steve)
+
Fri Feb 16 13:38:04 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>
* ace/Dynamic_Service_Base.cpp:
@@ -12,13 +18,13 @@ Fri Feb 16 13:38:04 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>
Reverting my changes since "Tue Feb 13 15:35:54 UTC 2007" as it
has been causing problems, in particular with borland and
no-threads builds.
-
+
Fri Feb 16 12:47:03 UTC 2007 Steve Huston <shuston@riverace.com>
* 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>
@@ -30,7 +36,7 @@ Thu Feb 15 20:04:01 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>
up being used for different processes and/or threads, resulting
in identical filenames being generated.
- Addressed potential race condition on platforms that do not
+ Addressed potential race condition on platforms that do not
inline the value of ACE_Numeric_Limits<>::max().
Thu Feb 15 17:53:53 UTC 2007 Krishnakumar B <kitty@nospam.invalid.domain>
diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp
index 94cc1cfb9c0..8da4ad45aeb 100644
--- a/ACE/ace/Service_Config.cpp
+++ b/ACE/ace/Service_Config.cpp
@@ -338,7 +338,7 @@ ACE_Service_Config::static_svcs (void)
/// Return the global configuration instance. Allways returns the same
/// instance
-ACE_INLINE ACE_Service_Config *
+ACE_Service_Config *
ACE_Service_Config::global (void)
{
return ACE_SERVICE_CONFIG_SINGLETON::instance ();