From: Jelte Jansen <jelte@isc.org>
Date: Mon, 16 Jul 2012 14:37:36 +0000 (+0200)
Subject: [2089] remove old RBNode::color_ member
X-Git-Tag: trac2351_base~157^2~27^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=533199233845c14a9f056001bb7500a773d6298a;p=thirdparty%2Fkea.git

[2089] remove old RBNode::color_ member
---

diff --git a/src/lib/datasrc/rbtree.h b/src/lib/datasrc/rbtree.h
index 432089dd71..ea62c2276f 100644
--- a/src/lib/datasrc/rbtree.h
+++ b/src/lib/datasrc/rbtree.h
@@ -249,7 +249,6 @@ private:
 
     /// \brief Returns the color of this node
     RBNodeColor getColor() const {
-        //return color_;
         if ((flags_ & FLAG_RED) != 0) {
             return (RED);
         } else {
@@ -264,7 +263,6 @@ private:
         } else {
             flags_ &= ~FLAG_RED;
         }
-        color_ = color;
     }
 
     /// \brief return the next node which is bigger than current node
@@ -320,7 +318,6 @@ private:
     RBNode<T>*  parent_;
     RBNode<T>*  left_;
     RBNode<T>*  right_;
-    RBNodeColor color_;
     //@}
 
     /// \brief Relative name of the node.
@@ -353,7 +350,6 @@ RBNode<T>::RBNode() :
     parent_(NULL),
     left_(NULL),
     right_(NULL),
-    color_(BLACK),
     // dummy name, the value doesn't matter:
     name_(isc::dns::Name::ROOT_NAME()),
     down_(NULL),
@@ -371,7 +367,6 @@ RBNode<T>::RBNode(const isc::dns::Name& name) :
     parent_(NULL_NODE()),
     left_(NULL_NODE()),
     right_(NULL_NODE()),
-    color_(RED),
     name_(name),
     down_(NULL_NODE()),
     flags_(FLAG_RED)