From 5c926411946a5eb0e58f38ab2f7978f92fd113e7 Mon Sep 17 00:00:00 2001
From: serassio <>
Date: Fri, 2 Dec 2005 04:35:40 +0000
Subject: [PATCH] Bug #1451: gcc 4.1 compiler errors

Fix provided by Klaus Singvogel, Thanks !!!
---
 src/auth/basic/auth_basic.h         | 2 +-
 src/auth/digest/auth_digest.h       | 2 +-
 src/auth/negotiate/auth_negotiate.h | 2 +-
 src/auth/ntlm/auth_ntlm.h           | 2 +-
 src/client_side_reply.h             | 4 ++--
 src/fs/coss/CossSwapDir.h           | 4 ++--
 src/tunnel.cc                       | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index f5736869c6..77ddfdb87d 100644
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@ -115,7 +115,7 @@ class AuthBasicConfig : public AuthConfig
 {
 
 public:
-    AuthBasicConfig::AuthBasicConfig();
+    AuthBasicConfig();
     virtual bool active() const;
     virtual bool configured() const;
     virtual AuthUserRequest *decode(char const *proxy_auth);
diff --git a/src/auth/digest/auth_digest.h b/src/auth/digest/auth_digest.h
index 9d299fc3f8..cbf3e256f1 100644
--- a/src/auth/digest/auth_digest.h
+++ b/src/auth/digest/auth_digest.h
@@ -156,7 +156,7 @@ class AuthDigestConfig : public AuthConfig
 {
 
 public:
-    AuthDigestConfig::AuthDigestConfig();
+    AuthDigestConfig();
     virtual bool active() const;
     virtual bool configured() const;
     virtual AuthUserRequest *decode(char const *proxy_auth);
diff --git a/src/auth/negotiate/auth_negotiate.h b/src/auth/negotiate/auth_negotiate.h
index 34165b8fee..488a5cc6f1 100644
--- a/src/auth/negotiate/auth_negotiate.h
+++ b/src/auth/negotiate/auth_negotiate.h
@@ -99,7 +99,7 @@ class AuthNegotiateConfig : public AuthConfig
 {
 
 public:
-    AuthNegotiateConfig::AuthNegotiateConfig();
+    AuthNegotiateConfig();
     virtual bool active() const;
     virtual bool configured() const;
     virtual AuthUserRequest *decode(char const *proxy_auth);
diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h
index 28c9ca105b..7606ed30b8 100644
--- a/src/auth/ntlm/auth_ntlm.h
+++ b/src/auth/ntlm/auth_ntlm.h
@@ -97,7 +97,7 @@ class AuthNTLMConfig : public AuthConfig
 {
 
 public:
-    AuthNTLMConfig::AuthNTLMConfig();
+    AuthNTLMConfig();
     virtual bool active() const;
     virtual bool configured() const;
     virtual AuthUserRequest *decode(char const *proxy_auth);
diff --git a/src/client_side_reply.h b/src/client_side_reply.h
index b00ff91f5d..1c26194c81 100644
--- a/src/client_side_reply.h
+++ b/src/client_side_reply.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: client_side_reply.h,v 1.8 2005/09/09 17:31:33 wessels Exp $
+ * $Id: client_side_reply.h,v 1.9 2005/12/01 21:35:40 serassio Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -148,7 +148,7 @@ private:
     void handleIMSGiveClientUpdatedOldEntry();
     void handleIMSGiveClientNewEntry();
     void sendClientOldEntry();
-    void clientReplyContext::buildMaxBodySize(HttpReply * reply);
+    void buildMaxBodySize(HttpReply * reply);
 
 
     StoreEntry *old_entry;
diff --git a/src/fs/coss/CossSwapDir.h b/src/fs/coss/CossSwapDir.h
index 6822e9dd9c..4c2b398503 100644
--- a/src/fs/coss/CossSwapDir.h
+++ b/src/fs/coss/CossSwapDir.h
@@ -83,8 +83,8 @@ private:
     void changeIO(DiskIOModule *module);
     bool optionIOParse(char const *option, const char *value, int reconfiguring);
     void optionIODump(StoreEntry * e) const;
-    void CossSwapDir::optionBlockSizeDump(StoreEntry *) const;
-    bool CossSwapDir::optionBlockSizeParse(const char *, const char *, int);
+    void optionBlockSizeDump(StoreEntry *) const;
+    bool optionBlockSizeParse(const char *, const char *, int);
     char const *stripePath() const;
     ConfigOption * getOptionTree() const;
     const char *ioModule;
diff --git a/src/tunnel.cc b/src/tunnel.cc
index 9ba737c562..3a1414f351 100644
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tunnel.cc,v 1.154 2005/09/17 05:50:08 wessels Exp $
+ * $Id: tunnel.cc,v 1.155 2005/12/01 21:35:40 serassio Exp $
  *
  * DEBUG: section 26    Secure Sockets Layer Proxy
  * AUTHOR: Duane Wessels
@@ -83,7 +83,7 @@ public:
 #endif
 
         void error(int const xerrno);
-        int Connection::debugLevelForError(int const xerrno) const;
+        int debugLevelForError(int const xerrno) const;
         void closeIfOpen();
         void dataSent (size_t amount);
         int len;
-- 
2.47.3