Comment 2 for bug 541229

Revision history for this message
Jeff Hill (johill-lanl) wrote :

I applied this patch

Index: nciu.cpp
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/nciu.cpp,v
retrieving revision 1.77.2.24
diff -c -r1.77.2.24 nciu.cpp
*** nciu.cpp 19 Oct 2004 20:42:12 -0000 1.77.2.24
--- nciu.cpp 11 Apr 2005 21:20:18 -0000
***************
*** 413,418 ****
--- 413,424 ----
          guard, pBuf, bufLength );
  }

+ const char * nciu::pHostName (
+ epicsGuard < epicsMutex > & guard ) const throw ()
+ {
+ return this->piiu->pHostName ( guard );
+ }
+
  bool nciu::ca_v42_ok (
      epicsGuard < epicsMutex > & guard ) const
  {
Index: nciu.h
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/nciu.h,v
retrieving revision 1.28.2.16
diff -c -r1.28.2.16 nciu.h
*** nciu.h 19 Oct 2004 20:42:39 -0000 1.28.2.16
--- nciu.h 11 Apr 2005 21:22:03 -0000
***************
*** 262,269 ****
      arrayElementCount nativeElementCount (
          epicsGuard < epicsMutex > & ) const;
      static void stringVerify ( const char *pStr, const unsigned count );
! virtual void ioCompletionNotify (
          epicsGuard < epicsMutex > &, class baseNMIU & );
   nciu ( const nciu & );
   nciu & operator = ( const nciu & );
      void * operator new ( size_t );
--- 262,271 ----
      arrayElementCount nativeElementCount (
          epicsGuard < epicsMutex > & ) const;
      static void stringVerify ( const char *pStr, const unsigned count );
! void ioCompletionNotify (
          epicsGuard < epicsMutex > &, class baseNMIU & );
+ const char * pHostName (
+ epicsGuard < epicsMutex > & guard ) const throw ();
   nciu ( const nciu & );
   nciu & operator = ( const nciu & );
      void * operator new ( size_t );
Index: netiiu.cpp
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/netiiu.cpp,v
retrieving revision 1.45.2.9
diff -c -r1.45.2.9 netiiu.cpp
*** netiiu.cpp 19 Oct 2004 20:43:45 -0000 1.45.2.9
--- netiiu.cpp 11 Apr 2005 21:21:02 -0000
***************
*** 110,116 ****
  }

  const char * netiiu::pHostName (
! epicsGuard < epicsMutex > & ) const
  {
      return pHostNameNetIIU;
  }
--- 110,116 ----
  }

  const char * netiiu::pHostName (
! epicsGuard < epicsMutex > & ) const throw ()
  {
      return pHostNameNetIIU;
  }
Index: netiiu.h
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/netiiu.h,v
retrieving revision 1.17.2.9
diff -c -r1.17.2.9 netiiu.h
*** netiiu.h 19 Oct 2004 20:46:19 -0000 1.17.2.9
--- netiiu.h 11 Apr 2005 21:21:02 -0000
***************
*** 42,48 ****
          epicsGuard < epicsMutex > &, char * pBuf,
          unsigned bufLength ) const throw () = 0;
      virtual const char * pHostName (
! epicsGuard < epicsMutex > & ) const = 0;
      virtual bool ca_v41_ok (
          epicsGuard < epicsMutex > & ) const = 0;
      virtual bool ca_v42_ok (
--- 42,48 ----
          epicsGuard < epicsMutex > &, char * pBuf,
          unsigned bufLength ) const throw () = 0;
      virtual const char * pHostName (
! epicsGuard < epicsMutex > & ) const throw () = 0;
      virtual bool ca_v41_ok (
          epicsGuard < epicsMutex > & ) const = 0;
      virtual bool ca_v42_ok (
Index: noopiiu.cpp
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/noopiiu.cpp,v
retrieving revision 1.1.2.3
diff -c -r1.1.2.3 noopiiu.cpp
*** noopiiu.cpp 19 Oct 2004 20:46:38 -0000 1.1.2.3
--- noopiiu.cpp 11 Apr 2005 21:21:02 -0000
***************
*** 41,47 ****
  }

  const char * noopiiu::pHostName (
! epicsGuard < epicsMutex > & cacGuard ) const
  {
      return netiiu::pHostName ( cacGuard );
  }
--- 41,47 ----
  }

  const char * noopiiu::pHostName (
! epicsGuard < epicsMutex > & cacGuard ) const throw ()
  {
      return netiiu::pHostName ( cacGuard );
  }
