ChangeLogTag:Wed Jun 13 10:22:10 2001 Nanbor Wang <nanbor@cs.wustl.edu>

1 files changed, 5 insertions, 149 deletions

diff --git a/ace/Obstack.cpp b/ace/Obstack.cpp
index fbb63f72d1b..d794f1263fe 100644
--- a/ace/Obstack.cpp
+++ b/ace/Obstack.cpp
@@ -2,154 +2,10 @@
 
 #include "ace/Obstack.h"
 
-#if !defined (__ACE_INLINE__)
-#include "ace/Obstack.i"
-#endif /* __ACE_INLINE__ */
-
 ACE_RCSID(ace, Obstack, "$Id$")
 
-ACE_ALLOC_HOOK_DEFINE(ACE_Obstack)
-
-void
-ACE_Obstack::dump (void) const
-{
-  ACE_TRACE ("ACE_Obstack::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("size_ = %d\n"), this->size_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("head_ = %x\n"), this->head_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("curr_ = %x\n"), this->curr_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Obchunk)
-
-void
-ACE_Obchunk::dump (void) const
-{
-  ACE_TRACE ("ACE_Obchunk::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("end_ = %x\n"), this->end_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("cur_ = %x\n"), this->cur_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-ACE_Obchunk::ACE_Obchunk (size_t size)
-  : end_ (contents_ + size),
-    cur_ (contents_),
-    next_ (0)
-{
-}
-
-class ACE_Obchunk *
-ACE_Obstack::new_chunk (void)
-{
-  ACE_TRACE ("ACE_Obstack::new_chunk");
-
-  char *temp;
-  
-  ACE_ALLOCATOR_RETURN 
-    (temp,
-     ACE_static_cast (char *,
-                      this->allocator_strategy_->malloc 
-                        (sizeof (class ACE_Obchunk) 
-                         + this->size_)),
-     0);
-
-  return new (temp) ACE_Obchunk (this->size_);
-}
-
-ACE_Obstack::ACE_Obstack (size_t size,
-                          ACE_Allocator *allocator_strategy)
-  : allocator_strategy_ (allocator_strategy),
-    size_ (size)
-{
-  ACE_TRACE ("ACE_Obstack::ACE_Obstack");
-
-  if (this->allocator_strategy_ == 0)
-    ACE_ALLOCATOR (this->allocator_strategy_,
-                   ACE_Allocator::instance ());
-
-  this->head_ = this->new_chunk ();
-  this->curr_ = this->head_;
-}
-
-ACE_Obstack::~ACE_Obstack (void)
-{
-  ACE_TRACE ("ACE_Obstack::~ACE_Obstack");
-
-  ACE_Obchunk *temp = this->head_;
-
-  while (temp != 0)
-    {
-      ACE_Obchunk *next = temp->next_;
-      temp->next_  = 0;
-      this->allocator_strategy_->free ((void *) temp);
-      temp = next;
-    }
-}
-
-char *
-ACE_Obstack::copy (const char *s, 
-		   size_t len)
-{
-  ACE_TRACE ("ACE_Obstack::copy");
-  char *result;
-
-  ACE_ASSERT (this->size_ >= len + 1);
-
-  // Check whether we need to grow our chunk...
-
-  if (this->curr_->cur_ + len + 1 >= this->curr_->end_)
-    {
-      if (this->curr_->next_ == 0)
-	{
-          // We must allocate new memory.
-	  this->curr_->next_ = this->new_chunk ();
-	  this->curr_ = this->curr_->next_;
-	}
-      else
-	{
-          // We can reuse previously allocated memory.
-	  this->curr_ = this->curr_->next_;
-	  this->curr_->cur_ = this->curr_->contents_;
-	}
-    }
-
-  result = this->curr_->cur_;
-  ACE_OS::memcpy (result, s, len);
-  result[len] = '\0';
-  this->curr_->cur_ += (len + 1);
-  return result;
-}
-
-#if defined (ACE_HAS_WCHAR)
-/**
- * Convert the wchar_t string into a normal string (which requires a doubling
- * of size with a cast) and send it to the normal char * version of copy.
- * We also need to cast the return value back to wchar_t to pass back to the
- * app.
- *
- * @note This is mainly here for Svc_Conf support with ACE_USES_WCHAR.
- */
-wchar_t *
-ACE_Obstack::copy (const wchar_t *data, size_t len)
-{
-  return ACE_reinterpret_cast 
-    (wchar_t *,
-     this->copy (ACE_reinterpret_cast (const char *, data), 
-                 len * sizeof (wchar_t)));
-}
-#endif /* ACE_HAS_WCHAR */
-
-void 
-ACE_Obstack::release (void)
-{
-  ACE_TRACE ("ACE_Obstack::release");
-
-  this->curr_ = this->head_;
-  this->curr_->cur_ = this->curr_->contents_;
-}
-
-
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Obstack_T<char>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Obstack_T<char>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */