summaryrefslogtreecommitdiff
path: root/ACE
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-11-15 13:02:25 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-11-15 13:02:25 +0000
commit7d06c5adc54ce9db1ab83ba690d58eb626df9040 (patch)
tree89068eeafdd5784ab4300545517dca97a224f6be /ACE
parent02a699ca7a4c9d6d4fe77f938d3100d70cc10802 (diff)
downloadATCD-7d06c5adc54ce9db1ab83ba690d58eb626df9040.tar.gz
Mon Nov 15 12:58:26 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Malloc_Test.cpp: Use ACE_auto_ptr_reset
Diffstat (limited to 'ACE')
-rw-r--r--ACE/ChangeLog11
-rw-r--r--ACE/tests/Malloc_Test.cpp2
2 files changed, 9 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c3a9486c0c1..6aeccca89b3 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,8 +1,13 @@
+Mon Nov 15 12:58:26 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Malloc_Test.cpp:
+ Use ACE_auto_ptr_reset
+
Mon Nov 15 12:41:22 UTC 2010 Steve Huston <shuston@riverace.com>
- * protocols/ace/INet/inet.mpc: Renamed 2nd instance of http_simple_wget
- to be slightly different in ssl case - prevents name clash when
- regenerating automake files.
+ * protocols/ace/INet/inet.mpc: Renamed 2nd instance of http_simple_wget
+ to be slightly different in ssl case - prevents name clash when
+ regenerating automake files.
Mon Nov 15 12:29:51 UTC 2010 Steve Huston <shuston@riverace.com>
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index a826e12c5f8..1e84e853457 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -115,7 +115,7 @@ myallocator (const void *base_addr = 0)
MALLOC *ptr = new MALLOC (MMAP_FILENAME,
MUTEX_NAME,
&options);
- ACE_AUTO_PTR_RESET(static_allocator, ptr, MALLOC);
+ ACE_auto_ptr_reset (static_allocator, ptr);
}
return static_allocator.get ();
}