summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-03-27 13:43:50 +0000
committeriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-03-27 13:43:50 +0000
commit6fc18c89e8aae52694f20ecac79a68d8882e4614 (patch)
tree816d941776976c57f48a53f19966e99fe80a4f12
parentc3d190fbefbd539cb4af89534ca98b428e76a54e (diff)
downloadATCD-6fc18c89e8aae52694f20ecac79a68d8882e4614.tar.gz
ChangeLogTag: Thu Mar 27 13:42:23 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
-rw-r--r--ACE/ChangeLog.iliyan-gestalt14
-rw-r--r--ACE/ace/Service_Config.h2
-rw-r--r--ACE/ace/String_Base.cpp2
3 files changed, 15 insertions, 3 deletions
diff --git a/ACE/ChangeLog.iliyan-gestalt b/ACE/ChangeLog.iliyan-gestalt
index 88d71a43916..ee970cde1b6 100644
--- a/ACE/ChangeLog.iliyan-gestalt
+++ b/ACE/ChangeLog.iliyan-gestalt
@@ -1,3 +1,14 @@
+Thu Mar 27 13:42:23 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
+
+ * ace/Service_Config.h:
+
+ Replacing the use of a "magic" number for the service repository
+ size with the appropriate #define
+
+ * ace/String_Base.cpp:
+
+ Discarding an unnecessary change
+
Tue Mar 25 16:44:29 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
* examples/ASX/CCM_App/ASX_CCM_App.mpc:
@@ -75,7 +86,8 @@ Thu Mar 20 19:42:06 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
DLL were being unloaded prematurely. The change was based on
Service_Type_Dynamic_Guard stack based instances, capturing the
intended position of a DLL-based service. As the DLL service
- loaded, it was purposely inserted at the saved position. Combined
+ loaded, i
+ t was purposely inserted at the saved position. Combined
with a reversing the order of finalization, that _almost_ worked.
Later, the concept was enhanced with a mechanism that relies on
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index 181803da6a1..57c004e66c4 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -214,7 +214,7 @@ public:
* registered when the repository is opened.
*/
ACE_Service_Config (bool ignore_static_svcs = true,
- size_t size = 1024,
+ size_t size = ACE_DEFAULT_SERVICE_REPOSITORY_SIZE,
int signum = SIGHUP);
/**
diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp
index 1a87bd87b92..12850c9c29a 100644
--- a/ACE/ace/String_Base.cpp
+++ b/ACE/ace/String_Base.cpp
@@ -131,7 +131,7 @@ ACE_String_Base<CHAR>::set (const CHAR *s,
bool release)
{
// Case 1. Going from memory to more memory
- size_type new_buf_len = len + 1 + sizeof (int);
+ size_type new_buf_len = len + 1;
if (s != 0 && len != 0 && release && this->buf_len_ < new_buf_len)
{
CHAR *temp;