From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 24 Jan 2012 14:29:38 +0000 (+0100)
Subject: preprocessor + namespaces + class members = mess. Removed some name overlapping.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd94933f89e9ae51e9366a648e9f602c2cda53d0;p=thirdparty%2Fsquid.git

preprocessor + namespaces + class members = mess. Removed some name overlapping.
---

diff --git a/src/ipc/Port.cc b/src/ipc/Port.cc
index 29c3bc213b..cc34bacaff 100644
--- a/src/ipc/Port.cc
+++ b/src/ipc/Port.cc
@@ -25,10 +25,10 @@ Ipc::Port::Port(const String& aListenAddr):
 void Ipc::Port::start()
 {
     UdsOp::start();
-    listen();
+    doListen();
 }
 
-void Ipc::Port::listen()
+void Ipc::Port::doListen()
 {
     debugs(54, 6, HERE);
     buf.prepForReading();
@@ -64,5 +64,5 @@ void Ipc::Port::noteRead(const CommIoCbParams& params)
     // TODO: if there was a fatal error on our socket, close the socket before
     // trying to listen again and print a level-1 error message.
 
-    listen();
+    doListen();
 }
diff --git a/src/ipc/Port.h b/src/ipc/Port.h
index a2d69b52b5..2dff29a944 100644
--- a/src/ipc/Port.h
+++ b/src/ipc/Port.h
@@ -30,7 +30,7 @@ protected:
     virtual bool doneAll() const; // UdsOp (AsyncJob) API
 
     /// read the next incoming message
-    void listen();
+    void doListen();
 
     /// handle IPC message just read
     virtual void receive(const TypedMsgHdr& message) = 0;