diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-05-04 00:20:07 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-05-04 00:20:07 +0000 |
| commit | 8fb37a0656f8850e0ac572c533f58d5c3d8d619f (patch) | |
| tree | 28faf8b31c342c7450c7023d3307d7e0891115b3 | |
| parent | 544e1b920d4841603ade5e4d8c96d46b7a4f9063 (diff) | |
| download | ATCD-8fb37a0656f8850e0ac572c533f58d5c3d8d619f.tar.gz | |
ChangeLogTag:Wed May 3 18:07:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/Malloc_T.cpp | 14 | ||||
| -rw-r--r-- | ace/Malloc_T.i | 14 |
5 files changed, 32 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index a18a371358b..7272696fe8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed May 3 18:07:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Malloc_T (memory_pool): Found another bug with SunC++ 5.0... + Moved the ACE_Allocator_Adapter::protect() into the Malloc_T.cpp + file. + Wed May 3 17:16:12 2000 Ossama Othman <ossama@uci.edu> * ace/Log_Msg.h (log_priority_enabled): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index a18a371358b..7272696fe8c 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Wed May 3 18:07:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Malloc_T (memory_pool): Found another bug with SunC++ 5.0... + Moved the ACE_Allocator_Adapter::protect() into the Malloc_T.cpp + file. + Wed May 3 17:16:12 2000 Ossama Othman <ossama@uci.edu> * ace/Log_Msg.h (log_priority_enabled): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index a18a371358b..7272696fe8c 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Wed May 3 18:07:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Malloc_T (memory_pool): Found another bug with SunC++ 5.0... + Moved the ACE_Allocator_Adapter::protect() into the Malloc_T.cpp + file. + Wed May 3 17:16:12 2000 Ossama Othman <ossama@uci.edu> * ace/Log_Msg.h (log_priority_enabled): diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index 845979f0741..4633c6fa5a3 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -43,6 +43,20 @@ ACE_Cached_Allocator<T, ACE_LOCK>::~ACE_Cached_Allocator (void) ACE_ALLOC_HOOK_DEFINE (ACE_Malloc_T) +template <class MALLOC> int +ACE_Allocator_Adapter<MALLOC>::protect (ssize_t len, int flags) +{ + ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::protect"); + return this->allocator_.protect (len, flags); +} + +template <class MALLOC> int +ACE_Allocator_Adapter<MALLOC>::protect (void *addr, size_t len, int flags) +{ + ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::protect"); + return this->allocator_.protect (addr, len, flags); +} + template <class MALLOC> ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const ACE_TCHAR *pool_name) : allocator_ (pool_name) diff --git a/ace/Malloc_T.i b/ace/Malloc_T.i index fbb168d0859..9f0d70f7ea6 100644 --- a/ace/Malloc_T.i +++ b/ace/Malloc_T.i @@ -138,20 +138,6 @@ ACE_Allocator_Adapter<MALLOC>::sync (void *addr, size_t len, int flags) return this->allocator_.sync (addr, len, flags); } -template <class MALLOC> ACE_INLINE int -ACE_Allocator_Adapter<MALLOC>::protect (ssize_t len, int flags) -{ - ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::protect"); - return this->allocator_.protect (len, flags); -} - -template <class MALLOC> ACE_INLINE int -ACE_Allocator_Adapter<MALLOC>::protect (void *addr, size_t len, int flags) -{ - ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::protect"); - return this->allocator_.protect (addr, len, flags); -} - template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> ACE_INLINE ACE_MEM_POOL & ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::memory_pool (void) { |