diff --git a/src/ca/udpiiu.cpp b/src/ca/udpiiu.cpp index 625bead9f..4760583e9 100644 --- a/src/ca/udpiiu.cpp +++ b/src/ca/udpiiu.cpp @@ -397,6 +397,11 @@ void udpRecvThread::run () } while ( ! this->iiu.shutdownCmd ); } +/* for sunpro compiler */ +udpiiu::M_repeaterTimerNotify::~M_repeaterTimerNotify () +{ +} + /* * udpiiu::M_repeaterTimerNotify::repeaterRegistrationMessage () * diff --git a/src/ca/udpiiu.h b/src/ca/udpiiu.h index 2f9918e49..103547919 100644 --- a/src/ca/udpiiu.h +++ b/src/ca/udpiiu.h @@ -143,6 +143,7 @@ private: public: M_repeaterTimerNotify ( udpiiu & iiu ) : m_udpiiu ( iiu ) {} + ~M_repeaterTimerNotify (); /* for sunpro compiler */ // repeaterTimerNotify void repeaterRegistrationMessage ( unsigned attemptNumber ); diff --git a/src/cas/generic/st/casStreamOS.cc b/src/cas/generic/st/casStreamOS.cc index 12d2f2dab..e1fedb38a 100644 --- a/src/cas/generic/st/casStreamOS.cc +++ b/src/cas/generic/st/casStreamOS.cc @@ -230,6 +230,18 @@ void casStreamIOWakeup::show ( unsigned level ) const printf ( "}\n" ); } +// +// casStreamOS::armRecv () +// +inline void casStreamOS::armRecv() +{ + if ( ! this->pRdReg ) { + if ( ! this->inBufFull() ) { + this->pRdReg = new casStreamReadReg ( *this ); + } + } +} + // // casStreamIOWakeup::expire() // @@ -297,18 +309,6 @@ void casStreamIOWakeup::start ( casStreamOS &os ) this->pOS->printStatus ( "casStreamIOWakeup tmr start" ); } -// -// casStreamOS::armRecv () -// -inline void casStreamOS::armRecv() -{ - if ( ! this->pRdReg ) { - if ( ! this->inBufFull() ) { - this->pRdReg = new casStreamReadReg ( *this ); - } - } -} - // // casStreamOS::disarmRecv () // diff --git a/src/libCom/test/epicsTimeTest.cpp b/src/libCom/test/epicsTimeTest.cpp index 31a40f2b6..98cedd4bd 100644 --- a/src/libCom/test/epicsTimeTest.cpp +++ b/src/libCom/test/epicsTimeTest.cpp @@ -9,6 +9,11 @@ /* * Authors: Jeff Hill, Marty Kraimer and Andrew Johnson */ + +#ifdef __SUNPRO_CC +using namespace std; +#endif + #include #include #include