diff options
| author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-09-13 15:18:33 +0000 |
|---|---|---|
| committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-09-13 15:18:33 +0000 |
| commit | cde9d07d44b9f3c41afdae5bf2925a9aa14b71e2 (patch) | |
| tree | 5fc21382ab1fcee128e4da3c5714c95248488afa /ACE/ace/Metrics_Cache_T.cpp | |
| parent | 265473aac2c3804a357a8c67b28278e9a85d66d6 (diff) | |
| download | ATCD-cde9d07d44b9f3c41afdae5bf2925a9aa14b71e2.tar.gz | |
Thu Sep 13 15:17:28 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
Diffstat (limited to 'ACE/ace/Metrics_Cache_T.cpp')
| -rw-r--r-- | ACE/ace/Metrics_Cache_T.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/ACE/ace/Metrics_Cache_T.cpp b/ACE/ace/Metrics_Cache_T.cpp index a3850eb2237..285df4a9753 100644 --- a/ACE/ace/Metrics_Cache_T.cpp +++ b/ACE/ace/Metrics_Cache_T.cpp @@ -47,10 +47,10 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::ACE_Metrics_Timeprobe (u_int id, char * name_tmp = 0; ACE_NEW_MALLOC_ARRAY (name_tmp, - (char *) this->allocator ()->malloc (strlen(name)+1), + (char *) this->allocator ()->malloc (ACE_OS::strlen(name)+1), char, - strlen(name)+1); - ACE_OS::memcpy (name_tmp, name, strlen (name)+1); + ACE_OS::strlen(name)+1); + ACE_OS::memcpy (name_tmp, name, ACE_OS::strlen (name)+1); name_ = name_tmp; this->event_descriptions (event_description_strings, @@ -63,9 +63,8 @@ ACE_Metrics_Timeprobe (ALLOCATOR *alloc, u_int id, const char *name, u_long size) - : - ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR> (size), - id_ (id), + : ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR> (size), + id_ (id), name_ (0) { if (name == 0) @@ -75,10 +74,10 @@ ACE_Metrics_Timeprobe (ALLOCATOR *alloc, char * name_tmp = 0; ACE_NEW_MALLOC_ARRAY (name_tmp, - (char *) alloc->malloc(strlen(name)+1), + (char *) alloc->malloc(ACE_OS::strlen(name)+1), char, - strlen(name)+1); - ACE_OS::memcpy (name_tmp, name, strlen (name)+1); + ACE_OS::strlen(name)+1); + ACE_OS::memcpy (name_tmp, name, ACE_OS::strlen (name)+1); name_ = name_tmp; this->event_descriptions (event_description_strings, @@ -122,10 +121,10 @@ ACE_Metrics_Timeprobe<ACE_LOCK, ALLOCATOR>::probe_name (char * name) { char * name_tmp = 0; ACE_NEW_MALLOC_ARRAY (name_tmp, - (char *) this->allocator ()->malloc (strlen(name)+1), + (char *) this->allocator ()->malloc (ACE_OS::strlen(name)+1), char, - strlen(name)+1); - ACE_OS::memcpy (name_tmp, name, strlen (name)+1); + ACE_OS::strlen(name)+1); + ACE_OS::memcpy (name_tmp, name, ACE_OS::strlen (name)+1); if (name_) { |