From: robertc <>
Date: Mon, 10 Mar 2003 18:13:36 +0000 (+0000)
Subject: Summary: Fix a namespace conflict from the ESI merge.
X-Git-Tag: SQUID_3_0_PRE1~270
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=025d326f3227df773cb6a2acbeff40792367e2bb;p=thirdparty%2Fsquid.git

Summary: Fix a namespace conflict from the ESI merge.
Keywords:

Fix a namespace conflict from the ESI merge.
---

diff --git a/src/ACLMaxUserIP.h b/src/ACLMaxUserIP.h
index 0b884294b1..bccf81863e 100644
--- a/src/ACLMaxUserIP.h
+++ b/src/ACLMaxUserIP.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ACLMaxUserIP.h,v 1.1 2003/02/25 12:22:33 robertc Exp $
+ * $Id: ACLMaxUserIP.h,v 1.2 2003/03/10 11:13:36 robertc Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -66,7 +66,7 @@ private:
 
     int match(auth_user_request_t *, struct in_addr const &);
     char const *class_;
-    size_t max;
+    size_t maximum;
 
     struct Flags
     {
diff --git a/src/NullDelayId.h b/src/NullDelayId.h
index 33a177b001..f8782c0291 100644
--- a/src/NullDelayId.h
+++ b/src/NullDelayId.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: NullDelayId.h,v 1.2 2003/02/21 22:50:06 robertc Exp $
+ * $Id: NullDelayId.h,v 1.3 2003/03/10 11:13:36 robertc Exp $
  *
  * DEBUG: section 77    Delay Pools
  * AUTHOR: Robert Collins <robertc@squid-cache.org>
@@ -53,7 +53,7 @@ public:
     void *operator new(size_t);
     void operator delete (void *);
     virtual void deleteSelf() const;
-    virtual int bytesWanted (int min, int max) const {return XMAX(min,max);}
+    virtual int bytesWanted (int minimum, int maximum) const {return max(minimum,maximum);}
 
     virtual void bytesIn(int qty) {}}