ChangeLogTag: Sat Oct 6 16:04:29 2001 Angelo Corsaro <corsaro@doc.ece.uci.edu>

5 files changed, 56 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e629ad83ef3..f390075e66b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Sat Oct  6 16:04:29 2001  Angelo Corsaro  <corsaro@doc.ece.uci.edu>
+
+	* ace/RB_Tree.h: 
+	* ace/RB_Tree.i: 
+
+	  The operator new and delete were declared to be No-Op but were
+	  not implemented as such. This was breaking some builds. Now the
+	  operator are declared as private and they also have a no-op
+	  implementation. This should solve some linking error that were
+	  occurring.
+	
 Sat Oct  6 11:17:22 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* THANKS: Added Adrian Mercieca to the hallf of fame.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index e629ad83ef3..f390075e66b 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,14 @@
+Sat Oct  6 16:04:29 2001  Angelo Corsaro  <corsaro@doc.ece.uci.edu>
+
+	* ace/RB_Tree.h: 
+	* ace/RB_Tree.i: 
+
+	  The operator new and delete were declared to be No-Op but were
+	  not implemented as such. This was breaking some builds. Now the
+	  operator are declared as private and they also have a no-op
+	  implementation. This should solve some linking error that were
+	  occurring.
+	
 Sat Oct  6 11:17:22 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* THANKS: Added Adrian Mercieca to the hallf of fame.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index e629ad83ef3..f390075e66b 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,14 @@
+Sat Oct  6 16:04:29 2001  Angelo Corsaro  <corsaro@doc.ece.uci.edu>
+
+	* ace/RB_Tree.h: 
+	* ace/RB_Tree.i: 
+
+	  The operator new and delete were declared to be No-Op but were
+	  not implemented as such. This was breaking some builds. Now the
+	  operator are declared as private and they also have a no-op
+	  implementation. This should solve some linking error that were
+	  occurring.
+	
 Sat Oct  6 11:17:22 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* THANKS: Added Adrian Mercieca to the hallf of fame.
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index fa7492cbeee..243d4c7af62 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -89,13 +89,15 @@ public:
   /// Mutator for node's right child pointer
   void right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r);
 
+  void *operator new (size_t size, ACE_Allocator *allocator);
+  void operator delete(void *p, ACE_Allocator *allocator);
+
+private:
   // No-op, to avoid accident use.
   void *operator new (size_t size);
   // No-op, to avoid accident use.
   void operator delete(void *p);
 
-  void *operator new (size_t size, ACE_Allocator *allocator);
-  void operator delete(void *p, ACE_Allocator *allocator);
 
 private:
 
diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i
index c257e10da4c..35d4f5c3545 100644
--- a/ace/RB_Tree.i
+++ b/ace/RB_Tree.i
@@ -8,6 +8,23 @@
 // template class ACE_RB_Tree_Node<EXT_ID, INT_ID> //
 /////////////////////////////////////////////////////
 
+// No-op, to avoid accident use.
+template <class EXT_ID, class INT_ID>
+ACE_INLINE void *
+ACE_RB_Tree_Node<EXT_ID, INT_ID>::operator new (size_t)
+{
+  return (void*)0;
+}
+
+// No-op, to avoid accident use.
+template <class EXT_ID, class INT_ID>
+ACE_INLINE void
+ACE_RB_Tree_Node<EXT_ID, INT_ID>::operator delete(void *)
+{
+  // No-Op
+}
+
+
 // Key accessor.
 
 template <class EXT_ID, class INT_ID>
@@ -1145,3 +1162,5 @@ ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_
 
   return 0;
 }
+
+