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 a9a043853efe3426bcd2cbe5784b59e9a7d8e5fb..ddbbc078ff666b926f8e4dface42aa997321d552 100644 (file)
--- 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 7e60938f83e6cb2a354e2178674e5862459fb1df..d00a617a43889744adac74f1002be7291fc54b07 100644 (file)
--- 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;