Solaris build bustage..

r=scc

htmlparser/src/nsToken.cpp

@@ -139,31 +139,6 @@ CToken::~CToken() {
   mUseCount=0;
 }
 
-/**
- * 
- * @update	harishd 08/01/00
- * @param   aSize    - 
- * @param   aArena   - Allocate memory from this pool.
- */
-void *
-CToken::operator new (size_t aSize, nsFixedSizeAllocator& anArena)
-{
-  return (CToken*)anArena.Alloc(aSize);
-}
-
-/**
- *  
- *
- * @update	harishd 08/01/00
- * @param   aPtr     - The memory that should be recycled/freed.
- * @param   aSize    - The size of memory that needs to be freed.
- */
-void
-CToken::operator delete (void* aPtr,size_t aSize)
-{
-  nsFixedSizeAllocator::Free(aPtr,aSize);
-}
-
 /**
  * This method gets called when a token is about to be reused
  * for some other purpose. The token should initialize itself 

htmlparser/src/nsToken.h

@@ -64,19 +64,27 @@ class CToken {
     enum  eTokenOrigin {eSource,eResidualStyle};
 
     /**
-     * Use the arena to allocate memory
-     * @update	harishd 08/02/00
-     * @param   aSize   - Allocation size.
-     * @param   anArena - Used for allocating memory.
+     * 
+     * @update	harishd 08/01/00
+     * @param   aSize    - 
+     * @param   aArena   - Allocate memory from this pool.
      */
-    void* operator new(size_t aSize,nsFixedSizeAllocator& anArena);
-    
+    static void * operator new (size_t aSize, nsFixedSizeAllocator& anArena)
+    {
+      return anArena.Alloc(aSize);
+    }
+
     /**
-     * Free up the memory in the arena.
-     * @update	harishd 08/02/00
-     * @param   aPtr - Memory that's to be freed.
+     *  
+     *
+     * @update	harishd 08/01/00
+     * @param   aPtr     - The memory that should be recycled/freed.
+     * @param   aSize    - The size of memory that needs to be freed.
      */
-    void  operator delete(void* aPtr,size_t aSize);
+    static void operator delete (void* aPtr,size_t aSize)
+    {
+      nsFixedSizeAllocator::Free(aPtr,aSize);
+    }
 
     /**
      * Make a note on number of times you have been referenced

parser/htmlparser/src/nsToken.cpp

@@ -139,31 +139,6 @@ CToken::~CToken() {
   mUseCount=0;
 }
 
-/**
- * 
- * @update	harishd 08/01/00
- * @param   aSize    - 
- * @param   aArena   - Allocate memory from this pool.
- */
-void *
-CToken::operator new (size_t aSize, nsFixedSizeAllocator& anArena)
-{
-  return (CToken*)anArena.Alloc(aSize);
-}
-
-/**
- *  
- *
- * @update	harishd 08/01/00
- * @param   aPtr     - The memory that should be recycled/freed.
- * @param   aSize    - The size of memory that needs to be freed.
- */
-void
-CToken::operator delete (void* aPtr,size_t aSize)
-{
-  nsFixedSizeAllocator::Free(aPtr,aSize);
-}
-
 /**
  * This method gets called when a token is about to be reused
  * for some other purpose. The token should initialize itself 

parser/htmlparser/src/nsToken.h

@@ -64,19 +64,27 @@ class CToken {
     enum  eTokenOrigin {eSource,eResidualStyle};
 
     /**
-     * Use the arena to allocate memory
-     * @update	harishd 08/02/00
-     * @param   aSize   - Allocation size.
-     * @param   anArena - Used for allocating memory.
+     * 
+     * @update	harishd 08/01/00
+     * @param   aSize    - 
+     * @param   aArena   - Allocate memory from this pool.
      */
-    void* operator new(size_t aSize,nsFixedSizeAllocator& anArena);
-    
+    static void * operator new (size_t aSize, nsFixedSizeAllocator& anArena)
+    {
+      return anArena.Alloc(aSize);
+    }
+
     /**
-     * Free up the memory in the arena.
-     * @update	harishd 08/02/00
-     * @param   aPtr - Memory that's to be freed.
+     *  
+     *
+     * @update	harishd 08/01/00
+     * @param   aPtr     - The memory that should be recycled/freed.
+     * @param   aSize    - The size of memory that needs to be freed.
      */
-    void  operator delete(void* aPtr,size_t aSize);
+    static void operator delete (void* aPtr,size_t aSize)
+    {
+      nsFixedSizeAllocator::Free(aPtr,aSize);
+    }
 
     /**
      * Make a note on number of times you have been referenced