diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-04 17:01:43 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-08-04 17:01:43 +0000 |
| commit | 6d27093d1ac6828621a28997610ac8d5a4fa9520 (patch) | |
| tree | 44b2bb083ff1dfc595f4e7611a91ee8505be0ce2 | |
| parent | f50f0563f701fe0f0c3381187e6d0f207c654217 (diff) | |
| download | ATCD-6d27093d1ac6828621a28997610ac8d5a4fa9520.tar.gz | |
ChangeLogTag:Wed Aug 4 11:59:57 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 6 | ||||
| -rw-r--r-- | ace/Malloc.h | 17 |
2 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index 8769d8a9655..deb45eb8b39 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,9 @@ +Wed Aug 4 11:59:57 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * ace/Malloc.h: + The previous fix did not work, i used forward declarations to + make it work. + Wed Aug 4 09:28:35 1999 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> * ace/Malloc.h: Replaced the use of typedefs for macros diff --git a/ace/Malloc.h b/ace/Malloc.h index 2987b7d4654..8be49d4784d 100644 --- a/ace/Malloc.h +++ b/ace/Malloc.h @@ -79,13 +79,18 @@ struct ACE_Export ACE_Malloc_Stats #endif /* ACE_MALLOC_PADDING */ #if defined (ACE_HAS_POSITION_INDEPENDENT_MALLOC) -#define ACE_MALLOC_HEADER_PTR ACE_Based_Pointer<ACE_Malloc_Header> -typedef ACE_NAME_NODE_PTR ACE_Based_Pointer<ACE_Name_Node> -typedef ACE_CHAR_PTR ACE_Based_Pointer_Basic<char> + +typedef ACE_Based_Pointer<ACE_Malloc_Header> ACE_MALLOC_HEADER_PTR; +typedef ACE_Based_Pointer<ACE_Name_Node> ACE_NAME_NODE_PTR; +typedef ACE_Based_Pointer_Basic<char> ACE_CHAR_PTR; + #else -typedef ACE_MALLOC_HEADER_PTR ACE_Malloc_Header -typedef ACE_NAME_NODE_PTR ACE_Name_Node * -typedef ACE_CHAR_PTR char * + +class ACE_Malloc_Header; +class ACE_Name_Node; +typedef ACE_Malloc_Header* ACE_MALLOC_HEADER_PTR; +typedef ACE_Name_Node * ACE_NAME_NODE_PTR; +typedef char * ACE_CHAR_PTR; #endif /* ACE_HAS_POSITION_INDEPENDENT_MALLOC */ class ACE_Export ACE_Malloc_Header |