From d9bd2a3bdf0b3dfc3181950a0d38c8f6f812b3d4 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Fri, 28 Apr 2000 02:16:03 +0000
Subject: [PATCH] workaround for Solaris compiler bug

---
 src/ca/cac.cpp             | 2 +-
 src/ca/iocinf.h            | 2 ++
 src/ca/tcpRecvWatchdog.cpp | 5 +++++
 src/ca/tcpSendWatchdog.cpp | 5 +++++
 src/ca/tcpiiu.cpp          | 8 ++++----
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/ca/cac.cpp b/src/ca/cac.cpp
index fab8a71b2..9c7b25de6 100644
--- a/src/ca/cac.cpp
+++ b/src/ca/cac.cpp
@@ -469,7 +469,7 @@ void cac::beaconNotify ( const inetAddrID &addr )
         tcpiiu *piiu = pBHE->getIIU ();
         if ( piiu ) {
             if ( ! piiu->beaconAnomaly ) {
-                piiu->tcpRecvWatchdog::reschedule (); // reset connection activity watchdog
+                piiu->rescheduleRecvTimer (); // reset connection activity watchdog
             }
         }
     }
diff --git a/src/ca/iocinf.h b/src/ca/iocinf.h
index cf8d13eca..8081c11b5 100644
--- a/src/ca/iocinf.h
+++ b/src/ca/iocinf.h
@@ -498,6 +498,7 @@ class tcpRecvWatchdog : public osiTimer {
 public:
     tcpRecvWatchdog (double periodIn, osiTimerQueue & queueIn, bool echoProtocolAcceptedIn);
     void echoResponseNotify ();
+    void rescheduleRecvTimer ();
 private:
     void expire ();
 	void destroy ();
@@ -516,6 +517,7 @@ private:
 class tcpSendWatchdog : public osiTimer {
 public:
     tcpSendWatchdog (double periodIn, osiTimerQueue & queueIn);
+    void rescheduleSendTimer ();
 private:
     void expire ();
 	void destroy ();
diff --git a/src/ca/tcpRecvWatchdog.cpp b/src/ca/tcpRecvWatchdog.cpp
index 9283bd1df..845a1a198 100644
--- a/src/ca/tcpRecvWatchdog.cpp
+++ b/src/ca/tcpRecvWatchdog.cpp
@@ -70,3 +70,8 @@ const char *tcpRecvWatchdog::name () const
 {
     return "TCP Receive Watchdog";
 }
+
+void tcpRecvWatchdog::rescheduleRecvTimer ()
+{
+    this->reschedule ();
+}
\ No newline at end of file
diff --git a/src/ca/tcpSendWatchdog.cpp b/src/ca/tcpSendWatchdog.cpp
index 2783c8297..18049732d 100644
--- a/src/ca/tcpSendWatchdog.cpp
+++ b/src/ca/tcpSendWatchdog.cpp
@@ -44,3 +44,8 @@ const char *tcpSendWatchdog::name () const
 {
     return "TCP Send Watchdog";
 }
+
+void tcpSendWatchdog::rescheduleSendTimer ()
+{
+    this->reschedule ();
+}
\ No newline at end of file
diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp
index a7926ae73..eccaf033c 100644
--- a/src/ca/tcpiiu.cpp
+++ b/src/ca/tcpiiu.cpp
@@ -151,7 +151,7 @@ LOCAL void cac_connect_tcp (tcpiiu *piiu)
      */
     piiu->state = iiu_connected;
 
-    piiu->tcpRecvWatchdog::reschedule (); // reset connection activity watchdog
+    piiu->rescheduleRecvTimer (); // reset connection activity watchdog
 
     return;
 }
@@ -301,7 +301,7 @@ void tcpiiu::recvMsg ()
     cacRingBufferWriteCommit (&this->recv, totalBytes);
     cacRingBufferWriteFlush (&this->recv);
 
-    this->tcpRecvWatchdog::reschedule (); // reschedule connection activity watchdog
+    this->rescheduleRecvTimer (); // reschedule connection activity watchdog
 
     return;
 }
@@ -609,7 +609,7 @@ bool tcpiiu::compareIfTCP ( nciu &chan, const sockaddr_in &addr ) const
 void tcpiiu::flush ()
 {
     if ( cacRingBufferWriteFlush ( &this->send ) ) {
-        this->tcpSendWatchdog::reschedule ();
+        this->rescheduleSendTimer ();
     }
 }
 
@@ -1375,7 +1375,7 @@ int tcpiiu::pushStreamMsg (const caHdr *pmsg,
 
     if ( ! cacRingBufferWriteLockNoBlock ( &this->send, msgsize ) ) {
         if ( BlockingOk ) {
-            this->tcpSendWatchdog::reschedule ();
+            this->rescheduleSendTimer ();
             cacRingBufferWriteLock ( &this->send );
         }
         else {