diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-09 00:31:50 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-09 00:31:50 +0000 |
| commit | 2cd205ef41ae7ea84c5f459beddb8f92edd51032 (patch) | |
| tree | 421aed34ea3fb668e547f1644cba5cbde7eb926a /ace/SString.i | |
| parent | 70547252a4d0f20f9744ee0710a4d4ca7ae08e88 (diff) | |
| download | ATCD-2cd205ef41ae7ea84c5f459beddb8f92edd51032.tar.gz | |
Move ACE_Allocator around to resolve a circular dependency among header files.
Diffstat (limited to 'ace/SString.i')
| -rw-r--r-- | ace/SString.i | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ace/SString.i b/ace/SString.i index c53b5da9682..e07464e4b3c 100644 --- a/ace/SString.i +++ b/ace/SString.i @@ -1,11 +1,11 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/Malloc.h" +#include "ace/Malloc_Base.h" // Default constructor. -ACE_INLINE +ACE_INLINE ACE_CString::ACE_CString (ACE_Allocator *alloc) : allocator_ (alloc ? alloc : ACE_Allocator::instance ()), len_ (0), @@ -19,9 +19,9 @@ ACE_CString::ACE_CString (ACE_Allocator *alloc) // Constructor that actually copies memory. -ACE_INLINE -ACE_CString::ACE_CString (const char *s, - ACE_Allocator *alloc, +ACE_INLINE +ACE_CString::ACE_CString (const char *s, + ACE_Allocator *alloc, int release) : allocator_ (alloc ? alloc : ACE_Allocator::instance ()), len_ (0), @@ -39,9 +39,9 @@ ACE_CString::ACE_CString (const char *s, this->set (s, length, release); } -ACE_INLINE -ACE_CString::ACE_CString (char c, - ACE_Allocator *alloc) +ACE_INLINE +ACE_CString::ACE_CString (char c, + ACE_Allocator *alloc) : allocator_ (alloc ? alloc : ACE_Allocator::instance ()), len_ (0), rep_ (0), @@ -54,7 +54,7 @@ ACE_CString::ACE_CString (char c, // Constructor that actually copies memory. -ACE_INLINE +ACE_INLINE ACE_CString::ACE_CString (const char *s, size_t len, ACE_Allocator *alloc, @@ -71,7 +71,7 @@ ACE_CString::ACE_CString (const char *s, // Copy constructor. -ACE_INLINE +ACE_INLINE ACE_CString::ACE_CString (const ACE_CString &s) : allocator_ (s.allocator_ ? s.allocator_ : ACE_Allocator::instance ()), len_ (0), @@ -83,7 +83,7 @@ ACE_CString::ACE_CString (const ACE_CString &s) this->set (s.rep_, s.len_, 1); } -ACE_INLINE +ACE_INLINE ACE_CString::~ACE_CString (void) { ACE_TRACE ("ACE_CString::~ACE_CString"); |