Dep/ACE: Upgrade ACE -library to 5.8.3

--HG--
branch : trunk

1 files changed, 25 insertions, 27 deletions

diff --git a/dep/acelite/ace/Malloc_T.cpp b/dep/acelite/ace/Malloc_T.cpp
index 5a2a1852b95..88b456d66e2 100644
--- a/dep/acelite/ace/Malloc_T.cpp
+++ b/dep/acelite/ace/Malloc_T.cpp
@@ -1,4 +1,4 @@
-// $Id: Malloc_T.cpp 84282 2009-01-30 15:04:29Z msmit $
+// $Id: Malloc_T.cpp 91809 2010-09-17 07:20:41Z johnnyw $
 
 #ifndef ACE_MALLOC_T_CPP
 #define ACE_MALLOC_T_CPP
@@ -299,6 +299,18 @@ ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const char *pool_name)
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
 }
 
+template <class MALLOC>
+ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (
+  const char *pool_name,
+  const char *lock_name,
+  MEMORY_POOL_OPTIONS options)
+    : allocator_ (ACE_TEXT_CHAR_TO_TCHAR (pool_name),
+                  ACE_TEXT_CHAR_TO_TCHAR (lock_name),
+                  options)
+{
+  ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
+}
+
 #if defined (ACE_HAS_WCHAR)
 template <class MALLOC>
 ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const wchar_t *pool_name)
@@ -306,6 +318,18 @@ ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const wchar_t *pool_name)
 {
   ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
 }
+
+template <class MALLOC>
+ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (
+  const wchar_t *pool_name,
+  const wchar_t *lock_name,
+  MEMORY_POOL_OPTIONS options)
+    : allocator_ (ACE_TEXT_WCHAR_TO_TCHAR (pool_name),
+                  ACE_TEXT_WCHAR_TO_TCHAR (lock_name),
+                  options)
+{
+  ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter");
+}
 #endif /* ACE_HAS_WCHAR */
 
 template <class MALLOC>
@@ -544,32 +568,6 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p
                 ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T")));
 }
 
-#if !defined (ACE_HAS_TEMPLATE_TYPEDEFS)
-template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
-ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *pool_name,
-                                                          const ACE_TCHAR *lock_name,
-                                                          const void *options)
-  : cb_ptr_ (0),
-    memory_pool_ (pool_name,
-                  (const ACE_MEM_POOL_OPTIONS *) options),
-    bad_flag_ (0)
-{
-  ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T");
-
-  this->lock_ = ACE_Malloc_Lock_Adapter_T<ACE_LOCK> ()(lock_name);
-  if (this->lock_ == 0)
-    return;
-
-  this->delete_lock_ = true;
-  this->bad_flag_ = this->open ();
-  if (this->bad_flag_ == -1)
-    ACE_ERROR ((LM_ERROR,
-                ACE_TEXT ("%p\n"),
-                ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T")));
-}
-#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */
-
-
 template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB>
 ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::~ACE_Malloc_T (void)
 {