From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 12 Mar 2011 01:16:37 +0000 (-0700)
Subject: ICC build issue in ConnStateData::getConn
X-Git-Tag: take06~27^2~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4063e8b10232e8b54fcd5fc72f12fa532da6f035;p=thirdparty%2Fsquid.git

ICC build issue in ConnStateData::getConn

ICC complains about:
"type qualifier on return type is meaningless
      inline ConnStateData * const getConn() const;
"

I believe this is const-correct. The incorrect version would be "& const"
But there is no harm in combining the two getConn() methods.
---

diff --git a/src/client_side_request.cci b/src/client_side_request.cci
index a9a043853e..ddbbc078ff 100644
--- a/src/client_side_request.cci
+++ b/src/client_side_request.cci
@@ -50,15 +50,6 @@ ClientHttpRequest::memObject() const
 }
 
 ConnStateData *
-ClientHttpRequest::getConn()
-{
-    if (!cbdataReferenceValid(conn_))
-        return NULL;
-
-    return conn_;
-}
-
-ConnStateData * const
 ClientHttpRequest::getConn() const
 {
     if (!cbdataReferenceValid(conn_))
diff --git a/src/client_side_request.h b/src/client_side_request.h
index 7e60938f83..d00a617a43 100644
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -93,8 +93,7 @@ public:
     _SQUID_INLINE_ StoreEntry *loggingEntry() const;
     void loggingEntry(StoreEntry *);
 
-    _SQUID_INLINE_ ConnStateData * getConn();
-    _SQUID_INLINE_ ConnStateData * const getConn() const;
+    _SQUID_INLINE_ ConnStateData * getConn() const;
     _SQUID_INLINE_ void setConn(ConnStateData *);
     HttpRequest *request;		/* Parsed URL ... */
     char *uri;