From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 31 Dec 2014 08:48:55 +0000 (+0100)
Subject: SplayNode::SPLAYFREE -> Splay::SPLAYFREE
X-Git-Tag: merge-candidate-3-v1~384^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e4f953dacc4f8a7f7f3e8df86bc1058d03ad0b6;p=thirdparty%2Fsquid.git

SplayNode::SPLAYFREE -> Splay::SPLAYFREE
---

diff --git a/src/DelayTagged.cc b/src/DelayTagged.cc
index 650c9f99c7..7d1c764dcc 100644
--- 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 dbc54c1aca..678d9d228e 100644
--- 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