87 lines
1.9 KiB
Diff
87 lines
1.9 KiB
Diff
=== modified file 'src/ca/udpiiu.cpp'
|
|
--- src/ca/udpiiu.cpp 2011-07-26 22:23:34 +0000
|
|
+++ src/ca/udpiiu.cpp 2011-12-13 01:50:13 +0000
|
|
@@ -397,6 +397,11 @@
|
|
} while ( ! this->iiu.shutdownCmd );
|
|
}
|
|
|
|
+/* for sunpro compiler */
|
|
+udpiiu::M_repeaterTimerNotify::~M_repeaterTimerNotify ()
|
|
+{
|
|
+}
|
|
+
|
|
/*
|
|
* udpiiu::M_repeaterTimerNotify::repeaterRegistrationMessage ()
|
|
*
|
|
|
|
=== modified file 'src/ca/udpiiu.h'
|
|
--- src/ca/udpiiu.h 2011-09-08 23:57:14 +0000
|
|
+++ src/ca/udpiiu.h 2011-12-13 01:50:13 +0000
|
|
@@ -143,6 +143,7 @@
|
|
public:
|
|
M_repeaterTimerNotify ( udpiiu & iiu ) :
|
|
m_udpiiu ( iiu ) {}
|
|
+ ~M_repeaterTimerNotify (); /* for sunpro compiler */
|
|
// repeaterTimerNotify
|
|
void repeaterRegistrationMessage (
|
|
unsigned attemptNumber );
|
|
|
|
=== modified file 'src/cas/generic/st/casStreamOS.cc'
|
|
--- src/cas/generic/st/casStreamOS.cc 2011-04-05 21:08:49 +0000
|
|
+++ src/cas/generic/st/casStreamOS.cc 2011-12-13 01:50:13 +0000
|
|
@@ -231,6 +231,18 @@
|
|
}
|
|
|
|
//
|
|
+// casStreamOS::armRecv ()
|
|
+//
|
|
+inline void casStreamOS::armRecv()
|
|
+{
|
|
+ if ( ! this->pRdReg ) {
|
|
+ if ( ! this->inBufFull() ) {
|
|
+ this->pRdReg = new casStreamReadReg ( *this );
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
+//
|
|
// casStreamIOWakeup::expire()
|
|
//
|
|
// This is called whenever asynchronous IO completes
|
|
@@ -298,18 +310,6 @@
|
|
}
|
|
|
|
//
|
|
-// casStreamOS::armRecv ()
|
|
-//
|
|
-inline void casStreamOS::armRecv()
|
|
-{
|
|
- if ( ! this->pRdReg ) {
|
|
- if ( ! this->inBufFull() ) {
|
|
- this->pRdReg = new casStreamReadReg ( *this );
|
|
- }
|
|
- }
|
|
-}
|
|
-
|
|
-//
|
|
// casStreamOS::disarmRecv ()
|
|
//
|
|
inline void casStreamOS::disarmRecv ()
|
|
|
|
=== modified file 'src/libCom/test/epicsTimeTest.cpp'
|
|
--- src/libCom/test/epicsTimeTest.cpp 2007-05-07 20:50:38 +0000
|
|
+++ src/libCom/test/epicsTimeTest.cpp 2011-12-13 01:50:13 +0000
|
|
@@ -9,6 +9,11 @@
|
|
/*
|
|
* Authors: Jeff Hill, Marty Kraimer and Andrew Johnson
|
|
*/
|
|
+
|
|
+#ifdef __SUNPRO_CC
|
|
+using namespace std;
|
|
+#endif
|
|
+
|
|
#include <cstddef>
|
|
#include <cstdio>
|
|
#include <ctime>
|
|
|