Index: noopiiu.h
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/noopiiu.h,v
retrieving revision 1.1.2.3
diff -c -r1.1.2.3 noopiiu.h
*** noopiiu.h 19 Oct 2004 20:46:55 -0000 1.1.2.3
--- noopiiu.h 11 Apr 2005 21:21:02 -0000
***************
*** 34,40 ****
          epicsGuard < epicsMutex > &, char * pBuf,
          unsigned bufLength ) const throw ();
      const char * pHostName (
! epicsGuard < epicsMutex > & ) const;
      bool ca_v41_ok (
          epicsGuard < epicsMutex > & ) const;
      bool ca_v42_ok (
--- 34,40 ----
          epicsGuard < epicsMutex > &, char * pBuf,
          unsigned bufLength ) const throw ();
      const char * pHostName (
! epicsGuard < epicsMutex > & ) const throw ();
      bool ca_v41_ok (
          epicsGuard < epicsMutex > & ) const;
      bool ca_v42_ok (
Index: tcpiiu.cpp
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/tcpiiu.cpp,v
retrieving revision 1.154.2.28
diff -c -r1.154.2.28 tcpiiu.cpp
*** tcpiiu.cpp 19 Oct 2004 20:53:43 -0000 1.154.2.28
--- tcpiiu.cpp 11 Apr 2005 21:21:02 -0000
***************
*** 1708,1714 ****
  }

  const char * tcpiiu::pHostName (
! epicsGuard < epicsMutex > & guard ) const
  {
      guard.assertIdenticalMutex ( this->mutex );
      return this->hostNameCacheInstance.pointer ();
--- 1708,1714 ----
  }

  const char * tcpiiu::pHostName (
! epicsGuard < epicsMutex > & guard ) const throw ()
  {
      guard.assertIdenticalMutex ( this->mutex );
      return this->hostNameCacheInstance.pointer ();
Index: udpiiu.cpp
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/udpiiu.cpp,v
retrieving revision 1.103.2.23
diff -c -r1.103.2.23 udpiiu.cpp
*** udpiiu.cpp 19 Oct 2004 20:55:02 -0000 1.103.2.23
--- udpiiu.cpp 11 Apr 2005 21:21:02 -0000
***************
*** 1135,1141 ****
  }

  const char * udpiiu::pHostName (
! epicsGuard < epicsMutex > & cacGuard ) const
  {
      return netiiu::pHostName ( cacGuard );
  }
--- 1135,1141 ----
  }

  const char * udpiiu::pHostName (
! epicsGuard < epicsMutex > & cacGuard ) const throw ()
  {
      return netiiu::pHostName ( cacGuard );
  }
Index: udpiiu.h
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/udpiiu.h,v
retrieving revision 1.24.2.13
diff -c -r1.24.2.13 udpiiu.h
*** udpiiu.h 19 Oct 2004 20:55:21 -0000 1.24.2.13
--- udpiiu.h 11 Apr 2005 21:21:02 -0000
***************
*** 181,187 ****
          epicsGuard < epicsMutex > &, char * pBuf,
          unsigned bufLength ) const throw ();
      const char * pHostName (
! epicsGuard < epicsMutex > & ) const;
          bool ca_v41_ok (
          epicsGuard < epicsMutex > & ) const;
      bool ca_v42_ok (
--- 181,187 ----
          epicsGuard < epicsMutex > &, char * pBuf,
          unsigned bufLength ) const throw ();
      const char * pHostName (
! epicsGuard < epicsMutex > & ) const throw ();
          bool ca_v41_ok (
          epicsGuard < epicsMutex > & ) const;
      bool ca_v42_ok (
Index: virtualCircuit.h
===================================================================
RCS file: /net/phoebus/epicsmgr/cvsroot/epics/base/src/ca/virtualCircuit.h,v
retrieving revision 1.47.2.19
diff -c -r1.47.2.19 virtualCircuit.h
*** virtualCircuit.h 19 Oct 2004 20:55:39 -0000 1.47.2.19
--- virtualCircuit.h 11 Apr 2005 21:21:02 -0000
***************
*** 242,248 ****
      void recvBytes (
          void * pBuf, unsigned nBytesInBuf, statusWireIO & );
      const char * pHostName (
! epicsGuard < epicsMutex > & ) const;
      double receiveWatchdogDelay (
          epicsGuard < epicsMutex > & ) const;
      void unresponsiveCircuitNotify (
--- 242,248 ----
      void recvBytes (
          void * pBuf, unsigned nBytesInBuf, statusWireIO & );
      const char * pHostName (
! epicsGuard < epicsMutex > & ) const throw ();
      double receiveWatchdogDelay (
          epicsGuard < epicsMutex > & ) const;
      void unresponsiveCircuitNotify (