Bug #1451: gcc 4.1 compiler errors

Fix provided by Klaus Singvogel, Thanks !!!

diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index f5736869c61cda1284af1d55846fcae884e8ed8a..77ddfdb87d3a0662a2e2080520d3b14a2791a5cf 100644 (file)
--- 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 9d299fc3f85fbee5f928f5aa7acb1d1f42b28ce5..cbf3e256f1a16c66f045bf37f9fd24ce638d7f05 100644 (file)
--- 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 34165b8fee2f714f4457f9abb8e5aac0883e6742..488a5cc6f18d2abd04ce6c66dc357b2f3192db9f 100644 (file)
--- 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 28c9ca105b51aee4ee490f1ee8d1316faaa163d9..7606ed30b86656ad60c31c04c0a334c1185a0bbe 100644 (file)
--- 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 b00ff91f5d4db421443a925e373790751191e881..1c26194c8181ae00fedee20f940c8a43f791281e 100644 (file)
--- 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 6822e9dd9ce33dbc65c89746922649b31484a1c6..4c2b3985035d452d51ffd53b4edc3b6df3191e75 100644 (file)
--- 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 9ba737c562a7c1d4e796a301fad7204f6d6cb4a8..3a1414f351553ac17db632523b29cd19996f1b98 100644 (file)
--- 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;