SplayNode::SPLAYFREE -> Splay::SPLAYFREE

diff --git a/src/DelayTagged.cc b/src/DelayTagged.cc
index 650c9f99c776063e0d620d20fa518d15b6f6976a..7d1c764dccbf17a6d101f25f3b4d63c3dcd662e9 100644 (file)
--- a/src/DelayTagged.cc
+++ b/src/DelayTagged.cc
@@ -35,7 +35,7 @@ DelayTagged::DelayTagged()
     DelayPools::registerForUpdates (this);
 }
 
-static SplayNode<DelayTaggedBucket::Pointer>::SPLAYFREE DelayTaggedFree;
+static Splay<DelayTaggedBucket::Pointer>::SPLAYFREE DelayTaggedFree;
 
 DelayTagged::~DelayTagged()
 {
@@ -43,7 +43,7 @@ DelayTagged::~DelayTagged()
     buckets.head->destroy (DelayTaggedFree);
 }
 
-static SplayNode<DelayTaggedBucket::Pointer>::SPLAYCMP DelayTaggedCmp;
+static Splay<DelayTaggedBucket::Pointer>::SPLAYCMP DelayTaggedCmp;
 
 int
 DelayTaggedCmp(DelayTaggedBucket::Pointer const &left, DelayTaggedBucket::Pointer const &right)

diff --git a/src/acl/Eui64.cc b/src/acl/Eui64.cc
index dbc54c1aca4293a9c5fb18fd5712963c3a1361cb..678d9d228e8a59e6cb431f4302d22e3528efffc4 100644 (file)
--- a/src/acl/Eui64.cc
+++ b/src/acl/Eui64.cc
@@ -22,7 +22,7 @@
 
 static void aclParseEuiList(Splay<Eui::Eui64 *> **curlist);
 static int aclMatchEui(Splay<Eui::Eui64 *> **dataptr, Ip::Address &c);
-static SplayNode<Eui::Eui64 *>::SPLAYCMP aclEui64Compare;
+static Splay<Eui::Eui64 *>::SPLAYCMP aclEui64Compare;
 
 ACL *
 ACLEui64::clone() const