Portability: sleep() is sometimes a macro

sleep() is sometimes defined as a macro. Such as in Squid compat library.
Use another name for the sleep starting method in class Ipc::UdsOp

  This is an iCelero Project

diff --git a/src/ipc/UdsOp.cc b/src/ipc/UdsOp.cc
index 959260f06dbd6324b7420f561e3c098c801b8aee..7448ebc4b139a627db141e16c3093b067ec0b234 100644 (file)
--- a/src/ipc/UdsOp.cc
+++ b/src/ipc/UdsOp.cc
@@ -126,12 +126,12 @@ void Ipc::UdsSender::wrote(const CommIoCbParams& params)
     if (params.flag != COMM_OK && retries-- > 0) {
         // perhaps a fresh connection and more time will help?
         conn()->close();
-        sleep();
+        startSleep();
     }
 }
 
 /// pause for a while before resending the message
-void Ipc::UdsSender::sleep()
+void Ipc::UdsSender::startSleep()
 {
     Must(!sleeping);
     sleeping = true;

diff --git a/src/ipc/UdsOp.h b/src/ipc/UdsOp.h
index 6fee7299fa3125f5c68dae7a982a1ad1de598702..ccb0735133cb0201a85456f60450a7ef63ce50d7 100644 (file)
--- a/src/ipc/UdsOp.h
+++ b/src/ipc/UdsOp.h
@@ -71,7 +71,7 @@ protected:
     virtual void timedout(); // UdsOp API
 
 private:
-    void sleep();
+    void startSleep();
     void cancelSleep();
     static void DelayedRetry(void *data);
     void delayedRetry();