Merge lp:~anj/epics-base/remove-hpux-artifacts into lp:~epics-core/epics-base/3.15

Proposed by Andrew Johnson
Status: Merged
Merged at revision: 12292
Proposed branch: lp:~anj/epics-base/remove-hpux-artifacts
Merge into: lp:~epics-core/epics-base/3.15
Diff against target: 2394 lines (+161/-420)
98 files modified
documentation/README.1st (+0/-1)
documentation/README.html (+0/-1)
src/ca/client/CASG.cpp (+0/-7)
src/ca/client/access.cpp (+3/-3)
src/ca/client/bhe.cpp (+0/-7)
src/ca/client/bhe.h (+0/-1)
src/ca/client/ca_client_context.cpp (+3/-3)
src/ca/client/cac.cpp (+6/-6)
src/ca/client/cac.h (+1/-1)
src/ca/client/cacIO.h (+7/-7)
src/ca/client/casw.cpp (+2/-2)
src/ca/client/comBuf.h (+2/-3)
src/ca/client/comQueRecv.cpp (+1/-1)
src/ca/client/comQueSend.cpp (+1/-1)
src/ca/client/disconnectGovernorTimer.cpp (+1/-1)
src/ca/client/disconnectGovernorTimer.h (+1/-1)
src/ca/client/getCallback.cpp (+0/-7)
src/ca/client/getCopy.cpp (+0/-7)
src/ca/client/iocinf.cpp (+10/-10)
src/ca/client/msgForMultiplyDefinedPV.cpp (+0/-7)
src/ca/client/msgForMultiplyDefinedPV.h (+1/-2)
src/ca/client/nciu.cpp (+0/-7)
src/ca/client/nciu.h (+1/-2)
src/ca/client/netIO.h (+5/-8)
src/ca/client/netReadNotifyIO.cpp (+0/-7)
src/ca/client/netSubscription.cpp (+0/-7)
src/ca/client/netWriteNotifyIO.cpp (+0/-8)
src/ca/client/netiiu.h (+1/-1)
src/ca/client/oldAccess.h (+0/-5)
src/ca/client/oldChannelNotify.cpp (+1/-8)
src/ca/client/putCallback.cpp (+0/-7)
src/ca/client/repeater.cpp (+3/-10)
src/ca/client/repeaterClient.h (+0/-1)
src/ca/client/repeaterSubscribeTimer.cpp (+1/-1)
src/ca/client/repeaterSubscribeTimer.h (+1/-1)
src/ca/client/searchTimer.cpp (+1/-1)
src/ca/client/searchTimer.h (+1/-1)
src/ca/client/syncGroup.h (+1/-4)
src/ca/client/syncGroupReadNotify.cpp (+1/-8)
src/ca/client/syncGroupWriteNotify.cpp (+0/-7)
src/ca/client/syncgrp.cpp (+2/-2)
src/ca/client/tcpRecvWatchdog.cpp (+1/-1)
src/ca/client/tcpiiu.cpp (+16/-19)
src/ca/client/test_event.cpp (+2/-2)
src/ca/client/udpiiu.cpp (+2/-2)
src/ca/client/virtualCircuit.h (+1/-2)
src/ca/legacy/gdd/aitConvert.h (+4/-4)
src/ca/legacy/gdd/gddAppTable.cc (+0/-15)
src/ca/legacy/gdd/gddI.h (+10/-10)
src/ca/legacy/gdd/gddUtilsI.h (+1/-1)
src/ca/legacy/gdd/smartGDDPointer.h (+2/-2)
src/ca/legacy/pcas/example/directoryService/directoryServer.h (+1/-1)
src/ca/legacy/pcas/example/directoryService/main.cc (+0/-3)
src/ca/legacy/pcas/generic/caNetAddr.cc (+1/-1)
src/ca/legacy/pcas/generic/caServer.cc (+7/-7)
src/ca/legacy/pcas/generic/casChannel.cc (+1/-1)
src/ca/legacy/pcas/generic/casDGClient.cc (+1/-1)
src/ca/legacy/pcas/generic/casMonEvent.cc (+0/-7)
src/ca/legacy/pcas/generic/casMonEvent.h (+0/-1)
src/ca/legacy/pcas/generic/casMonitor.cc (+3/-3)
src/ca/legacy/pcas/generic/casMonitor.h (+1/-2)
src/ca/legacy/pcas/generic/casPVI.cc (+2/-2)
src/ca/legacy/pcas/generic/casStrmClient.cc (+4/-4)
src/ca/legacy/pcas/generic/casdef.h (+1/-1)
src/ca/legacy/pcas/generic/chanIntfForPV.h (+1/-1)
src/ca/legacy/pcas/generic/inBuf.cc (+2/-2)
src/ca/legacy/pcas/generic/inBuf.h (+1/-1)
src/ca/legacy/pcas/generic/outBuf.cc (+2/-2)
src/ca/legacy/pcas/generic/outBuf.h (+1/-1)
src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc (+1/-1)
src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc (+4/-4)
src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc (+1/-1)
src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc (+2/-2)
src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp (+0/-7)
src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h (+0/-1)
src/ioc/db/dbCAC.h (+1/-2)
src/ioc/db/dbChannelIO.cpp (+0/-7)
src/ioc/db/dbChannelIO.h (+0/-1)
src/ioc/db/dbContext.cpp (+1/-1)
src/ioc/db/dbPutNotifyBlocker.cpp (+0/-7)
src/ioc/db/dbPutNotifyBlocker.h (+0/-1)
src/ioc/db/dbSubscriptionIO.cpp (+0/-7)
src/libCom/cxxTemplates/resourceLib.h (+6/-6)
src/libCom/fdmgr/fdmgr.cpp (+2/-2)
src/libCom/misc/ipAddrToAsciiAsynchronous.cpp (+0/-8)
src/libCom/misc/ipAddrToAsciiAsynchronous.h (+2/-2)
src/libCom/osi/epicsMutex.cpp (+1/-1)
src/libCom/osi/os/posix/osdTime.cpp (+2/-2)
src/libCom/timer/epicsTimer.h (+5/-5)
src/libCom/timer/timer.cpp (+0/-14)
src/libCom/timer/timerPrivate.h (+1/-3)
src/std/softIoc/softMain.cpp (+1/-1)
src/template/base/top/caServerApp/exPV.cc (+1/-1)
src/template/base/top/caServerApp/exServer.cc (+2/-2)
src/template/base/top/caServerApp/exServer.h (+1/-1)
src/template/base/top/caServerApp/exVectorPV.cc (+1/-1)
src/tools/Makefile (+0/-1)
src/tools/filterWarnings.pl (+0/-54)
To merge this branch: bzr merge lp:~anj/epics-base/remove-hpux-artifacts
Reviewer Review Type Date Requested Status
Jeff Hill Pending
Review via email: mp+101785@code.launchpad.net

Commit message

Merged the remove-hpux-artifacts branch which takes out various modifications made to get Base to build on HPUX.

Description of the change

Jeff,

Please review these changes, which I'd like to merge into the 3.15 branch. I don't think you'll have any problem with them, but I'd like your OK before I go ahead.

Thanks,

- Andrew

This branch removes various things that were added for HPUX-specific reasons. Since we don't support HPUX any more they are no longer needed.
 * Comments in the form // X aCC <number>
 * The filterWarnings.pl script
 * Unnecessary return statements inside HP-specific #if ... #endif blocks
 * Many operator new(size_t) methods that just threw an exception

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'documentation/README.1st'
--- documentation/README.1st 2011-10-28 23:27:50 +0000
+++ documentation/README.1st 2012-04-12 17:46:27 +0000
@@ -272,7 +272,6 @@
272 cvsclean.pl Remove all .#* files in directory tree272 cvsclean.pl Remove all .#* files in directory tree
273 dos2unix.pl Converts text file from DOS CR/LF to unix ISO273 dos2unix.pl Converts text file from DOS CR/LF to unix ISO
274 expandvars.pl Tool to expand @VAR@ variables while copying a file274 expandvars.pl Tool to expand @VAR@ variables while copying a file
275 filterWarnings.pl Filters warning messages during HP builds
276 fullpathName.pl Returns fullpath name of directory arg275 fullpathName.pl Returns fullpath name of directory arg
277 installEpics.pl Installs built files into install directories276 installEpics.pl Installs built files into install directories
278 makeIncludeDbd.pl Creates *Include.dbd file from filename args files277 makeIncludeDbd.pl Creates *Include.dbd file from filename args files
279278
=== modified file 'documentation/README.html'
--- documentation/README.html 2011-10-28 23:27:50 +0000
+++ documentation/README.html 2012-04-12 17:46:27 +0000
@@ -284,7 +284,6 @@
284 cvsclean.pl Remove all .#* files in directory tree284 cvsclean.pl Remove all .#* files in directory tree
285 dos2unix.pl Converts text file from DOS CR/LF to unix ISO285 dos2unix.pl Converts text file from DOS CR/LF to unix ISO
286 expandvars.pl Tool to expand @VAR@ variables while copying a file286 expandvars.pl Tool to expand @VAR@ variables while copying a file
287 filterWarnings.pl Filters warning messages during HP builds
288 fullpathName.pl Returns fullpath name of directory arg287 fullpathName.pl Returns fullpath name of directory arg
289 installEpics.pl Installs built files into install directories288 installEpics.pl Installs built files into install directories
290 makeIncludeDbd.pl Creates *Include.dbd file from filename args files289 makeIncludeDbd.pl Creates *Include.dbd file from filename args files
291290
=== modified file 'src/ca/client/CASG.cpp'
--- src/ca/client/CASG.cpp 2010-08-10 21:05:46 +0000
+++ src/ca/client/CASG.cpp 2012-04-12 17:46:27 +0000
@@ -295,13 +295,6 @@
295 }295 }
296}296}
297297
298void * CASG::operator new ( size_t ) // X aCC 361
299{
300 // The HPUX compiler seems to require this even though no code
301 // calls it directly
302 throw std::logic_error ( "why is the compiler calling private operator new" );
303}
304
305void CASG::operator delete ( void * )298void CASG::operator delete ( void * )
306{299{
307 // Visual C++ .net appears to require operator delete if300 // Visual C++ .net appears to require operator delete if
308301
=== modified file 'src/ca/client/access.cpp'
--- src/ca/client/access.cpp 2009-08-14 19:12:50 +0000
+++ src/ca/client/access.cpp 2012-04-12 17:46:27 +0000
@@ -433,7 +433,7 @@
433}433}
434434
435// extern "C"435// extern "C"
436int epicsShareAPI ca_pend ( ca_real timeout, int early ) // X aCC 361436int epicsShareAPI ca_pend ( ca_real timeout, int early )
437{437{
438 if ( early ) {438 if ( early ) {
439 return ca_pend_io ( timeout );439 return ca_pend_io ( timeout );
@@ -516,7 +516,7 @@
516/*516/*
517 * CA_TEST_IO ()517 * CA_TEST_IO ()
518 */518 */
519int epicsShareAPI ca_test_io () // X aCC 361519int epicsShareAPI ca_test_io ()
520{520{
521 ca_client_context *pcac;521 ca_client_context *pcac;
522 int caStatus = fetchClientContext ( &pcac );522 int caStatus = fetchClientContext ( &pcac );
@@ -551,7 +551,7 @@
551 * (if they call this routine again).551 * (if they call this routine again).
552 */552 */
553// extern "C"553// extern "C"
554const char * epicsShareAPI ca_message ( long ca_status ) // X aCC 361554const char * epicsShareAPI ca_message ( long ca_status )
555{555{
556 unsigned msgNo = CA_EXTRACT_MSG_NO ( ca_status );556 unsigned msgNo = CA_EXTRACT_MSG_NO ( ca_status );
557557
558558
=== modified file 'src/ca/client/bhe.cpp'
--- src/ca/client/bhe.cpp 2010-11-04 16:19:54 +0000
+++ src/ca/client/bhe.cpp 2012-04-12 17:46:27 +0000
@@ -332,13 +332,6 @@
332 }332 }
333}333}
334334
335void * bhe::operator new ( size_t ) // X aCC 361
336{
337 // The HPUX compiler seems to require this even though no code
338 // calls it directly
339 throw std::logic_error ( "why is the compiler calling private operator new" );
340}
341
342void bhe::operator delete ( void * )335void bhe::operator delete ( void * )
343{336{
344 // Visual C++ .net appears to require operator delete if337 // Visual C++ .net appears to require operator delete if
345338
=== modified file 'src/ca/client/bhe.h'
--- src/ca/client/bhe.h 2010-11-04 16:19:54 +0000
+++ src/ca/client/bhe.h 2012-04-12 17:46:27 +0000
@@ -87,7 +87,6 @@
87 const epicsTime & currentTime );87 const epicsTime & currentTime );
88 bhe ( const bhe & );88 bhe ( const bhe & );
89 bhe & operator = ( const bhe & );89 bhe & operator = ( const bhe & );
90 void * operator new ( size_t size );
91 epicsShareFunc void operator delete ( void * );90 epicsShareFunc void operator delete ( void * );
92};91};
9392
9493
=== modified file 'src/ca/client/ca_client_context.cpp'
--- src/ca/client/ca_client_context.cpp 2010-08-10 21:05:46 +0000
+++ src/ca/client/ca_client_context.cpp 2012-04-12 17:46:27 +0000
@@ -106,7 +106,7 @@
106106
107 {107 {
108 osiSockIoctl_t yes = true;108 osiSockIoctl_t yes = true;
109 int status = socket_ioctl ( this->sock, // X aCC 392109 int status = socket_ioctl ( this->sock,
110 FIONBIO, & yes);110 FIONBIO, & yes);
111 if ( status < 0 ) {111 if ( status < 0 ) {
112 char sockErrBuf[64];112 char sockErrBuf[64];
@@ -126,7 +126,7 @@
126 memset ( (char *)&addr, 0 , sizeof ( addr ) );126 memset ( (char *)&addr, 0 , sizeof ( addr ) );
127 addr.ia.sin_family = AF_INET;127 addr.ia.sin_family = AF_INET;
128 addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY ); 128 addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
129 addr.ia.sin_port = htons ( PORT_ANY ); // X aCC 818129 addr.ia.sin_port = htons ( PORT_ANY );
130 int status = bind (this->sock, &addr.sa, sizeof (addr) );130 int status = bind (this->sock, &addr.sa, sizeof (addr) );
131 if ( status < 0 ) {131 if ( status < 0 ) {
132 char sockErrBuf[64];132 char sockErrBuf[64];
@@ -277,7 +277,7 @@
277}277}
278278
279int ca_client_context :: varArgsPrintFormated ( 279int ca_client_context :: varArgsPrintFormated (
280 const char *pformat, va_list args ) const // X aCC 361280 const char *pformat, va_list args ) const
281{281{
282 caPrintfFunc * pFunc;282 caPrintfFunc * pFunc;
283 {283 {
284284
=== modified file 'src/ca/client/cac.cpp'
--- src/ca/client/cac.cpp 2010-08-23 20:17:16 +0000
+++ src/ca/client/cac.cpp 2012-04-12 17:46:27 +0000
@@ -568,7 +568,7 @@
568}568}
569569
570void cac::transferChanToVirtCircuit ( 570void cac::transferChanToVirtCircuit (
571 unsigned cid, unsigned sid, // X aCC 431571 unsigned cid, unsigned sid,
572 ca_uint16_t typeCode, arrayElementCount count, 572 ca_uint16_t typeCode, arrayElementCount count,
573 unsigned minorVersionNumber, const osiSockAddr & addr,573 unsigned minorVersionNumber, const osiSockAddr & addr,
574 const epicsTime & currentTime )574 const epicsTime & currentTime )
@@ -787,7 +787,7 @@
787netSubscription & cac::subscriptionRequest ( 787netSubscription & cac::subscriptionRequest (
788 epicsGuard < epicsMutex > & guard, 788 epicsGuard < epicsMutex > & guard,
789 nciu & chan, privateInterfaceForIO & privChan,789 nciu & chan, privateInterfaceForIO & privChan,
790 unsigned type, // X aCC 361790 unsigned type,
791 arrayElementCount nElem, unsigned mask, 791 arrayElementCount nElem, unsigned mask,
792 cacStateNotify & notifyIn,792 cacStateNotify & notifyIn,
793 bool chanIsInstalled )793 bool chanIsInstalled )
@@ -1021,7 +1021,7 @@
1021}1021}
10221022
1023bool cac::writeExcep ( 1023bool cac::writeExcep (
1024 callbackManager & mgr, // X aCC 4311024 callbackManager & mgr,
1025 tcpiiu &, const caHdrLargeArray & hdr, 1025 tcpiiu &, const caHdrLargeArray & hdr,
1026 const char * pCtx, unsigned status )1026 const char * pCtx, unsigned status )
1027{1027{
@@ -1093,7 +1093,7 @@
1093}1093}
10941094
1095bool cac::accessRightsRespAction (1095bool cac::accessRightsRespAction (
1096 callbackManager & mgr, tcpiiu &, // X aCC 4311096 callbackManager & mgr, tcpiiu &,
1097 const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )1097 const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )
1098{1098{
1099 epicsGuard < epicsMutex > guard ( this->mutex );1099 epicsGuard < epicsMutex > guard ( this->mutex );
@@ -1110,7 +1110,7 @@
1110}1110}
11111111
1112bool cac::createChannelRespAction (1112bool cac::createChannelRespAction (
1113 callbackManager & mgr, tcpiiu & iiu, // X aCC 4311113 callbackManager & mgr, tcpiiu & iiu,
1114 const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )1114 const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ )
1115{1115{
1116 epicsGuard < epicsMutex > guard ( this->mutex );1116 epicsGuard < epicsMutex > guard ( this->mutex );
@@ -1157,7 +1157,7 @@
1157}1157}
11581158
1159void cac::disconnectChannel (1159void cac::disconnectChannel (
1160 epicsGuard < epicsMutex > & cbGuard, // X aCC 4311160 epicsGuard < epicsMutex > & cbGuard,
1161 epicsGuard < epicsMutex > & guard, nciu & chan )1161 epicsGuard < epicsMutex > & guard, nciu & chan )
1162{1162{
1163 guard.assertIdenticalMutex ( this->mutex );1163 guard.assertIdenticalMutex ( this->mutex );
11641164
=== modified file 'src/ca/client/cac.h'
--- src/ca/client/cac.h 2011-06-01 22:22:12 +0000
+++ src/ca/client/cac.h 2012-04-12 17:46:27 +0000
@@ -55,7 +55,7 @@
55// used to control access to cac's recycle routines which55// used to control access to cac's recycle routines which
56// should only be indirectly invoked by CAC when its lock56// should only be indirectly invoked by CAC when its lock
57// is applied57// is applied
58class cacRecycle { // X aCC 65558class cacRecycle {
59public:59public:
60 virtual void recycleReadNotifyIO ( 60 virtual void recycleReadNotifyIO (
61 epicsGuard < epicsMutex > &, netReadNotifyIO &io ) = 0;61 epicsGuard < epicsMutex > &, netReadNotifyIO &io ) = 0;
6262
=== modified file 'src/ca/client/cacIO.h'
--- src/ca/client/cacIO.h 2009-02-11 00:50:28 +0000
+++ src/ca/client/cacIO.h 2012-04-12 17:46:27 +0000
@@ -69,7 +69,7 @@
6969
70// 1) this should not be passing caerr.h status to the exception callback70// 1) this should not be passing caerr.h status to the exception callback
71// 2) needless-to-say the data should be passed here using the new data access API71// 2) needless-to-say the data should be passed here using the new data access API
72class epicsShareClass cacWriteNotify { // X aCC 65572class epicsShareClass cacWriteNotify {
73public:73public:
74 virtual ~cacWriteNotify () = 0;74 virtual ~cacWriteNotify () = 0;
75 virtual void completion ( epicsGuard < epicsMutex > & ) = 0;75 virtual void completion ( epicsGuard < epicsMutex > & ) = 0;
@@ -82,7 +82,7 @@
8282
83// 1) this should not be passing caerr.h status to the exception callback83// 1) this should not be passing caerr.h status to the exception callback
84// 2) needless-to-say the data should be passed here using the new data access API84// 2) needless-to-say the data should be passed here using the new data access API
85class epicsShareClass cacReadNotify { // X aCC 65585class epicsShareClass cacReadNotify {
86public:86public:
87 virtual ~cacReadNotify () = 0;87 virtual ~cacReadNotify () = 0;
88 virtual void completion ( 88 virtual void completion (
@@ -97,7 +97,7 @@
9797
98// 1) this should not be passing caerr.h status to the exception callback98// 1) this should not be passing caerr.h status to the exception callback
99// 2) needless-to-say the data should be passed here using the new data access API99// 2) needless-to-say the data should be passed here using the new data access API
100class epicsShareClass cacStateNotify { // X aCC 655100class epicsShareClass cacStateNotify {
101public:101public:
102 virtual ~cacStateNotify () = 0;102 virtual ~cacStateNotify () = 0;
103 virtual void current ( 103 virtual void current (
@@ -131,7 +131,7 @@
131 bool f_operatorConfirmationRequest:1;131 bool f_operatorConfirmationRequest:1;
132};132};
133133
134class epicsShareClass cacChannelNotify { // X aCC 655134class epicsShareClass cacChannelNotify {
135public:135public:
136 virtual ~cacChannelNotify () = 0;136 virtual ~cacChannelNotify () = 0;
137 virtual void connectNotify ( epicsGuard < epicsMutex > & ) = 0;137 virtual void connectNotify ( epicsGuard < epicsMutex > & ) = 0;
@@ -258,7 +258,7 @@
258 cacChannel & operator = ( const cacChannel & );258 cacChannel & operator = ( const cacChannel & );
259};259};
260260
261class epicsShareClass cacContext { // X aCC 655261class epicsShareClass cacContext {
262public:262public:
263 virtual ~cacContext ();263 virtual ~cacContext ();
264 virtual cacChannel & createChannel ( 264 virtual cacChannel & createChannel (
@@ -277,7 +277,7 @@
277 epicsGuard < epicsMutex > &, unsigned level ) const = 0;277 epicsGuard < epicsMutex > &, unsigned level ) const = 0;
278};278};
279279
280class epicsShareClass cacContextNotify { // X aCC 655280class epicsShareClass cacContextNotify {
281public:281public:
282 virtual ~cacContextNotify () = 0;282 virtual ~cacContextNotify () = 0;
283 virtual cacContext & createNetworkContext ( 283 virtual cacContext & createNetworkContext (
@@ -297,7 +297,7 @@
297// **** Lock Hierarchy ****297// **** Lock Hierarchy ****
298// callbackControl must be taken before mutualExclusion if both are held at298// callbackControl must be taken before mutualExclusion if both are held at
299// the same time299// the same time
300class epicsShareClass cacService { // X aCC 655300class epicsShareClass cacService {
301public:301public:
302 virtual ~cacService () = 0;302 virtual ~cacService () = 0;
303 virtual cacContext & contextCreate ( 303 virtual cacContext & contextCreate (
304304
=== modified file 'src/ca/client/casw.cpp'
--- src/ca/client/casw.cpp 2006-11-18 00:42:32 +0000
+++ src/ca/client/casw.cpp 2012-04-12 17:46:27 +0000
@@ -131,7 +131,7 @@
131 }131 }
132132
133 osiSockIoctl_t yes = true;133 osiSockIoctl_t yes = true;
134 status = socket_ioctl ( sock, FIONBIO, &yes ); // X aCC 392134 status = socket_ioctl ( sock, FIONBIO, &yes );
135 if ( status < 0 ) {135 if ( status < 0 ) {
136 char sockErrBuf[64];136 char sockErrBuf[64];
137 epicsSocketConvertErrnoToString ( 137 epicsSocketConvertErrnoToString (
@@ -166,7 +166,7 @@
166 }166 }
167167
168 osiSockIoctl_t no = false;168 osiSockIoctl_t no = false;
169 status = socket_ioctl ( sock, FIONBIO, &no ); // X aCC 392169 status = socket_ioctl ( sock, FIONBIO, &no );
170 if ( status < 0 ) {170 if ( status < 0 ) {
171 char sockErrBuf[64];171 char sockErrBuf[64];
172 epicsSocketConvertErrnoToString ( 172 epicsSocketConvertErrnoToString (
173173
=== modified file 'src/ca/client/comBuf.h'
--- src/ca/client/comBuf.h 2008-10-02 15:43:04 +0000
+++ src/ca/client/comBuf.h 2012-04-12 17:46:27 +0000
@@ -44,7 +44,7 @@
44 virtual void release ( void * ) = 0; 44 virtual void release ( void * ) = 0;
45};45};
4646
47class wireSendAdapter { // X aCC 65547class wireSendAdapter {
48public:48public:
49 virtual unsigned sendBytes ( const void * pBuf, 49 virtual unsigned sendBytes ( const void * pBuf,
50 unsigned nBytesInBuf, 50 unsigned nBytesInBuf,
@@ -65,7 +65,7 @@
65 swioCircuitState circuitState;65 swioCircuitState circuitState;
66};66};
6767
68class wireRecvAdapter { // X aCC 65568class wireRecvAdapter {
69public:69public:
70 virtual void recvBytes ( void * pBuf, 70 virtual void recvBytes ( void * pBuf,
71 unsigned nBytesInBuf, statusWireIO & ) = 0;71 unsigned nBytesInBuf, statusWireIO & ) = 0;
@@ -114,7 +114,6 @@
114 unsigned nextWriteIndex;114 unsigned nextWriteIndex;
115 unsigned nextReadIndex;115 unsigned nextReadIndex;
116 epicsUInt8 buf [ comBufSize ];116 epicsUInt8 buf [ comBufSize ];
117 void * operator new ( size_t size );
118 void operator delete ( void * );117 void operator delete ( void * );
119 template < class T >118 template < class T >
120 bool push ( const T * ); // disabled119 bool push ( const T * ); // disabled
121120
=== modified file 'src/ca/client/comQueRecv.cpp'
--- src/ca/client/comQueRecv.cpp 2009-07-07 23:47:38 +0000
+++ src/ca/client/comQueRecv.cpp 2012-04-12 17:46:27 +0000
@@ -155,7 +155,7 @@
155 unsigned byte3 = this->popUInt8();155 unsigned byte3 = this->popUInt8();
156 unsigned byte4 = this->popUInt8();156 unsigned byte4 = this->popUInt8();
157 tmp = static_cast <epicsUInt32>157 tmp = static_cast <epicsUInt32>
158 ( ( byte1 << 24u ) | ( byte2 << 16u ) | //X aCC 392158 ( ( byte1 << 24u ) | ( byte2 << 16u ) |
159 ( byte3 << 8u ) | byte4 );159 ( byte3 << 8u ) | byte4 );
160 }160 }
161 else {161 else {
162162
=== modified file 'src/ca/client/comQueSend.cpp'
--- src/ca/client/comQueSend.cpp 2008-10-02 15:43:04 +0000
+++ src/ca/client/comQueSend.cpp 2012-04-12 17:46:27 +0000
@@ -368,7 +368,7 @@
368 // the above checks verify that the total size368 // the above checks verify that the total size
369 // is lest that 0xffffffff369 // is lest that 0xffffffff
370 size = static_cast < ca_uint32_t > 370 size = static_cast < ca_uint32_t >
371 ( dbr_size_n ( dataType, nElem ) ); // X aCC 392371 ( dbr_size_n ( dataType, nElem ) );
372 payloadSize = CA_MESSAGE_ALIGN ( size );372 payloadSize = CA_MESSAGE_ALIGN ( size );
373 this->insertRequestHeader ( request, payloadSize, 373 this->insertRequestHeader ( request, payloadSize,
374 static_cast <ca_uint16_t> ( dataType ), 374 static_cast <ca_uint16_t> ( dataType ),
375375
=== modified file 'src/ca/client/disconnectGovernorTimer.cpp'
--- src/ca/client/disconnectGovernorTimer.cpp 2009-08-10 21:51:07 +0000
+++ src/ca/client/disconnectGovernorTimer.cpp 2012-04-12 17:46:27 +0000
@@ -65,7 +65,7 @@
65}65}
6666
67epicsTimerNotify::expireStatus disconnectGovernorTimer::expire ( 67epicsTimerNotify::expireStatus disconnectGovernorTimer::expire (
68 const epicsTime & /* currentTime */ ) // X aCC 36168 const epicsTime & /* currentTime */ )
69{69{
70 epicsGuard < epicsMutex > guard ( this->mutex );70 epicsGuard < epicsMutex > guard ( this->mutex );
71 while ( nciu * pChan = chanList.get () ) {71 while ( nciu * pChan = chanList.get () ) {
7272
=== modified file 'src/ca/client/disconnectGovernorTimer.h'
--- src/ca/client/disconnectGovernorTimer.h 2005-09-13 13:41:46 +0000
+++ src/ca/client/disconnectGovernorTimer.h 2012-04-12 17:46:27 +0000
@@ -43,7 +43,7 @@
43#include "caProto.h"43#include "caProto.h"
44#include "netiiu.h"44#include "netiiu.h"
4545
46class disconnectGovernorNotify { // X aCC 65546class disconnectGovernorNotify {
47public:47public:
48 virtual ~disconnectGovernorNotify () = 0;48 virtual ~disconnectGovernorNotify () = 0;
49 virtual void govExpireNotify ( 49 virtual void govExpireNotify (
5050
=== modified file 'src/ca/client/getCallback.cpp'
--- src/ca/client/getCallback.cpp 2009-08-13 22:43:21 +0000
+++ src/ca/client/getCallback.cpp 2012-04-12 17:46:27 +0000
@@ -90,13 +90,6 @@
90 }90 }
91}91}
9292
93void * getCallback::operator new ( size_t ) // X aCC 361
94{
95 // The HPUX compiler seems to require this even though no code
96 // calls it directly
97 throw std::logic_error ( "why is the compiler calling private operator new" );
98}
99
100void getCallback::operator delete ( void * )93void getCallback::operator delete ( void * )
101{94{
102 // Visual C++ .net appears to require operator delete if95 // Visual C++ .net appears to require operator delete if
10396
=== modified file 'src/ca/client/getCopy.cpp'
--- src/ca/client/getCopy.cpp 2009-08-13 22:46:47 +0000
+++ src/ca/client/getCopy.cpp 2012-04-12 17:46:27 +0000
@@ -105,13 +105,6 @@
105 }105 }
106}106}
107107
108void * getCopy::operator new ( size_t ) // X aCC 361
109{
110 // The HPUX compiler seems to require this even though no code
111 // calls it directly
112 throw std::logic_error ( "why is the compiler calling private operator new" );
113}
114
115void getCopy::operator delete ( void * )108void getCopy::operator delete ( void * )
116{109{
117 // Visual C++ .net appears to require operator delete if110 // Visual C++ .net appears to require operator delete if
118111
=== modified file 'src/ca/client/iocinf.cpp'
--- src/ca/client/iocinf.cpp 2010-08-10 21:05:46 +0000
+++ src/ca/client/iocinf.cpp 2012-04-12 17:46:27 +0000
@@ -133,7 +133,7 @@
133133
134 if ( pNode->addr.sa.sa_family == AF_INET ) {134 if ( pNode->addr.sa.sa_family == AF_INET ) {
135135
136 pTmpNode = (osiSockAddrNode *) ellFirst (pDestList); // X aCC 749136 pTmpNode = (osiSockAddrNode *) ellFirst (pDestList);
137 while ( pTmpNode ) {137 while ( pTmpNode ) {
138 if (pTmpNode->addr.sa.sa_family == AF_INET) {138 if (pTmpNode->addr.sa.sa_family == AF_INET) {
139 if ( pNode->addr.ia.sin_addr.s_addr == pTmpNode->addr.ia.sin_addr.s_addr && 139 if ( pNode->addr.ia.sin_addr.s_addr == pTmpNode->addr.ia.sin_addr.s_addr &&
@@ -149,7 +149,7 @@
149 break;149 break;
150 }150 }
151 }151 }
152 pTmpNode = (osiSockAddrNode *) ellNext (&pTmpNode->node); // X aCC 749152 pTmpNode = (osiSockAddrNode *) ellNext (&pTmpNode->node);
153 }153 }
154 if (pNode) {154 if (pNode) {
155 ellAdd (pDestList, &pNode->node);155 ellAdd (pDestList, &pNode->node);
@@ -168,12 +168,12 @@
168{168{
169 osiSockAddrNode *pNode;169 osiSockAddrNode *pNode;
170170
171 pNode = ( osiSockAddrNode * ) ellFirst ( pList ); // X aCC 749171 pNode = ( osiSockAddrNode * ) ellFirst ( pList );
172 while ( pNode ) {172 while ( pNode ) {
173 if ( pNode->addr.sa.sa_family == AF_INET ) {173 if ( pNode->addr.sa.sa_family == AF_INET ) {
174 pNode->addr.ia.sin_port = htons ( port );174 pNode->addr.ia.sin_port = htons ( port );
175 }175 }
176 pNode = ( osiSockAddrNode * ) ellNext ( &pNode->node ); // X aCC 749176 pNode = ( osiSockAddrNode * ) ellNext ( &pNode->node );
177 }177 }
178}178}
179179
@@ -192,9 +192,9 @@
192 /*192 /*
193 * dont load the list twice193 * dont load the list twice
194 */194 */
195 assert ( ellCount (pList) == 0 ); // X aCC 392195 assert ( ellCount (pList) == 0 );
196196
197 ellInit ( &tmpList ); // X aCC 392197 ellInit ( &tmpList );
198198
199 /*199 /*
200 * Check to see if the user has disabled200 * Check to see if the user has disabled
@@ -217,12 +217,12 @@
217 if (yes) {217 if (yes) {
218 ELLLIST bcastList;218 ELLLIST bcastList;
219 osiSockAddr addr;219 osiSockAddr addr;
220 ellInit ( &bcastList ); // X aCC 392220 ellInit ( &bcastList );
221 addr.ia.sin_family = AF_UNSPEC;221 addr.ia.sin_family = AF_UNSPEC;
222 osiSockDiscoverBroadcastAddresses ( &bcastList, sock, &addr );222 osiSockDiscoverBroadcastAddresses ( &bcastList, sock, &addr );
223 forcePort ( &bcastList, port );223 forcePort ( &bcastList, port );
224 removeDuplicateAddresses ( &tmpList, &bcastList, 1 );224 removeDuplicateAddresses ( &tmpList, &bcastList, 1 );
225 if ( ellCount ( &tmpList ) == 0 ) { // X aCC 392225 if ( ellCount ( &tmpList ) == 0 ) {
226 osiSockAddrNode *pNewNode;226 osiSockAddrNode *pNewNode;
227 pNewNode = (osiSockAddrNode *) calloc ( 1, sizeof (*pNewNode) );227 pNewNode = (osiSockAddrNode *) calloc ( 1, sizeof (*pNewNode) );
228 if ( pNewNode ) {228 if ( pNewNode ) {
@@ -254,11 +254,11 @@
254 osiSockAddrNode *pNode;254 osiSockAddrNode *pNode;
255255
256 ::printf ( "Channel Access Address List\n" );256 ::printf ( "Channel Access Address List\n" );
257 pNode = (osiSockAddrNode *) ellFirst ( pList ); // X aCC 749257 pNode = (osiSockAddrNode *) ellFirst ( pList );
258 while (pNode) {258 while (pNode) {
259 char buf[64];259 char buf[64];
260 ipAddrToA ( &pNode->addr.ia, buf, sizeof ( buf ) );260 ipAddrToA ( &pNode->addr.ia, buf, sizeof ( buf ) );
261 ::printf ( "%s\n", buf );261 ::printf ( "%s\n", buf );
262 pNode = (osiSockAddrNode *) ellNext ( &pNode->node ); // X aCC 749262 pNode = (osiSockAddrNode *) ellNext ( &pNode->node );
263 }263 }
264}264}
265265
=== modified file 'src/ca/client/msgForMultiplyDefinedPV.cpp'
--- src/ca/client/msgForMultiplyDefinedPV.cpp 2004-10-08 15:44:44 +0000
+++ src/ca/client/msgForMultiplyDefinedPV.cpp 2012-04-12 17:46:27 +0000
@@ -73,13 +73,6 @@
73}73}
74#endif74#endif
7575
76void * msgForMultiplyDefinedPV::operator new ( size_t ) // X aCC 361
77{
78 // The HPUX compiler seems to require this even though no code
79 // calls it directly
80 throw std::logic_error ( "why is the compiler calling private operator new" );
81}
82
83void msgForMultiplyDefinedPV::operator delete ( void * )76void msgForMultiplyDefinedPV::operator delete ( void * )
84{77{
85 // Visual C++ .net appears to require operator delete if78 // Visual C++ .net appears to require operator delete if
8679
=== modified file 'src/ca/client/msgForMultiplyDefinedPV.h'
--- src/ca/client/msgForMultiplyDefinedPV.h 2004-10-08 15:39:09 +0000
+++ src/ca/client/msgForMultiplyDefinedPV.h 2012-04-12 17:46:27 +0000
@@ -39,7 +39,7 @@
39# define epicsExportSharedSymbols39# define epicsExportSharedSymbols
40#endif40#endif
4141
42class callbackForMultiplyDefinedPV { // X aCC 65542class callbackForMultiplyDefinedPV {
43public:43public:
44 virtual ~callbackForMultiplyDefinedPV () = 0;44 virtual ~callbackForMultiplyDefinedPV () = 0;
45 virtual void pvMultiplyDefinedNotify ( 45 virtual void pvMultiplyDefinedNotify (
@@ -64,7 +64,6 @@
64 void transactionComplete ( const char * pHostName );64 void transactionComplete ( const char * pHostName );
65 msgForMultiplyDefinedPV ( const msgForMultiplyDefinedPV & );65 msgForMultiplyDefinedPV ( const msgForMultiplyDefinedPV & );
66 msgForMultiplyDefinedPV & operator = ( const msgForMultiplyDefinedPV & );66 msgForMultiplyDefinedPV & operator = ( const msgForMultiplyDefinedPV & );
67 void * operator new ( size_t size );
68 void operator delete ( void * );67 void operator delete ( void * );
69};68};
7069
7170
=== modified file 'src/ca/client/nciu.cpp'
--- src/ca/client/nciu.cpp 2010-08-11 21:22:54 +0000
+++ src/ca/client/nciu.cpp 2012-04-12 17:46:27 +0000
@@ -94,13 +94,6 @@
94 this->cacCtx.destroyChannel ( guard, *this );94 this->cacCtx.destroyChannel ( guard, *this );
95}95}
9696
97void * nciu::operator new ( size_t ) // X aCC 361
98{
99 // The HPUX compiler seems to require this even though no code
100 // calls it directly
101 throw std::logic_error ( "why is the compiler calling private operator new" );
102}
103
104void nciu::operator delete ( void * )97void nciu::operator delete ( void * )
105{ 98{
106 // Visual C++ .net appears to require operator delete if99 // Visual C++ .net appears to require operator delete if
107100
=== modified file 'src/ca/client/nciu.h'
--- src/ca/client/nciu.h 2010-08-11 22:37:56 +0000
+++ src/ca/client/nciu.h 2012-04-12 17:46:27 +0000
@@ -121,7 +121,7 @@
121 friend class disconnectGovernorTimer;121 friend class disconnectGovernorTimer;
122};122};
123123
124class privateInterfaceForIO { // X aCC 655124class privateInterfaceForIO {
125public:125public:
126 virtual void ioCompletionNotify ( 126 virtual void ioCompletionNotify (
127 epicsGuard < epicsMutex > &, class baseNMIU & ) = 0;127 epicsGuard < epicsMutex > &, class baseNMIU & ) = 0;
@@ -270,7 +270,6 @@
270 epicsGuard < epicsMutex > & guard ) const throw ();270 epicsGuard < epicsMutex > & guard ) const throw ();
271 nciu ( const nciu & );271 nciu ( const nciu & );
272 nciu & operator = ( const nciu & );272 nciu & operator = ( const nciu & );
273 void * operator new ( size_t );
274 void operator delete ( void * );273 void operator delete ( void * );
275};274};
276275
277276
=== modified file 'src/ca/client/netIO.h'
--- src/ca/client/netIO.h 2010-08-11 21:22:54 +0000
+++ src/ca/client/netIO.h 2012-04-12 17:46:27 +0000
@@ -42,7 +42,7 @@
4242
43class privateInterfaceForIO;43class privateInterfaceForIO;
4444
45class baseNMIU : public tsDLNode < baseNMIU >, // X aCC 65545class baseNMIU : public tsDLNode < baseNMIU >,
46 public chronIntIdRes < baseNMIU > {46 public chronIntIdRes < baseNMIU > {
47public:47public:
48 virtual void destroy ( 48 virtual void destroy (
@@ -106,7 +106,6 @@
106 const unsigned mask;106 const unsigned mask;
107 bool subscribed;107 bool subscribed;
108 class netSubscription * isSubscription ();108 class netSubscription * isSubscription ();
109 void * operator new ( size_t );
110 void operator delete ( void * );109 void operator delete ( void * );
111 void * operator new ( size_t, 110 void * operator new ( size_t,
112 tsFreeList < class netSubscription, 1024, epicsMutexNOOP > & );111 tsFreeList < class netSubscription, 1024, epicsMutexNOOP > & );
@@ -147,7 +146,6 @@
147private:146private:
148 cacReadNotify & notify;147 cacReadNotify & notify;
149 class privateInterfaceForIO & privateChanForIO;148 class privateInterfaceForIO & privateChanForIO;
150 void * operator new ( size_t );
151 void operator delete ( void * );149 void operator delete ( void * );
152 void * operator new ( size_t, 150 void * operator new ( size_t,
153 tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & );151 tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & );
@@ -190,7 +188,6 @@
190private:188private:
191 cacWriteNotify & notify;189 cacWriteNotify & notify;
192 privateInterfaceForIO & privateChanForIO;190 privateInterfaceForIO & privateChanForIO;
193 void * operator new ( size_t );
194 void operator delete ( void * );191 void operator delete ( void * );
195 void * operator new ( size_t, 192 void * operator new ( size_t,
196 tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & );193 tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & );
@@ -237,12 +234,12 @@
237 class privateInterfaceForIO & chan, unsigned type, arrayElementCount count, 234 class privateInterfaceForIO & chan, unsigned type, arrayElementCount count,
238 unsigned mask, cacStateNotify &notify )235 unsigned mask, cacStateNotify &notify )
239{236{
240 return new ( freeList ) netSubscription ( chan, type, // X aCC 930237 return new ( freeList ) netSubscription ( chan, type,
241 count, mask, notify );238 count, mask, notify );
242}239}
243240
244inline arrayElementCount netSubscription::getCount (241inline arrayElementCount netSubscription::getCount (
245 epicsGuard < epicsMutex > & guard, bool allow_zero ) const // X aCC 361242 epicsGuard < epicsMutex > & guard, bool allow_zero ) const
246{243{
247 //guard.assertIdenticalMutex ( this->mutex );244 //guard.assertIdenticalMutex ( this->mutex );
248 arrayElementCount nativeCount = this->privateChanForIO.nativeElementCount ( guard );245 arrayElementCount nativeCount = this->privateChanForIO.nativeElementCount ( guard );
@@ -268,7 +265,7 @@
268 tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & freeList, 265 tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & freeList,
269 privateInterfaceForIO & ioComplNotifIntf, cacReadNotify & notify )266 privateInterfaceForIO & ioComplNotifIntf, cacReadNotify & notify )
270{267{
271 return new ( freeList ) netReadNotifyIO ( ioComplNotifIntf, notify ); // X aCC 930268 return new ( freeList ) netReadNotifyIO ( ioComplNotifIntf, notify );
272}269}
273270
274inline void * netReadNotifyIO::operator new ( size_t size, 271inline void * netReadNotifyIO::operator new ( size_t size,
@@ -289,7 +286,7 @@
289 tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & freeList, 286 tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & freeList,
290 privateInterfaceForIO & ioComplNotifyIntf, cacWriteNotify & notify )287 privateInterfaceForIO & ioComplNotifyIntf, cacWriteNotify & notify )
291{288{
292 return new ( freeList ) netWriteNotifyIO ( ioComplNotifyIntf, notify ); // X aCC 930289 return new ( freeList ) netWriteNotifyIO ( ioComplNotifyIntf, notify );
293}290}
294291
295inline void * netWriteNotifyIO::operator new ( size_t size, 292inline void * netWriteNotifyIO::operator new ( size_t size,
296293
=== modified file 'src/ca/client/netReadNotifyIO.cpp'
--- src/ca/client/netReadNotifyIO.cpp 2004-10-08 15:44:44 +0000
+++ src/ca/client/netReadNotifyIO.cpp 2012-04-12 17:46:27 +0000
@@ -119,13 +119,6 @@
119{119{
120}120}
121121
122void * netReadNotifyIO::operator new ( size_t ) // X aCC 361
123{
124 // The HPUX compiler seems to require this even though no code
125 // calls it directly
126 throw std::logic_error ( "why is the compiler calling private operator new" );
127}
128
129void netReadNotifyIO::operator delete ( void * )122void netReadNotifyIO::operator delete ( void * )
130{123{
131 // Visual C++ .net appears to require operator delete if124 // Visual C++ .net appears to require operator delete if
132125
=== modified file 'src/ca/client/netSubscription.cpp'
--- src/ca/client/netSubscription.cpp 2009-07-08 21:43:38 +0000
+++ src/ca/client/netSubscription.cpp 2012-04-12 17:46:27 +0000
@@ -170,13 +170,6 @@
170 guard, chan, *this );170 guard, chan, *this );
171}171}
172172
173void * netSubscription::operator new ( size_t ) // X aCC 361
174{
175 // The HPUX compiler seems to require this even though no code
176 // calls it directly
177 throw std::logic_error ( "why is the compiler calling private operator new" );
178}
179
180void netSubscription::operator delete ( void * )173void netSubscription::operator delete ( void * )
181{174{
182 // Visual C++ .net appears to require operator delete if175 // Visual C++ .net appears to require operator delete if
183176
=== modified file 'src/ca/client/netWriteNotifyIO.cpp'
--- src/ca/client/netWriteNotifyIO.cpp 2009-07-08 21:43:38 +0000
+++ src/ca/client/netWriteNotifyIO.cpp 2012-04-12 17:46:27 +0000
@@ -117,14 +117,6 @@
117{117{
118}118}
119119
120void * netWriteNotifyIO::operator new ( size_t ) // X aCC 361
121{
122 // The HPUX compiler seems to require this even though no code
123 // calls it directly
124 throw std::logic_error (
125 "why is the compiler calling private operator new" );
126}
127
128void netWriteNotifyIO::operator delete ( void * )120void netWriteNotifyIO::operator delete ( void * )
129{121{
130 // Visual C++ .net appears to require operator delete if122 // Visual C++ .net appears to require operator delete if
131123
=== modified file 'src/ca/client/netiiu.h'
--- src/ca/client/netiiu.h 2007-01-11 21:43:40 +0000
+++ src/ca/client/netiiu.h 2012-04-12 17:46:27 +0000
@@ -35,7 +35,7 @@
35class cac;35class cac;
36class nciu;36class nciu;
3737
38class netiiu { // X aCC 65538class netiiu {
39public:39public:
40 virtual ~netiiu () = 0;40 virtual ~netiiu () = 0;
41 virtual unsigned getHostName ( 41 virtual unsigned getHostName (
4242
=== modified file 'src/ca/client/oldAccess.h'
--- src/ca/client/oldAccess.h 2009-08-21 00:53:55 +0000
+++ src/ca/client/oldAccess.h 2012-04-12 17:46:27 +0000
@@ -162,7 +162,6 @@
162 unsigned type, arrayElementCount count );162 unsigned type, arrayElementCount count );
163 oldChannelNotify ( const oldChannelNotify & );163 oldChannelNotify ( const oldChannelNotify & );
164 oldChannelNotify & operator = ( const oldChannelNotify & );164 oldChannelNotify & operator = ( const oldChannelNotify & );
165 void * operator new ( size_t size );
166 void operator delete ( void * );165 void operator delete ( void * );
167};166};
168167
@@ -195,7 +194,6 @@
195 const char *pContext, unsigned type, arrayElementCount count );194 const char *pContext, unsigned type, arrayElementCount count );
196 getCopy ( const getCopy & );195 getCopy ( const getCopy & );
197 getCopy & operator = ( const getCopy & );196 getCopy & operator = ( const getCopy & );
198 void * operator new ( size_t size );
199 void operator delete ( void * );197 void operator delete ( void * );
200};198};
201199
@@ -221,7 +219,6 @@
221 const char * pContext, unsigned type, arrayElementCount count );219 const char * pContext, unsigned type, arrayElementCount count );
222 getCallback ( const getCallback & );220 getCallback ( const getCallback & );
223 getCallback & operator = ( const getCallback & );221 getCallback & operator = ( const getCallback & );
224 void * operator new ( size_t size );
225 void operator delete ( void * );222 void operator delete ( void * );
226};223};
227224
@@ -245,7 +242,6 @@
245 unsigned type, arrayElementCount count );242 unsigned type, arrayElementCount count );
246 putCallback ( const putCallback & );243 putCallback ( const putCallback & );
247 putCallback & operator = ( const putCallback & );244 putCallback & operator = ( const putCallback & );
248 void * operator new ( size_t size );
249 void operator delete ( void * );245 void operator delete ( void * );
250};246};
251247
@@ -278,7 +274,6 @@
278 const char *pContext, unsigned type, arrayElementCount count );274 const char *pContext, unsigned type, arrayElementCount count );
279 oldSubscription ( const oldSubscription & );275 oldSubscription ( const oldSubscription & );
280 oldSubscription & operator = ( const oldSubscription & );276 oldSubscription & operator = ( const oldSubscription & );
281 void * operator new ( size_t size );
282 void operator delete ( void * );277 void operator delete ( void * );
283};278};
284279
285280
=== modified file 'src/ca/client/oldChannelNotify.cpp'
--- src/ca/client/oldChannelNotify.cpp 2010-08-11 21:22:54 +0000
+++ src/ca/client/oldChannelNotify.cpp 2012-04-12 17:46:27 +0000
@@ -159,13 +159,6 @@
159 __FILE__, __LINE__, *this, type, count, CA_OP_PUT );159 __FILE__, __LINE__, *this, type, count, CA_OP_PUT );
160}160}
161161
162void * oldChannelNotify::operator new ( size_t ) // X aCC 361
163{
164 // The HPUX compiler seems to require this even though no code
165 // calls it directly
166 throw std::logic_error ( "why is the compiler calling private operator new" );
167}
168
169void oldChannelNotify::operator delete ( void * )162void oldChannelNotify::operator delete ( void * )
170{163{
171 // Visual C++ .net appears to require operator delete if164 // Visual C++ .net appears to require operator delete if
@@ -638,7 +631,7 @@
638/*631/*
639 * ca_state ()632 * ca_state ()
640 */633 */
641enum channel_state epicsShareAPI ca_state ( chid pChan ) // X aCC 361634enum channel_state epicsShareAPI ca_state ( chid pChan )
642{635{
643 epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );636 epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () );
644 if ( pChan->io.connected ( guard ) ) {637 if ( pChan->io.connected ( guard ) ) {
645638
=== modified file 'src/ca/client/putCallback.cpp'
--- src/ca/client/putCallback.cpp 2009-08-13 22:44:30 +0000
+++ src/ca/client/putCallback.cpp 2012-04-12 17:46:27 +0000
@@ -90,13 +90,6 @@
90 }90 }
91}91}
9292
93void * putCallback::operator new ( size_t ) // X aCC 361
94{
95 // The HPUX compiler seems to require this even though no code
96 // calls it directly
97 throw std::logic_error ( "why is the compiler calling private operator new" );
98}
99
100void putCallback::operator delete ( void * )93void putCallback::operator delete ( void * )
101{94{
102 // Visual C++ .net appears to require operator delete if95 // Visual C++ .net appears to require operator delete if
10396
=== modified file 'src/ca/client/repeater.cpp'
--- src/ca/client/repeater.cpp 2009-08-24 17:03:17 +0000
+++ src/ca/client/repeater.cpp 2012-04-12 17:46:27 +0000
@@ -178,7 +178,7 @@
178 return true;178 return true;
179}179}
180180
181bool repeaterClient::sendConfirm () // X aCC 361181bool repeaterClient::sendConfirm ()
182{182{
183 int status;183 int status;
184184
@@ -204,7 +204,7 @@
204 }204 }
205}205}
206206
207bool repeaterClient::sendMessage ( const void *pBuf, unsigned bufSize ) // X aCC 361207bool repeaterClient::sendMessage ( const void *pBuf, unsigned bufSize )
208{208{
209 int status;209 int status;
210210
@@ -245,13 +245,6 @@
245#endif245#endif
246}246}
247247
248void * repeaterClient::operator new ( size_t ) // X aCC 361
249{
250 // The HPUX compiler seems to require this even though no code
251 // calls it directly
252 throw std::logic_error ( "why is the compiler calling private operator new" );
253}
254
255void repeaterClient::operator delete ( void * )248void repeaterClient::operator delete ( void * )
256{ 249{
257 // Visual C++ .net appears to require operator delete if250 // Visual C++ .net appears to require operator delete if
@@ -304,7 +297,7 @@
304 return false;297 return false;
305}298}
306299
307bool repeaterClient::verify () // X aCC 361300bool repeaterClient::verify ()
308{301{
309 SOCKET tmpSock;302 SOCKET tmpSock;
310 bool success = makeSocket ( this->port (), false, & tmpSock );303 bool success = makeSocket ( this->port (), false, & tmpSock );
311304
=== modified file 'src/ca/client/repeaterClient.h'
--- src/ca/client/repeaterClient.h 2004-10-04 18:55:40 +0000
+++ src/ca/client/repeaterClient.h 2012-04-12 17:46:27 +0000
@@ -64,7 +64,6 @@
64 osiSockAddr from;64 osiSockAddr from;
65 SOCKET sock;65 SOCKET sock;
66 unsigned short port () const;66 unsigned short port () const;
67 void * operator new ( size_t size );
68 void operator delete ( void * );67 void operator delete ( void * );
69};68};
7069
7170
=== modified file 'src/ca/client/repeaterSubscribeTimer.cpp'
--- src/ca/client/repeaterSubscribeTimer.cpp 2007-08-23 17:46:28 +0000
+++ src/ca/client/repeaterSubscribeTimer.cpp 2012-04-12 17:46:27 +0000
@@ -64,7 +64,7 @@
64}64}
6565
66epicsTimerNotify::expireStatus repeaterSubscribeTimer::66epicsTimerNotify::expireStatus repeaterSubscribeTimer::
67 expire ( const epicsTime & /* currentTime */ ) // X aCC 36167 expire ( const epicsTime & /* currentTime */ )
68{68{
69 static const unsigned nTriesToMsg = 50;69 static const unsigned nTriesToMsg = 50;
70 if ( this->attempts > nTriesToMsg && ! this->once ) {70 if ( this->attempts > nTriesToMsg && ! this->once ) {
7171
=== modified file 'src/ca/client/repeaterSubscribeTimer.h'
--- src/ca/client/repeaterSubscribeTimer.h 2010-11-04 16:19:54 +0000
+++ src/ca/client/repeaterSubscribeTimer.h 2012-04-12 17:46:27 +0000
@@ -43,7 +43,7 @@
43class epicsMutex;43class epicsMutex;
44class cacContextNotify;44class cacContextNotify;
4545
46class repeaterTimerNotify { // X aCC 65546class repeaterTimerNotify {
47public:47public:
48 virtual ~repeaterTimerNotify () = 0;48 virtual ~repeaterTimerNotify () = 0;
49 virtual void repeaterRegistrationMessage ( 49 virtual void repeaterRegistrationMessage (
5050
=== modified file 'src/ca/client/searchTimer.cpp'
--- src/ca/client/searchTimer.cpp 2009-08-10 21:51:07 +0000
+++ src/ca/client/searchTimer.cpp 2012-04-12 17:46:27 +0000
@@ -124,7 +124,7 @@
124// searchTimer::expire ()124// searchTimer::expire ()
125//125//
126epicsTimerNotify::expireStatus searchTimer::expire ( 126epicsTimerNotify::expireStatus searchTimer::expire (
127 const epicsTime & currentTime ) // X aCC 361127 const epicsTime & currentTime )
128{128{
129 epicsGuard < epicsMutex > guard ( this->mutex );129 epicsGuard < epicsMutex > guard ( this->mutex );
130130
131131
=== modified file 'src/ca/client/searchTimer.h'
--- src/ca/client/searchTimer.h 2006-11-18 00:51:08 +0000
+++ src/ca/client/searchTimer.h 2012-04-12 17:46:27 +0000
@@ -43,7 +43,7 @@
43#include "caProto.h"43#include "caProto.h"
44#include "netiiu.h"44#include "netiiu.h"
4545
46class searchTimerNotify { // X aCC 65546class searchTimerNotify {
47public:47public:
48 virtual ~searchTimerNotify () = 0;48 virtual ~searchTimerNotify () = 0;
49 virtual void boostChannel ( 49 virtual void boostChannel (
5050
=== modified file 'src/ca/client/syncGroup.h'
--- src/ca/client/syncGroup.h 2007-08-23 17:46:28 +0000
+++ src/ca/client/syncGroup.h 2012-04-12 17:46:27 +0000
@@ -49,7 +49,7 @@
49// used to control access to CASG's recycle routines which49// used to control access to CASG's recycle routines which
50// should only be indirectly invoked by CASG when its lock50// should only be indirectly invoked by CASG when its lock
51// is applied51// is applied
52class casgRecycle { // X aCC 65552class casgRecycle {
53public:53public:
54 virtual void recycleSyncGroupWriteNotify ( 54 virtual void recycleSyncGroupWriteNotify (
55 epicsGuard < epicsMutex > &, class syncGroupWriteNotify & io ) = 0;55 epicsGuard < epicsMutex > &, class syncGroupWriteNotify & io ) = 0;
@@ -104,7 +104,6 @@
104 cacChannel::ioid id;104 cacChannel::ioid id;
105 bool idIsValid;105 bool idIsValid;
106 bool ioComplete;106 bool ioComplete;
107 void * operator new ( size_t );
108 void operator delete ( void * );107 void operator delete ( void * );
109 void * operator new ( size_t, 108 void * operator new ( size_t,
110 tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & );109 tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & );
@@ -145,7 +144,6 @@
145 cacChannel::ioid id;144 cacChannel::ioid id;
146 bool idIsValid;145 bool idIsValid;
147 bool ioComplete;146 bool ioComplete;
148 void * operator new ( size_t );
149 void operator delete ( void * );147 void operator delete ( void * );
150 void * operator new ( size_t, 148 void * operator new ( size_t,
151 tsFreeList < class syncGroupWriteNotify, 128, epicsMutexNOOP > & );149 tsFreeList < class syncGroupWriteNotify, 128, epicsMutexNOOP > & );
@@ -215,7 +213,6 @@
215 CASG ( const CASG & );213 CASG ( const CASG & );
216 CASG & operator = ( const CASG & );214 CASG & operator = ( const CASG & );
217215
218 void * operator new ( size_t size );
219 void operator delete ( void * );216 void operator delete ( void * );
220217
221 ~CASG ();218 ~CASG ();
222219
=== modified file 'src/ca/client/syncGroupReadNotify.cpp'
--- src/ca/client/syncGroupReadNotify.cpp 2007-08-23 17:46:28 +0000
+++ src/ca/client/syncGroupReadNotify.cpp 2012-04-12 17:46:27 +0000
@@ -58,7 +58,7 @@
58 tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & freeList, 58 tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & freeList,
59 struct CASG & sg, chid chan, void * pValueIn )59 struct CASG & sg, chid chan, void * pValueIn )
60{60{
61 return new ( freeList ) // X aCC 93061 return new ( freeList )
62 syncGroupReadNotify ( sg, chan, pValueIn );62 syncGroupReadNotify ( sg, chan, pValueIn );
63}63}
6464
@@ -122,13 +122,6 @@
122 }122 }
123}123}
124124
125void * syncGroupReadNotify::operator new ( size_t ) // X aCC 361
126{
127 // The HPUX compiler seems to require this even though no code
128 // calls it directly
129 throw std::logic_error ( "why is the compiler calling private operator new" );
130}
131
132void syncGroupReadNotify::operator delete ( void * )125void syncGroupReadNotify::operator delete ( void * )
133{126{
134 // Visual C++ .net appears to require operator delete if127 // Visual C++ .net appears to require operator delete if
135128
=== modified file 'src/ca/client/syncGroupWriteNotify.cpp'
--- src/ca/client/syncGroupWriteNotify.cpp 2007-08-23 17:46:28 +0000
+++ src/ca/client/syncGroupWriteNotify.cpp 2012-04-12 17:46:27 +0000
@@ -112,13 +112,6 @@
112 }112 }
113}113}
114114
115void * syncGroupWriteNotify::operator new ( size_t ) // X aCC 361
116{
117 // The HPUX compiler seems to require this even though no code
118 // calls it directly
119 throw std::logic_error ( "why is the compiler calling private operator new" );
120}
121
122void syncGroupWriteNotify::operator delete ( void * )115void syncGroupWriteNotify::operator delete ( void * )
123{116{
124 // Visual C++ .net appears to require operator delete if117 // Visual C++ .net appears to require operator delete if
125118
=== modified file 'src/ca/client/syncgrp.cpp'
--- src/ca/client/syncgrp.cpp 2007-01-11 22:02:47 +0000
+++ src/ca/client/syncgrp.cpp 2012-04-12 17:46:27 +0000
@@ -23,7 +23,7 @@
23/*23/*
24 * ca_sg_create()24 * ca_sg_create()
25 */25 */
26extern "C" int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid ) // X aCC 36126extern "C" int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid )
27{27{
28 ca_client_context * pcac;28 ca_client_context * pcac;
29 int caStatus;29 int caStatus;
@@ -143,7 +143,7 @@
143/*143/*
144 * ca_sg_test144 * ca_sg_test
145 */145 */
146extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid ) // X aCC 361146extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid )
147{147{
148 ca_client_context * pcac;148 ca_client_context * pcac;
149 int caStatus = fetchClientContext ( &pcac );149 int caStatus = fetchClientContext ( &pcac );
150150
=== modified file 'src/ca/client/tcpRecvWatchdog.cpp'
--- src/ca/client/tcpRecvWatchdog.cpp 2006-12-05 19:56:28 +0000
+++ src/ca/client/tcpRecvWatchdog.cpp 2012-04-12 17:46:27 +0000
@@ -45,7 +45,7 @@
45}45}
4646
47epicsTimerNotify::expireStatus47epicsTimerNotify::expireStatus
48tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ ) // X aCC 36148tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ )
49{49{
50 epicsGuard < epicsMutex > guard ( this->mutex );50 epicsGuard < epicsMutex > guard ( this->mutex );
51 if ( this->shuttingDown ) {51 if ( this->shuttingDown ) {
5252
=== modified file 'src/ca/client/tcpiiu.cpp'
--- src/ca/client/tcpiiu.cpp 2011-01-15 00:53:33 +0000
+++ src/ca/client/tcpiiu.cpp 2012-04-12 17:46:27 +0000
@@ -1135,7 +1135,7 @@
1135 }1135 }
1136}1136}
11371137
1138bool tcpiiu::setEchoRequestPending ( epicsGuard < epicsMutex > & guard ) // X aCC 3611138bool tcpiiu::setEchoRequestPending ( epicsGuard < epicsMutex > & guard )
1139{1139{
1140 guard.assertIdenticalMutex ( this->mutex );1140 guard.assertIdenticalMutex ( this->mutex );
11411141
@@ -1275,12 +1275,9 @@
1275 this->msgHeaderAvailable = false;1275 this->msgHeaderAvailable = false;
1276 this->curDataBytes = 0u;1276 this->curDataBytes = 0u;
1277 }1277 }
1278# if defined ( __HP_aCC ) && _HP_aCC <= 033300
1279 return false; // to make hpux compiler happy...
1280# endif
1281}1278}
12821279
1283void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 4311280void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard )
1284{1281{
1285 guard.assertIdenticalMutex ( this->mutex );1282 guard.assertIdenticalMutex ( this->mutex );
12861283
@@ -1310,7 +1307,7 @@
1310/*1307/*
1311 * tcpiiu::userNameSetRequest ()1308 * tcpiiu::userNameSetRequest ()
1312 */1309 */
1313void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 4311310void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard )
1314{1311{
1315 guard.assertIdenticalMutex ( this->mutex );1312 guard.assertIdenticalMutex ( this->mutex );
13161313
@@ -1338,7 +1335,7 @@
1338}1335}
13391336
1340void tcpiiu::disableFlowControlRequest ( 1337void tcpiiu::disableFlowControlRequest (
1341 epicsGuard < epicsMutex > & guard ) // X aCC 4311338 epicsGuard < epicsMutex > & guard )
1342{1339{
1343 guard.assertIdenticalMutex ( this->mutex );1340 guard.assertIdenticalMutex ( this->mutex );
13441341
@@ -1354,7 +1351,7 @@
1354}1351}
13551352
1356void tcpiiu::enableFlowControlRequest ( 1353void tcpiiu::enableFlowControlRequest (
1357 epicsGuard < epicsMutex > & guard ) // X aCC 4311354 epicsGuard < epicsMutex > & guard )
1358{1355{
1359 guard.assertIdenticalMutex ( this->mutex );1356 guard.assertIdenticalMutex ( this->mutex );
13601357
@@ -1369,7 +1366,7 @@
1369 minder.commit ();1366 minder.commit ();
1370}1367}
13711368
1372void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard, // X aCC 4311369void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard,
1373 const cacChannel::priLev & priority )1370 const cacChannel::priLev & priority )
1374{1371{
1375 guard.assertIdenticalMutex ( this->mutex );1372 guard.assertIdenticalMutex ( this->mutex );
@@ -1389,7 +1386,7 @@
1389 minder.commit ();1386 minder.commit ();
1390}1387}
13911388
1392void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 4311389void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard )
1393{1390{
1394 guard.assertIdenticalMutex ( this->mutex );1391 guard.assertIdenticalMutex ( this->mutex );
1395 1392
@@ -1410,7 +1407,7 @@
1410 minder.commit ();1407 minder.commit ();
1411}1408}
14121409
1413void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard, // X aCC 4311410void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard,
1414 nciu &chan, unsigned type, arrayElementCount nElem, const void *pValue )1411 nciu &chan, unsigned type, arrayElementCount nElem, const void *pValue )
1415{1412{
1416 guard.assertIdenticalMutex ( this->mutex );1413 guard.assertIdenticalMutex ( this->mutex );
@@ -1425,7 +1422,7 @@
1425}1422}
14261423
14271424
1428void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 4311425void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard,
1429 nciu &chan, netWriteNotifyIO &io, unsigned type, 1426 nciu &chan, netWriteNotifyIO &io, unsigned type,
1430 arrayElementCount nElem, const void *pValue )1427 arrayElementCount nElem, const void *pValue )
1431{1428{
@@ -1444,7 +1441,7 @@
1444 minder.commit ();1441 minder.commit ();
1445}1442}
14461443
1447void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 4311444void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard,
1448 nciu & chan, netReadNotifyIO & io, 1445 nciu & chan, netReadNotifyIO & io,
1449 unsigned dataType, arrayElementCount nElem )1446 unsigned dataType, arrayElementCount nElem )
1450{1447{
@@ -1477,7 +1474,7 @@
1477}1474}
14781475
1479void tcpiiu::createChannelRequest ( 1476void tcpiiu::createChannelRequest (
1480 nciu & chan, epicsGuard < epicsMutex > & guard ) // X aCC 4311477 nciu & chan, epicsGuard < epicsMutex > & guard )
1481{1478{
1482 guard.assertIdenticalMutex ( this->mutex );1479 guard.assertIdenticalMutex ( this->mutex );
14831480
@@ -1525,7 +1522,7 @@
1525 minder.commit ();1522 minder.commit ();
1526}1523}
15271524
1528void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 4311525void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard,
1529 ca_uint32_t sid, ca_uint32_t cid )1526 ca_uint32_t sid, ca_uint32_t cid )
1530{1527{
1531 guard.assertIdenticalMutex ( this->mutex );1528 guard.assertIdenticalMutex ( this->mutex );
@@ -1547,7 +1544,7 @@
1547// is to try again the next time that we reconnect1544// is to try again the next time that we reconnect
1548//1545//
1549void tcpiiu::subscriptionRequest ( 1546void tcpiiu::subscriptionRequest (
1550 epicsGuard < epicsMutex > & guard, // X aCC 4311547 epicsGuard < epicsMutex > & guard,
1551 nciu & chan, netSubscription & subscr )1548 nciu & chan, netSubscription & subscr )
1552{1549{
1553 guard.assertIdenticalMutex ( this->mutex );1550 guard.assertIdenticalMutex ( this->mutex );
@@ -1599,7 +1596,7 @@
1599// is to try again the next time that we reconnect1596// is to try again the next time that we reconnect
1600//1597//
1601void tcpiiu::subscriptionUpdateRequest ( 1598void tcpiiu::subscriptionUpdateRequest (
1602 epicsGuard < epicsMutex > & guard, // X aCC 4311599 epicsGuard < epicsMutex > & guard,
1603 nciu & chan, netSubscription & subscr )1600 nciu & chan, netSubscription & subscr )
1604{1601{
1605 guard.assertIdenticalMutex ( this->mutex );1602 guard.assertIdenticalMutex ( this->mutex );
@@ -1634,7 +1631,7 @@
1634 minder.commit ();1631 minder.commit ();
1635}1632}
16361633
1637void tcpiiu::subscriptionCancelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 4311634void tcpiiu::subscriptionCancelRequest ( epicsGuard < epicsMutex > & guard,
1638 nciu & chan, netSubscription & subscr )1635 nciu & chan, netSubscription & subscr )
1639{1636{
1640 guard.assertIdenticalMutex ( this->mutex );1637 guard.assertIdenticalMutex ( this->mutex );
@@ -2052,7 +2049,7 @@
2052 return false;2049 return false;
2053#else2050#else
2054 osiSockIoctl_t bytesPending = 0; /* shut up purifys yapping */2051 osiSockIoctl_t bytesPending = 0; /* shut up purifys yapping */
2055 int status = socket_ioctl ( this->sock, // X aCC 3922052 int status = socket_ioctl ( this->sock,
2056 FIONREAD, & bytesPending );2053 FIONREAD, & bytesPending );
2057 if ( status >= 0 ) {2054 if ( status >= 0 ) {
2058 if ( bytesPending > 0 ) {2055 if ( bytesPending > 0 ) {
20592056
=== modified file 'src/ca/client/test_event.cpp'
--- src/ca/client/test_event.cpp 2004-10-08 15:44:44 +0000
+++ src/ca/client/test_event.cpp 2012-04-12 17:46:27 +0000
@@ -78,7 +78,7 @@
78 dbr_short_t *pvalue = (dbr_short_t *)pbuffer;78 dbr_short_t *pvalue = (dbr_short_t *)pbuffer;
79 for (i = 0; i < count; i++,pvalue++){79 for (i = 0; i < count; i++,pvalue++){
80 if(count!=1 && (i%10 == 0)) printf("\n");80 if(count!=1 && (i%10 == 0)) printf("\n");
81 printf("%d ",* (short *)pvalue); // X aCC 39281 printf("%d ",* (short *)pvalue);
82 }82 }
83 break;83 break;
84 }84 }
@@ -96,7 +96,7 @@
96 dbr_float_t *pvalue = (dbr_float_t *)pbuffer;96 dbr_float_t *pvalue = (dbr_float_t *)pbuffer;
97 for (i = 0; i < count; i++,pvalue++){97 for (i = 0; i < count; i++,pvalue++){
98 if(count!=1 && (i%10 == 0)) printf("\n");98 if(count!=1 && (i%10 == 0)) printf("\n");
99 printf("%6.4f ",*(float *)pvalue); // X aCC 39299 printf("%6.4f ",*(float *)pvalue);
100 }100 }
101 break;101 break;
102 }102 }
103103
=== modified file 'src/ca/client/udpiiu.cpp'
--- src/ca/client/udpiiu.cpp 2011-12-12 23:10:24 +0000
+++ src/ca/client/udpiiu.cpp 2012-04-12 17:46:27 +0000
@@ -201,7 +201,7 @@
201 memset ( (char *)&addr, 0 , sizeof (addr) );201 memset ( (char *)&addr, 0 , sizeof (addr) );
202 addr.ia.sin_family = AF_INET;202 addr.ia.sin_family = AF_INET;
203 addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY ); 203 addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
204 addr.ia.sin_port = htons ( PORT_ANY ); // X aCC 818204 addr.ia.sin_port = htons ( PORT_ANY );
205 status = bind (this->sock, &addr.sa, sizeof (addr) );205 status = bind (this->sock, &addr.sa, sizeof (addr) );
206 if ( status < 0 ) {206 if ( status < 0 ) {
207 char sockErrBuf[64];207 char sockErrBuf[64];
@@ -471,7 +471,7 @@
471 }471 }
472472
473 memset ( (char *) &msg, 0, sizeof (msg) );473 memset ( (char *) &msg, 0, sizeof (msg) );
474 AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = REPEATER_REGISTER; // X aCC 818474 AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = REPEATER_REGISTER;
475 msg.m_available = saddr.ia.sin_addr.s_addr;475 msg.m_available = saddr.ia.sin_addr.s_addr;
476476
477 /*477 /*
478478
=== modified file 'src/ca/client/virtualCircuit.h'
--- src/ca/client/virtualCircuit.h 2010-08-13 18:12:06 +0000
+++ src/ca/client/virtualCircuit.h 2012-04-12 17:46:27 +0000
@@ -335,7 +335,6 @@
335335
336 tcpiiu ( const tcpiiu & );336 tcpiiu ( const tcpiiu & );
337 tcpiiu & operator = ( const tcpiiu & );337 tcpiiu & operator = ( const tcpiiu & );
338 void * operator new ( size_t size );
339 void operator delete ( void * );338 void operator delete ( void * );
340};339};
341340
@@ -372,7 +371,7 @@
372}371}
373372
374inline bool tcpiiu::alive (373inline bool tcpiiu::alive (
375 epicsGuard < epicsMutex > & ) const // X aCC 361374 epicsGuard < epicsMutex > & ) const
376{375{
377 return ( this->state == iiucs_connecting || 376 return ( this->state == iiucs_connecting ||
378 this->state == iiucs_connected );377 this->state == iiucs_connected );
379378
=== modified file 'src/ca/legacy/gdd/aitConvert.h'
--- src/ca/legacy/gdd/aitConvert.h 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/gdd/aitConvert.h 2012-04-12 17:46:27 +0000
@@ -114,15 +114,15 @@
114inline void aitToNetOrder64(aitUint64* dest, aitUint64* src)114inline void aitToNetOrder64(aitUint64* dest, aitUint64* src)
115{115{
116 aitUint32 ait_temp_var_;116 aitUint32 ait_temp_var_;
117 ait_temp_var_=(aitUint32)htonl(src[1]); // X aCC 392117 ait_temp_var_=(aitUint32)htonl(src[1]);
118 dest[1]=(aitUint32)htonl(src[0]); // X aCC 392118 dest[1]=(aitUint32)htonl(src[0]);
119 dest[0]=ait_temp_var_;119 dest[0]=ait_temp_var_;
120}120}
121inline void aitFromNetOrder64(aitUint64* dest, aitUint64* src)121inline void aitFromNetOrder64(aitUint64* dest, aitUint64* src)
122{122{
123 aitUint32 ait_temp_var_;123 aitUint32 ait_temp_var_;
124 ait_temp_var_=(aitUint32)ntohl(src[1]); // X aCC 392124 ait_temp_var_=(aitUint32)ntohl(src[1]);
125 dest[1]=(aitUint32)ntohl(src[0]); // X aCC 392125 dest[1]=(aitUint32)ntohl(src[0]);
126 dest[0]=ait_temp_var_;126 dest[0]=ait_temp_var_;
127}127}
128128
129129
=== modified file 'src/ca/legacy/gdd/gddAppTable.cc'
--- src/ca/legacy/gdd/gddAppTable.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/gdd/gddAppTable.cc 2012-04-12 17:46:27 +0000
@@ -61,21 +61,6 @@
61 GenerateTypes();61 GenerateTypes();
62}62}
6363
64#if 0
65void* operator new(size_t x)
66{
67 void* v = (void*)malloc(x);
68 fprintf(stderr,"%8.8x In operator new %d\n",v,(int)x);
69 return v;
70}
71
72void operator delete(void* x)
73{
74 fprintf(stderr,"%8.8x In operator delete\n",x);
75 free((char*)x);
76}
77#endif
78
79gddApplicationTypeTable::~gddApplicationTypeTable(void)64gddApplicationTypeTable::~gddApplicationTypeTable(void)
80{65{
81 unsigned i,j;66 unsigned i,j;
8267
=== modified file 'src/ca/legacy/gdd/gddI.h'
--- src/ca/legacy/gdd/gddI.h 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/gdd/gddI.h 2012-04-12 17:46:27 +0000
@@ -79,12 +79,12 @@
79inline int gdd::isNetworkDataFormat(void) const79inline int gdd::isNetworkDataFormat(void) const
80 { return !isLocalDataFormat() || aitLocalNetworkDataFormatSame; }80 { return !isLocalDataFormat() || aitLocalNetworkDataFormatSame; }
8181
82inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; } // X aCC 81882inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; }
83inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; } // X aCC 81883inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; }
84inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; } // X aCC 81884inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; }
85inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; } // X aCC 81885inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; }
86inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; } // X aCC 81886inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; }
87inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; } // X aCC 81887inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; }
8888
89inline void gdd::getTimeStamp(struct timespec* const ts) const { time_stamp.get(*ts); }89inline void gdd::getTimeStamp(struct timespec* const ts) const { time_stamp.get(*ts); }
90inline void gdd::setTimeStamp(const struct timespec* const ts) { time_stamp=*ts; }90inline void gdd::setTimeStamp(const struct timespec* const ts) { time_stamp=*ts; }
@@ -132,7 +132,7 @@
132 gddAutoPrint("gdd::noReferencing()",gddErrorNotAllowed);132 gddAutoPrint("gdd::noReferencing()",gddErrorNotAllowed);
133 rc=gddErrorNotAllowed;133 rc=gddErrorNotAllowed;
134 }134 }
135 else flags|=GDD_NOREF_MASK; // X aCC 818135 else flags|=GDD_NOREF_MASK;
136 return rc;136 return rc;
137}137}
138inline gddStatus gdd::reference(void) const138inline gddStatus gdd::reference(void) const
@@ -148,7 +148,7 @@
148 rc = gddErrorNotAllowed;148 rc = gddErrorNotAllowed;
149 }149 }
150 else if ( this->ref_cnt < 0xffffffff ) {150 else if ( this->ref_cnt < 0xffffffff ) {
151 this->ref_cnt++; // X aCC 818151 this->ref_cnt++;
152 }152 }
153 else {153 else {
154 fprintf(stderr,"gdd reference count overflow!!\n");154 fprintf(stderr,"gdd reference count overflow!!\n");
@@ -399,10 +399,10 @@
399 if(primitiveType()==aitEnumString && dim==0)399 if(primitiveType()==aitEnumString && dim==0)
400 {400 {
401 aitString* str = (aitString*)dataAddress();401 aitString* str = (aitString*)dataAddress();
402 strcpy((char*)d,str->string()); // X aCC 392402 strcpy((char*)d,str->string());
403 }403 }
404 else if(primitiveType()==aitEnumFixedString && dim==0)404 else if(primitiveType()==aitEnumFixedString && dim==0)
405 strcpy((char*)d,data.FString->fixed_string); // X aCC 392405 strcpy((char*)d,data.FString->fixed_string);
406 else406 else
407 aitConvert(aitEnumInt8,d,primitiveType(),dataPointer(),407 aitConvert(aitEnumInt8,d,primitiveType(),dataPointer(),
408 getDataSizeElements());408 getDataSizeElements());
409409
=== modified file 'src/ca/legacy/gdd/gddUtilsI.h'
--- src/ca/legacy/gdd/gddUtilsI.h 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/gdd/gddUtilsI.h 2012-04-12 17:46:27 +0000
@@ -30,7 +30,7 @@
3030
31inline gddDestructor::gddDestructor(void) { ref_cnt=0; arg=NULL; }31inline gddDestructor::gddDestructor(void) { ref_cnt=0; arg=NULL; }
32inline gddDestructor::gddDestructor(void* usr_arg) { ref_cnt=0; arg=usr_arg; }32inline gddDestructor::gddDestructor(void* usr_arg) { ref_cnt=0; arg=usr_arg; }
33inline void gddDestructor::reference(void) { ref_cnt++; } // X aCC 81833inline void gddDestructor::reference(void) { ref_cnt++; }
34inline int gddDestructor::refCount(void) const { return ref_cnt; }34inline int gddDestructor::refCount(void) const { return ref_cnt; }
3535
36#endif36#endif
3737
=== modified file 'src/ca/legacy/gdd/smartGDDPointer.h'
--- src/ca/legacy/gdd/smartGDDPointer.h 2009-08-31 23:21:37 +0000
+++ src/ca/legacy/gdd/smartGDDPointer.h 2012-04-12 17:46:27 +0000
@@ -157,13 +157,13 @@
157}157}
158158
159template < class T >159template < class T >
160inline bool smartGDDPointerTemplate < T > :: operator ! () const // X aCC 361160inline bool smartGDDPointerTemplate < T > :: operator ! () const
161{161{
162 return this->pValue ? false : true;162 return this->pValue ? false : true;
163}163}
164164
165template < class T >165template < class T >
166inline bool smartGDDPointerTemplate < T > :: valid () const // X aCC 361166inline bool smartGDDPointerTemplate < T > :: valid () const
167{167{
168 return this->pValue ? true : false;168 return this->pValue ? true : false;
169}169}
170170
=== modified file 'src/ca/legacy/pcas/example/directoryService/directoryServer.h'
--- src/ca/legacy/pcas/example/directoryService/directoryServer.h 2009-08-24 17:09:55 +0000
+++ src/ca/legacy/pcas/example/directoryService/directoryServer.h 2012-04-12 17:46:27 +0000
@@ -74,7 +74,7 @@
74// for this breaking out into a seperate class74// for this breaking out into a seperate class
75// from pvInfo)75// from pvInfo)
76//76//
77class pvEntry // X aCC 65577class pvEntry
78 : public stringId, public tsSLNode<pvEntry> {78 : public stringId, public tsSLNode<pvEntry> {
79public:79public:
80 pvEntry (const pvInfo &infoIn, directoryServer &casIn, 80 pvEntry (const pvInfo &infoIn, directoryServer &casIn,
8181
=== modified file 'src/ca/legacy/pcas/example/directoryService/main.cc'
--- src/ca/legacy/pcas/example/directoryService/main.cc 2009-07-09 15:27:43 +0000
+++ src/ca/legacy/pcas/example/directoryService/main.cc 2012-04-12 17:46:27 +0000
@@ -206,7 +206,4 @@
206 }206 }
207 nPV++;207 nPV++;
208 }208 }
209#if defined ( __HP_aCC ) && ( _HP_aCC <= 033300 )
210 return 0; // Make HP compiler happy
211#endif
212}209}
213210
=== modified file 'src/ca/legacy/pcas/generic/caNetAddr.cc'
--- src/ca/legacy/pcas/generic/caNetAddr.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/caNetAddr.cc 2012-04-12 17:46:27 +0000
@@ -71,7 +71,7 @@
71 return this->type != casnaUDF;71 return this->type != casnaUDF;
72}72}
7373
74bool caNetAddr::operator == (const caNetAddr &rhs) const // X aCC 36174bool caNetAddr::operator == (const caNetAddr &rhs) const
75{75{
76 if ( this->type != rhs.type ) {76 if ( this->type != rhs.type ) {
77 return false;77 return false;
7878
=== modified file 'src/ca/legacy/pcas/generic/caServer.cc'
--- src/ca/legacy/pcas/generic/caServer.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/caServer.cc 2012-04-12 17:46:27 +0000
@@ -65,7 +65,7 @@
65 return this->createPV ( ctx, pAliasName );65 return this->createPV ( ctx, pAliasName );
66}66}
6767
68casEventMask caServer::registerEvent (const char *pName) // X aCC 36168casEventMask caServer::registerEvent (const char *pName)
69{69{
70 if (this->pCAS) {70 if (this->pCAS) {
71 return this->pCAS->registerEvent(pName);71 return this->pCAS->registerEvent(pName);
@@ -97,7 +97,7 @@
97 }97 }
98}98}
9999
100unsigned caServer::getDebugLevel () const // X aCC 361100unsigned caServer::getDebugLevel () const
101{101{
102 if (pCAS) {102 if (pCAS) {
103 return this->pCAS->getDebugLevel();103 return this->pCAS->getDebugLevel();
@@ -108,7 +108,7 @@
108 }108 }
109}109}
110110
111casEventMask caServer::valueEventMask () const // X aCC 361111casEventMask caServer::valueEventMask () const
112{112{
113 if (pCAS) {113 if (pCAS) {
114 return this->pCAS->valueEventMask();114 return this->pCAS->valueEventMask();
@@ -119,7 +119,7 @@
119 }119 }
120}120}
121121
122casEventMask caServer::logEventMask () const // X aCC 361122casEventMask caServer::logEventMask () const
123{123{
124 if (pCAS) {124 if (pCAS) {
125 return this->pCAS->logEventMask();125 return this->pCAS->logEventMask();
@@ -130,7 +130,7 @@
130 }130 }
131}131}
132132
133casEventMask caServer::alarmEventMask () const // X aCC 361133casEventMask caServer::alarmEventMask () const
134{134{
135 if ( pCAS ) {135 if ( pCAS ) {
136 return this->pCAS->alarmEventMask ();136 return this->pCAS->alarmEventMask ();
@@ -146,7 +146,7 @@
146 return fileDescriptorManager.createTimer ();146 return fileDescriptorManager.createTimer ();
147}147}
148148
149unsigned caServer::subscriptionEventsProcessed () const // X aCC 361149unsigned caServer::subscriptionEventsProcessed () const
150{150{
151 if ( pCAS ) {151 if ( pCAS ) {
152 return this->pCAS->subscriptionEventsProcessed ();152 return this->pCAS->subscriptionEventsProcessed ();
@@ -156,7 +156,7 @@
156 }156 }
157}157}
158158
159unsigned caServer::subscriptionEventsPosted () const // X aCC 361159unsigned caServer::subscriptionEventsPosted () const
160{160{
161 if ( pCAS ) {161 if ( pCAS ) {
162 return this->pCAS->subscriptionEventsPosted ();162 return this->pCAS->subscriptionEventsPosted ();
163163
=== modified file 'src/ca/legacy/pcas/generic/casChannel.cc'
--- src/ca/legacy/pcas/generic/casChannel.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/casChannel.cc 2012-04-12 17:46:27 +0000
@@ -37,7 +37,7 @@
37 this->destroy ();37 this->destroy ();
38}38}
3939
40casPV * casChannel::getPV () // X aCC 36140casPV * casChannel::getPV ()
41{41{
42 if ( this->pChanI ) {42 if ( this->pChanI ) {
43 casPVI & pvi = this->pChanI->getPVI ();43 casPVI & pvi = this->pChanI->getPVI ();
4444
=== modified file 'src/ca/legacy/pcas/generic/casDGClient.cc'
--- src/ca/legacy/pcas/generic/casDGClient.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/casDGClient.cc 2012-04-12 17:46:27 +0000
@@ -448,7 +448,7 @@
448//448//
449// casDGClient::xRecv ()449// casDGClient::xRecv ()
450//450//
451inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRecv, // X aCC 361451inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRecv,
452 fillParameter parm, bufSizeT &nByesRecv)452 fillParameter parm, bufSizeT &nByesRecv)
453{453{
454 const char *pAfter = pBufIn + nBytesToRecv;454 const char *pAfter = pBufIn + nBytesToRecv;
455455
=== modified file 'src/ca/legacy/pcas/generic/casMonEvent.cc'
--- src/ca/legacy/pcas/generic/casMonEvent.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/casMonEvent.cc 2012-04-12 17:46:27 +0000
@@ -57,13 +57,6 @@
57}57}
58#endif58#endif
5959
60void * casMonEvent::operator new ( size_t ) // X aCC 361
61{
62 // The HPUX compiler seems to require this even though no code
63 // calls it directly
64 throw std::logic_error ( "why is the compiler calling private operator new" );
65}
66
67void casMonEvent::operator delete ( void * )60void casMonEvent::operator delete ( void * )
68{61{
69 // Visual C++ .net appears to require operator delete if62 // Visual C++ .net appears to require operator delete if
7063
=== modified file 'src/ca/legacy/pcas/generic/casMonEvent.h'
--- src/ca/legacy/pcas/generic/casMonEvent.h 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/casMonEvent.h 2012-04-12 17:46:27 +0000
@@ -49,7 +49,6 @@
49private:49private:
50 class casMonitor & monitor;50 class casMonitor & monitor;
51 smartConstGDDPointer pValue;51 smartConstGDDPointer pValue;
52 void * operator new ( size_t );
53 void operator delete ( void * );52 void operator delete ( void * );
54 caStatus cbFunc ( 53 caStatus cbFunc (
55 casCoreClient &, 54 casCoreClient &,
5655
=== modified file 'src/ca/legacy/pcas/generic/casMonitor.cc'
--- src/ca/legacy/pcas/generic/casMonitor.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/casMonitor.cc 2012-04-12 17:46:27 +0000
@@ -77,7 +77,7 @@
77 this->overFlowEvent.swapValues ( *pLog );77 this->overFlowEvent.swapValues ( *pLog );
78 eventLogQue.insertAfter ( *pLog, this->overFlowEvent );78 eventLogQue.insertAfter ( *pLog, this->overFlowEvent );
79 assert ( this->nPend != UCHAR_MAX );79 assert ( this->nPend != UCHAR_MAX );
80 this->nPend++; // X aCC 81880 this->nPend++;
81 }81 }
82 else {82 else {
83 // replace the old OVF value with the current one83 // replace the old OVF value with the current one
@@ -97,7 +97,7 @@
97 }97 }
98 pLog->assign ( event );98 pLog->assign ( event );
99 assert ( this->nPend != UCHAR_MAX );99 assert ( this->nPend != UCHAR_MAX );
100 this->nPend++; // X aCC 818100 this->nPend++;
101 }101 }
102 eventLogQue.add ( *pLog );102 eventLogQue.add ( *pLog );
103}103}
@@ -117,7 +117,7 @@
117117
118 client.getCAS().incrEventsProcessedCounter ();118 client.getCAS().incrEventsProcessedCounter ();
119 assert ( this->nPend != 0u );119 assert ( this->nPend != 0u );
120 this->nPend--; // X aCC 818120 this->nPend--;
121121
122 // delete event object if it isnt a cache entry122 // delete event object if it isnt a cache entry
123 // saved in the call back object123 // saved in the call back object
124124
=== modified file 'src/ca/legacy/pcas/generic/casMonitor.h'
--- src/ca/legacy/pcas/generic/casMonitor.h 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/casMonitor.h 2012-04-12 17:46:27 +0000
@@ -39,7 +39,7 @@
39class casMonitor;39class casMonitor;
40class casClientMutex;40class casClientMutex;
4141
42class casMonitorCallbackInterface { // X aCC 65542class casMonitorCallbackInterface {
43public:43public:
44 virtual caStatus casMonitorCallBack ( 44 virtual caStatus casMonitorCallBack (
45 epicsGuard < casClientMutex > &, casMonitor &,45 epicsGuard < casClientMutex > &, casMonitor &,
@@ -87,7 +87,6 @@
87 unsigned char nPend;87 unsigned char nPend;
88 bool destroyPending;88 bool destroyPending;
89 bool ovf;89 bool ovf;
90 void * operator new ( size_t );
91 void operator delete ( void * );90 void operator delete ( void * );
92 casMonitor ( const casMonitor & );91 casMonitor ( const casMonitor & );
93 casMonitor & operator = ( const casMonitor & );92 casMonitor & operator = ( const casMonitor & );
9493
=== modified file 'src/ca/legacy/pcas/generic/casPVI.cc'
--- src/ca/legacy/pcas/generic/casPVI.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/casPVI.cc 2012-04-12 17:46:27 +0000
@@ -317,7 +317,7 @@
317 return pMon;317 return pMon;
318}318}
319319
320caServer *casPVI::getExtServer () const // X aCC 361320caServer *casPVI::getExtServer () const
321{321{
322 epicsGuard < epicsMutex > guard ( this->mutex );322 epicsGuard < epicsMutex > guard ( this->mutex );
323 if ( this->pCAS ) {323 if ( this->pCAS ) {
@@ -415,7 +415,7 @@
415 this->ioBlockedList::signal();415 this->ioBlockedList::signal();
416}416}
417417
418caStatus casPVI::bestDBRType ( unsigned & dbrType ) // X aCC 361418caStatus casPVI::bestDBRType ( unsigned & dbrType )
419{419{
420 epicsGuard < epicsMutex > guard ( this->mutex );420 epicsGuard < epicsMutex > guard ( this->mutex );
421 aitEnum bestAIT = this->bestExternalType ();421 aitEnum bestAIT = this->bestExternalType ();
422422
=== modified file 'src/ca/legacy/pcas/generic/casStrmClient.cc'
--- src/ca/legacy/pcas/generic/casStrmClient.cc 2010-09-29 05:44:47 +0000
+++ src/ca/legacy/pcas/generic/casStrmClient.cc 2012-04-12 17:46:27 +0000
@@ -1629,7 +1629,7 @@
1629 if ( ! pvar.getPV()->pPVI ) {1629 if ( ! pvar.getPV()->pPVI ) {
1630 // @#$!* Tornado 2 Cygnus GNU compiler bugs1630 // @#$!* Tornado 2 Cygnus GNU compiler bugs
1631# if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 )1631# if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 )
1632 pvar.getPV()->pPVI = new ( std::nothrow ) // X aCC 9301632 pvar.getPV()->pPVI = new ( std::nothrow )
1633 casPVI ( *pvar.getPV() );1633 casPVI ( *pvar.getPV() );
1634# else1634# else
1635 try {1635 try {
@@ -1678,7 +1678,7 @@
1678 if ( ! pChan->pChanI ) {1678 if ( ! pChan->pChanI ) {
1679 // @#$!* Tornado 2 Cygnus GNU compiler bugs1679 // @#$!* Tornado 2 Cygnus GNU compiler bugs
1680# if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 )1680# if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 )
1681 pChan->pChanI = new ( std::nothrow ) // X aCC 9301681 pChan->pChanI = new ( std::nothrow )
1682 casChannelI ( * this, *pChan, 1682 casChannelI ( * this, *pChan,
1683 * pvar.getPV()->pPVI, hdr.m_cid );1683 * pvar.getPV()->pPVI, hdr.m_cid );
1684# else1684# else
@@ -1848,7 +1848,7 @@
1848 assert ( hdr.m_cid == chan.getCID() );1848 assert ( hdr.m_cid == chan.getCID() );
1849 status = this->out.copyInHeader ( CA_PROTO_CREATE_CHAN, 0,1849 status = this->out.copyInHeader ( CA_PROTO_CREATE_CHAN, 0,
1850 static_cast <ca_uint16_t> ( nativeTypeDBR ), 1850 static_cast <ca_uint16_t> ( nativeTypeDBR ),
1851 static_cast <ca_uint32_t> ( nativeCount ), // X aCC 3921851 static_cast <ca_uint32_t> ( nativeCount ),
1852 chan.getCID(), chan.getSID(), 0 );1852 chan.getCID(), chan.getSID(), 0 );
1853 if ( status != S_cas_success ) {1853 if ( status != S_cas_success ) {
1854 this->out.popCtx ( outctx );1854 this->out.popCtx ( outctx );
@@ -2150,7 +2150,7 @@
2150 }2150 }
21512151
2152 class channelDestroyEvent * pEvent = 2152 class channelDestroyEvent * pEvent =
2153 new ( std::nothrow ) class channelDestroyEvent ( // X aCC 9302153 new ( std::nothrow ) class channelDestroyEvent (
2154 immediateUninstallNeeded ? & chan : 0,2154 immediateUninstallNeeded ? & chan : 0,
2155 chan.getSID() );2155 chan.getSID() );
2156 if ( pEvent ) {2156 if ( pEvent ) {
21572157
=== modified file 'src/ca/legacy/pcas/generic/casdef.h'
--- src/ca/legacy/pcas/generic/casdef.h 2009-08-06 01:36:30 +0000
+++ src/ca/legacy/pcas/generic/casdef.h 2012-04-12 17:46:27 +0000
@@ -113,7 +113,7 @@
113class casCtx;113class casCtx;
114class casChannel;114class casChannel;
115115
116class epicsShareClass pvExistReturn { // X aCC 361116class epicsShareClass pvExistReturn {
117public:117public:
118 // most server tools will use this118 // most server tools will use this
119 pvExistReturn ( pvExistReturnEnum s = pverDoesNotExistHere );119 pvExistReturn ( pvExistReturnEnum s = pverDoesNotExistHere );
120120
=== modified file 'src/ca/legacy/pcas/generic/chanIntfForPV.h'
--- src/ca/legacy/pcas/generic/chanIntfForPV.h 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/chanIntfForPV.h 2012-04-12 17:46:27 +0000
@@ -41,7 +41,7 @@
41class casEventMask;41class casEventMask;
42class gdd;42class gdd;
4343
44class casChannelDestroyFromPV { // X aCC 65544class casChannelDestroyFromPV {
45public:45public:
46 virtual void postDestroyEvent () = 0;46 virtual void postDestroyEvent () = 0;
47protected:47protected:
4848
=== modified file 'src/ca/legacy/pcas/generic/inBuf.cc'
--- src/ca/legacy/pcas/generic/inBuf.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/inBuf.cc 2012-04-12 17:46:27 +0000
@@ -117,7 +117,7 @@
117//117//
118// inBuf::pushCtx ()118// inBuf::pushCtx ()
119//119//
120const inBufCtx inBuf::pushCtx ( bufSizeT headerSize, // X aCC 361120const inBufCtx inBuf::pushCtx ( bufSizeT headerSize,
121 bufSizeT bodySize )121 bufSizeT bodySize )
122{122{
123 if ( headerSize + bodySize > ( this->bytesInBuffer - this->nextReadIndex ) || 123 if ( headerSize + bodySize > ( this->bytesInBuffer - this->nextReadIndex ) ||
@@ -140,7 +140,7 @@
140//140//
141// inBuf::popCtx ()141// inBuf::popCtx ()
142//142//
143bufSizeT inBuf::popCtx ( const inBufCtx &ctx ) // X aCC 361143bufSizeT inBuf::popCtx ( const inBufCtx &ctx )
144{144{
145 if ( ctx.stat==inBufCtx::pushCtxSuccess ) {145 if ( ctx.stat==inBufCtx::pushCtxSuccess ) {
146 bufSizeT bytesRemoved = this->nextReadIndex;146 bufSizeT bytesRemoved = this->nextReadIndex;
147147
=== modified file 'src/ca/legacy/pcas/generic/inBuf.h'
--- src/ca/legacy/pcas/generic/inBuf.h 2009-07-30 23:48:43 +0000
+++ src/ca/legacy/pcas/generic/inBuf.h 2012-04-12 17:46:27 +0000
@@ -44,7 +44,7 @@
44 bufSizeT nextReadIndex;44 bufSizeT nextReadIndex;
45};45};
4646
47class inBufClient { // X aCC 65547class inBufClient {
48public:48public:
49 enum fillCondition { casFillNone, casFillProgress, 49 enum fillCondition { casFillNone, casFillProgress,
50 casFillDisconnect };50 casFillDisconnect };
5151
=== modified file 'src/ca/legacy/pcas/generic/outBuf.cc'
--- src/ca/legacy/pcas/generic/outBuf.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/generic/outBuf.cc 2012-04-12 17:46:27 +0000
@@ -265,7 +265,7 @@
265//265//
266// outBuf::pushCtx ()266// outBuf::pushCtx ()
267//267//
268const outBufCtx outBuf::pushCtx ( bufSizeT headerSize, // X aCC 361268const outBufCtx outBuf::pushCtx ( bufSizeT headerSize,
269 bufSizeT maxBodySize,269 bufSizeT maxBodySize,
270 void *&pHeader ) 270 void *&pHeader )
271{271{
@@ -292,7 +292,7 @@
292//292//
293// outBuf::popCtx ()293// outBuf::popCtx ()
294//294//
295bufSizeT outBuf::popCtx (const outBufCtx &ctx) // X aCC 361295bufSizeT outBuf::popCtx (const outBufCtx &ctx)
296{296{
297 if (ctx.stat==outBufCtx::pushCtxSuccess) {297 if (ctx.stat==outBufCtx::pushCtxSuccess) {
298 bufSizeT bytesAdded = this->stack;298 bufSizeT bytesAdded = this->stack;
299299
=== modified file 'src/ca/legacy/pcas/generic/outBuf.h'
--- src/ca/legacy/pcas/generic/outBuf.h 2009-07-25 00:43:28 +0000
+++ src/ca/legacy/pcas/generic/outBuf.h 2012-04-12 17:46:27 +0000
@@ -45,7 +45,7 @@
45 bufSizeT stack;45 bufSizeT stack;
46};46};
4747
48class outBufClient { // X aCC 65548class outBufClient {
49public:49public:
50 enum flushCondition { 50 enum flushCondition {
51 flushNone = 0, 51 flushNone = 0,
5252
=== modified file 'src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc'
--- src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc 2012-04-12 17:46:27 +0000
@@ -167,7 +167,7 @@
167//167//
168// getToken()168// getToken()
169//169//
170static char *getToken(const char **ppString, // X aCC 361170static char *getToken(const char **ppString,
171 char *pBuf, unsigned bufSIze)171 char *pBuf, unsigned bufSIze)
172{172{
173 const char *pToken;173 const char *pToken;
174174
=== modified file 'src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc'
--- src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc 2009-08-04 19:10:30 +0000
+++ src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc 2012-04-12 17:46:27 +0000
@@ -297,7 +297,7 @@
297{297{
298 osiSockIoctl_t yes = true;298 osiSockIoctl_t yes = true;
299 299
300 int status = socket_ioctl ( this->sock, FIONBIO, &yes ); // X aCC 392300 int status = socket_ioctl ( this->sock, FIONBIO, &yes );
301 if ( status < 0 ) {301 if ( status < 0 ) {
302 char sockErrBuf[64];302 char sockErrBuf[64];
303 epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );303 epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
@@ -307,7 +307,7 @@
307307
308 if ( this->bcastRecvSock != INVALID_SOCKET ) {308 if ( this->bcastRecvSock != INVALID_SOCKET ) {
309 yes = true;309 yes = true;
310 int status = socket_ioctl ( this->bcastRecvSock, // X aCC 392310 int status = socket_ioctl ( this->bcastRecvSock,
311 FIONBIO, &yes );311 FIONBIO, &yes );
312 if ( status < 0 ) {312 if ( status < 0 ) {
313 char sockErrBuf[64];313 char sockErrBuf[64];
@@ -319,7 +319,7 @@
319}319}
320320
321inBufClient::fillCondition321inBufClient::fillCondition
322casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size, // X aCC 361322casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size,
323 fillParameter parm, bufSizeT & actualSize, caNetAddr & fromOut )323 fillParameter parm, bufSizeT & actualSize, caNetAddr & fromOut )
324{324{
325 int status;325 int status;
@@ -366,7 +366,7 @@
366}366}
367367
368outBufClient::flushCondition368outBufClient::flushCondition
369casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size, // X aCC 361369casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size,
370 const caNetAddr & to )370 const caNetAddr & to )
371{371{
372 int status;372 int status;
373373
=== modified file 'src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc'
--- src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc 2010-08-10 21:05:46 +0000
+++ src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc 2012-04-12 17:46:27 +0000
@@ -198,7 +198,7 @@
198 int status;198 int status;
199 osiSockIoctl_t yes = true;199 osiSockIoctl_t yes = true;
200 200
201 status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392201 status = socket_ioctl(this->sock, FIONBIO, &yes);
202 if ( status < 0 ) {202 if ( status < 0 ) {
203 char sockErrBuf[64];203 char sockErrBuf[64];
204 epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );204 epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
205205
=== modified file 'src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc'
--- src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc 2010-08-10 21:05:46 +0000
+++ src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc 2012-04-12 17:46:27 +0000
@@ -168,7 +168,7 @@
168168
169// casStreamIO::osdRecv()169// casStreamIO::osdRecv()
170inBufClient::fillCondition170inBufClient::fillCondition
171casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes, // X aCC 361171casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes,
172 bufSizeT & nBytesActual )172 bufSizeT & nBytesActual )
173{173{
174 int nchars;174 int nchars;
@@ -250,7 +250,7 @@
250 int status;250 int status;
251 osiSockIoctl_t yes = true;251 osiSockIoctl_t yes = true;
252252
253 status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392253 status = socket_ioctl(this->sock, FIONBIO, &yes);
254 if (status>=0) {254 if (status>=0) {
255 this->blockingFlag = xIsntBlocking;255 this->blockingFlag = xIsntBlocking;
256 }256 }
257257
=== modified file 'src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp'
--- src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp 2004-10-08 14:58:59 +0000
+++ src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp 2012-04-12 17:46:27 +0000
@@ -67,13 +67,6 @@
67}67}
68#endif68#endif
6969
70void * ipIgnoreEntry::operator new ( size_t ) // X aCC 361
71{
72 // The HPUX compiler seems to require this even though no code
73 // calls it directly
74 throw std::logic_error ( "why is the compiler calling private operator new" );
75}
76
77void ipIgnoreEntry::operator delete ( void * )70void ipIgnoreEntry::operator delete ( void * )
78{71{
79 // Visual C++ .net appears to require operator delete if72 // Visual C++ .net appears to require operator delete if
8073
=== modified file 'src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h'
--- src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h 2010-10-05 19:27:37 +0000
+++ src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h 2012-04-12 17:46:27 +0000
@@ -44,7 +44,6 @@
44 unsigned ipAddr;44 unsigned ipAddr;
45 ipIgnoreEntry ( const ipIgnoreEntry & );45 ipIgnoreEntry ( const ipIgnoreEntry & );
46 ipIgnoreEntry & operator = ( const ipIgnoreEntry & );46 ipIgnoreEntry & operator = ( const ipIgnoreEntry & );
47 void * operator new ( size_t size );
48 void operator delete ( void * );47 void operator delete ( void * );
49};48};
5049
5150
=== modified file 'src/ioc/db/dbCAC.h'
--- src/ioc/db/dbCAC.h 2011-06-01 22:22:12 +0000
+++ src/ioc/db/dbCAC.h 2012-04-12 17:46:27 +0000
@@ -62,7 +62,7 @@
62class dbPutNotifyBlocker;62class dbPutNotifyBlocker;
63class dbSubscriptionIO;63class dbSubscriptionIO;
6464
65class dbBaseIO // X aCC 65565class dbBaseIO
66 : public chronIntIdRes < dbBaseIO > {66 : public chronIntIdRes < dbBaseIO > {
67public:67public:
68 virtual dbSubscriptionIO * isSubscription () = 0;68 virtual dbSubscriptionIO * isSubscription () = 0;
@@ -110,7 +110,6 @@
110 dbSubscriptionIO ( const dbSubscriptionIO & );110 dbSubscriptionIO ( const dbSubscriptionIO & );
111 dbSubscriptionIO & operator = ( const dbSubscriptionIO & );111 dbSubscriptionIO & operator = ( const dbSubscriptionIO & );
112 virtual ~dbSubscriptionIO ();112 virtual ~dbSubscriptionIO ();
113 void * operator new ( size_t size );
114 void operator delete ( void * );113 void operator delete ( void * );
115};114};
116115
117116
=== modified file 'src/ioc/db/dbChannelIO.cpp'
--- src/ioc/db/dbChannelIO.cpp 2010-10-05 19:27:37 +0000
+++ src/ioc/db/dbChannelIO.cpp 2012-04-12 17:46:27 +0000
@@ -204,13 +204,6 @@
204 return freeList.allocate ( size );204 return freeList.allocate ( size );
205}205}
206206
207void * dbChannelIO::operator new ( size_t ) // X aCC 361
208{
209 // The HPUX compiler seems to require this even though no code
210 // calls it directly
211 throw std::logic_error ( "why is the compiler calling private operator new" );
212}
213
214#ifdef CXX_PLACEMENT_DELETE207#ifdef CXX_PLACEMENT_DELETE
215void dbChannelIO::operator delete ( void *pCadaver, 208void dbChannelIO::operator delete ( void *pCadaver,
216 tsFreeList < dbChannelIO, 256, epicsMutexNOOP > & freeList )209 tsFreeList < dbChannelIO, 256, epicsMutexNOOP > & freeList )
217210
=== modified file 'src/ioc/db/dbChannelIO.h'
--- src/ioc/db/dbChannelIO.h 2010-10-05 19:27:37 +0000
+++ src/ioc/db/dbChannelIO.h 2012-04-12 17:46:27 +0000
@@ -111,7 +111,6 @@
111 epicsGuard < epicsMutex > & ) const;111 epicsGuard < epicsMutex > & ) const;
112 dbChannelIO ( const dbChannelIO & );112 dbChannelIO ( const dbChannelIO & );
113 dbChannelIO & operator = ( const dbChannelIO & );113 dbChannelIO & operator = ( const dbChannelIO & );
114 void * operator new ( size_t size );
115 void operator delete ( void * );114 void operator delete ( void * );
116};115};
117116
118117
=== modified file 'src/ioc/db/dbContext.cpp'
--- src/ioc/db/dbContext.cpp 2010-10-05 19:27:37 +0000
+++ src/ioc/db/dbContext.cpp 2012-04-12 17:46:27 +0000
@@ -83,7 +83,7 @@
83 }83 }
84}84}
8585
86cacChannel & dbContext::createChannel ( // X aCC 36186cacChannel & dbContext::createChannel (
87 epicsGuard < epicsMutex > & guard, const char * pName, 87 epicsGuard < epicsMutex > & guard, const char * pName,
88 cacChannelNotify & notifyIn, cacChannel::priLev priority )88 cacChannelNotify & notifyIn, cacChannel::priLev priority )
89{89{
9090
=== modified file 'src/ioc/db/dbPutNotifyBlocker.cpp'
--- src/ioc/db/dbPutNotifyBlocker.cpp 2011-10-19 18:07:00 +0000
+++ src/ioc/db/dbPutNotifyBlocker.cpp 2012-04-12 17:46:27 +0000
@@ -212,13 +212,6 @@
212 return freeList.allocate ( size );212 return freeList.allocate ( size );
213}213}
214214
215void * dbPutNotifyBlocker::operator new ( size_t ) // X aCC 361
216{
217 // The HPUX compiler seems to require this even though no code
218 // calls it directly
219 throw std::logic_error ( "why is the compiler calling private operator new" );
220}
221
222#ifdef CXX_PLACEMENT_DELETE215#ifdef CXX_PLACEMENT_DELETE
223void dbPutNotifyBlocker::operator delete ( void *pCadaver, 216void dbPutNotifyBlocker::operator delete ( void *pCadaver,
224 tsFreeList < dbPutNotifyBlocker, 64, epicsMutexNOOP > & freeList )217 tsFreeList < dbPutNotifyBlocker, 64, epicsMutexNOOP > & freeList )
225218
=== modified file 'src/ioc/db/dbPutNotifyBlocker.h'
--- src/ioc/db/dbPutNotifyBlocker.h 2010-10-05 19:27:37 +0000
+++ src/ioc/db/dbPutNotifyBlocker.h 2012-04-12 17:46:27 +0000
@@ -82,7 +82,6 @@
82 dbPutNotifyBlocker ( const dbPutNotifyBlocker & );82 dbPutNotifyBlocker ( const dbPutNotifyBlocker & );
83 dbPutNotifyBlocker & operator = ( const dbPutNotifyBlocker & );83 dbPutNotifyBlocker & operator = ( const dbPutNotifyBlocker & );
84 virtual ~dbPutNotifyBlocker ();84 virtual ~dbPutNotifyBlocker ();
85 void * operator new ( size_t size );
86 void operator delete ( void * );85 void operator delete ( void * );
87};86};
8887
8988
=== modified file 'src/ioc/db/dbSubscriptionIO.cpp'
--- src/ioc/db/dbSubscriptionIO.cpp 2010-10-05 19:27:37 +0000
+++ src/ioc/db/dbSubscriptionIO.cpp 2012-04-12 17:46:27 +0000
@@ -94,13 +94,6 @@
94 this->chan.pName(guard), this->type, this->count );94 this->chan.pName(guard), this->type, this->count );
95}95}
9696
97void * dbSubscriptionIO::operator new ( size_t ) // X aCC 361
98{
99 // The HPUX compiler seems to require this even though no code
100 // calls it directly
101 throw std::logic_error ( "why is the compiler calling private operator new" );
102}
103
104void dbSubscriptionIO::operator delete ( void * )97void dbSubscriptionIO::operator delete ( void * )
105{98{
106 // Visual C++ .net appears to require operator delete if99 // Visual C++ .net appears to require operator delete if
107100
=== modified file 'src/libCom/cxxTemplates/resourceLib.h'
--- src/libCom/cxxTemplates/resourceLib.h 2010-10-05 19:27:37 +0000
+++ src/libCom/cxxTemplates/resourceLib.h 2012-04-12 17:46:27 +0000
@@ -296,7 +296,7 @@
296// remove a res from the resTable296// remove a res from the resTable
297//297//
298template <class T, class ID>298template <class T, class ID>
299T * resTable<T,ID>::remove ( const ID & idIn ) // X aCC 361299T * resTable<T,ID>::remove ( const ID & idIn )
300{300{
301 if ( this->pTable ) {301 if ( this->pTable ) {
302 // search list for idIn and remove the first match302 // search list for idIn and remove the first match
@@ -341,7 +341,7 @@
341// resTable::lookup ()341// resTable::lookup ()
342//342//
343template <class T, class ID>343template <class T, class ID>
344inline T * resTable<T,ID>::lookup ( const ID & idIn ) const // X aCC 361344inline T * resTable<T,ID>::lookup ( const ID & idIn ) const
345{345{
346 if ( this->pTable ) {346 if ( this->pTable ) {
347 tsSLList<T> & list = this->pTable [ this->hash ( idIn ) ];347 tsSLList<T> & list = this->pTable [ this->hash ( idIn ) ];
@@ -514,7 +514,7 @@
514}514}
515515
516template <class T, class ID>516template <class T, class ID>
517inline unsigned resTable<T,ID>::tableSize () const // X aCC 361517inline unsigned resTable<T,ID>::tableSize () const
518{518{
519 if ( this->pTable ) {519 if ( this->pTable ) {
520 return ( this->hashIxMask + 1 ) + this->nextSplitIndex;520 return ( this->hashIxMask + 1 ) + this->nextSplitIndex;
@@ -1010,7 +1010,7 @@
1010// intId::operator == ()1010// intId::operator == ()
1011//1011//
1012template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>1012template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
1013inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator == // X aCC 3611013inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator ==
1014 (const intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH> &idIn) const1014 (const intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH> &idIn) const
1015{1015{
1016 return this->id == idIn.id;1016 return this->id == idIn.id;
@@ -1020,7 +1020,7 @@
1020// intId::getId ()1020// intId::getId ()
1021//1021//
1022template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>1022template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
1023inline const T intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::getId () const // X aCC 3611023inline const T intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::getId () const
1024{1024{
1025 return this->id;1025 return this->id;
1026}1026}
@@ -1067,7 +1067,7 @@
1067// intId::hash()1067// intId::hash()
1068//1068//
1069template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>1069template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
1070inline resTableIndex intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::hash () const // X aCC 3611070inline resTableIndex intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::hash () const
1071{1071{
1072 return integerHash ( MIN_INDEX_WIDTH, MAX_ID_WIDTH, this->id );1072 return integerHash ( MIN_INDEX_WIDTH, MAX_ID_WIDTH, this->id );
1073}1073}
10741074
=== modified file 'src/libCom/fdmgr/fdmgr.cpp'
--- src/libCom/fdmgr/fdmgr.cpp 2004-10-08 15:12:20 +0000
+++ src/libCom/fdmgr/fdmgr.cpp 2012-04-12 17:46:27 +0000
@@ -228,7 +228,7 @@
228 return 0;228 return 0;
229}229}
230230
231extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback ( // X aCC 361231extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback (
232 fdctx *pfdctx, SOCKET fd, enum fdi_type fdi, pCallBackFDMgr pFunc, void *pParam)232 fdctx *pfdctx, SOCKET fd, enum fdi_type fdi, pCallBackFDMgr pFunc, void *pParam)
233{233{
234 oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);234 oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
@@ -270,7 +270,7 @@
270 }270 }
271}271}
272 272
273extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback ( // X aCC 361273extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback (
274 fdctx *pfdctx, SOCKET fd, enum fdi_type fdi)274 fdctx *pfdctx, SOCKET fd, enum fdi_type fdi)
275{275{
276 oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);276 oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
277277
=== modified file 'src/libCom/misc/ipAddrToAsciiAsynchronous.cpp'
--- src/libCom/misc/ipAddrToAsciiAsynchronous.cpp 2008-10-21 20:26:48 +0000
+++ src/libCom/misc/ipAddrToAsciiAsynchronous.cpp 2012-04-12 17:46:27 +0000
@@ -61,7 +61,6 @@
61 bool pending;61 bool pending;
62 void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & );62 void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & );
63 void release (); 63 void release ();
64 void * operator new ( size_t );
65 void operator delete ( void * );64 void operator delete ( void * );
66 friend class ipAddrToAsciiEnginePrivate;65 friend class ipAddrToAsciiEnginePrivate;
67 ipAddrToAsciiTransactionPrivate & operator = ( const ipAddrToAsciiTransactionPrivate & );66 ipAddrToAsciiTransactionPrivate & operator = ( const ipAddrToAsciiTransactionPrivate & );
@@ -272,13 +271,6 @@
272}271}
273#endif272#endif
274273
275void * ipAddrToAsciiTransactionPrivate::operator new ( size_t ) // X aCC 361
276{
277 // The HPUX compiler seems to require this even though no code
278 // calls it directly
279 throw std::logic_error ( "why is the compiler calling private operator new" );
280}
281
282void ipAddrToAsciiTransactionPrivate::operator delete ( void * )274void ipAddrToAsciiTransactionPrivate::operator delete ( void * )
283{275{
284 // Visual C++ .net appears to require operator delete if276 // Visual C++ .net appears to require operator delete if
285277
=== modified file 'src/libCom/misc/ipAddrToAsciiAsynchronous.h'
--- src/libCom/misc/ipAddrToAsciiAsynchronous.h 2010-10-05 19:27:37 +0000
+++ src/libCom/misc/ipAddrToAsciiAsynchronous.h 2012-04-12 17:46:27 +0000
@@ -36,7 +36,7 @@
36 virtual ~ipAddrToAsciiCallBack () = 0;36 virtual ~ipAddrToAsciiCallBack () = 0;
37};37};
3838
39class epicsShareClass ipAddrToAsciiTransaction { // X aCC 65539class epicsShareClass ipAddrToAsciiTransaction {
40public:40public:
41 virtual void release () = 0; 41 virtual void release () = 0;
42 virtual void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ) = 0;42 virtual void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ) = 0;
@@ -46,7 +46,7 @@
46 virtual ~ipAddrToAsciiTransaction () = 0;46 virtual ~ipAddrToAsciiTransaction () = 0;
47};47};
4848
49class epicsShareClass ipAddrToAsciiEngine { // X aCC 65549class epicsShareClass ipAddrToAsciiEngine {
50public:50public:
51 virtual void release () = 0; 51 virtual void release () = 0;
52 virtual ipAddrToAsciiTransaction & createTransaction () = 0;52 virtual ipAddrToAsciiTransaction & createTransaction () = 0;
5353
=== modified file 'src/libCom/osi/epicsMutex.cpp'
--- src/libCom/osi/epicsMutex.cpp 2010-03-17 01:09:51 +0000
+++ src/libCom/osi/epicsMutex.cpp 2012-04-12 17:46:27 +0000
@@ -239,7 +239,7 @@
239 }239 }
240}240}
241241
242bool epicsMutex::tryLock () // X aCC 361242bool epicsMutex::tryLock ()
243{243{
244 epicsMutexLockStatus status = epicsMutexTryLock ( this->id );244 epicsMutexLockStatus status = epicsMutexTryLock ( this->id );
245 if ( status == epicsMutexLockOK ) {245 if ( status == epicsMutexLockOK ) {
246246
=== modified file 'src/libCom/osi/os/posix/osdTime.cpp'
--- src/libCom/osi/os/posix/osdTime.cpp 2008-09-15 20:07:23 +0000
+++ src/libCom/osi/os/posix/osdTime.cpp 2012-04-12 17:46:27 +0000
@@ -60,7 +60,7 @@
60static int done = timeRegister();60static int done = timeRegister();
6161
6262
63int epicsTime_gmtime ( const time_t *pAnsiTime, // X aCC 36163int epicsTime_gmtime ( const time_t *pAnsiTime,
64 struct tm *pTM )64 struct tm *pTM )
65{65{
66 struct tm * pRet = gmtime_r ( pAnsiTime, pTM );66 struct tm * pRet = gmtime_r ( pAnsiTime, pTM );
@@ -72,7 +72,7 @@
72 }72 }
73}73}
7474
75int epicsTime_localtime ( const time_t *clock, // X aCC 36175int epicsTime_localtime ( const time_t *clock,
76 struct tm *result )76 struct tm *result )
77{77{
78 struct tm * pRet = localtime_r ( clock, result );78 struct tm * pRet = localtime_r ( clock, result );
7979
=== modified file 'src/libCom/timer/epicsTimer.h'
--- src/libCom/timer/epicsTimer.h 2010-11-04 16:19:54 +0000
+++ src/libCom/timer/epicsTimer.h 2012-04-12 17:46:27 +0000
@@ -47,7 +47,7 @@
47 virtual void show ( unsigned int level ) const;47 virtual void show ( unsigned int level ) const;
48};48};
4949
50class epicsShareClass epicsTimer { /* X aCC 655 */50class epicsShareClass epicsTimer {
51public:51public:
52 /* calls cancel (see warning below) and then destroys the timer */52 /* calls cancel (see warning below) and then destroys the timer */
53 virtual void destroy () = 0;53 virtual void destroy () = 0;
@@ -70,7 +70,7 @@
70 virtual ~epicsTimer () = 0; /* protected => delete() must not be called */70 virtual ~epicsTimer () = 0; /* protected => delete() must not be called */
71};71};
7272
73class epicsTimerQueue { /* X aCC 655 */73class epicsTimerQueue {
74public:74public:
75 virtual epicsTimer & createTimer () = 0;75 virtual epicsTimer & createTimer () = 0;
76 virtual void show ( unsigned int level ) const = 0;76 virtual void show ( unsigned int level ) const = 0;
@@ -78,7 +78,7 @@
78 epicsShareFunc virtual ~epicsTimerQueue () = 0;78 epicsShareFunc virtual ~epicsTimerQueue () = 0;
79};79};
8080
81class epicsTimerQueueActive /* X aCC 655 */81class epicsTimerQueueActive
82 : public epicsTimerQueue {82 : public epicsTimerQueue {
83public:83public:
84 static epicsShareFunc epicsTimerQueueActive & allocate (84 static epicsShareFunc epicsTimerQueueActive & allocate (
@@ -88,7 +88,7 @@
88 epicsShareFunc virtual ~epicsTimerQueueActive () = 0;88 epicsShareFunc virtual ~epicsTimerQueueActive () = 0;
89};89};
9090
91class epicsTimerQueueNotify { /* X aCC 655 */91class epicsTimerQueueNotify {
92public:92public:
93 /* called when a new timer is inserted into the queue and the */93 /* called when a new timer is inserted into the queue and the */
94 /* delay to the next expire has changed */94 /* delay to the next expire has changed */
@@ -100,7 +100,7 @@
100 epicsShareFunc virtual ~epicsTimerQueueNotify () = 0;100 epicsShareFunc virtual ~epicsTimerQueueNotify () = 0;
101};101};
102102
103class epicsTimerQueuePassive /* X aCC 655 */103class epicsTimerQueuePassive
104 : public epicsTimerQueue {104 : public epicsTimerQueue {
105public:105public:
106 static epicsShareFunc epicsTimerQueuePassive & create ( epicsTimerQueueNotify & );106 static epicsShareFunc epicsTimerQueuePassive & create ( epicsTimerQueueNotify & );
107107
=== modified file 'src/libCom/timer/timer.cpp'
--- src/libCom/timer/timer.cpp 2009-08-10 21:41:59 +0000
+++ src/libCom/timer/timer.cpp 2012-04-12 17:46:27 +0000
@@ -221,13 +221,6 @@
221 }221 }
222}222}
223223
224void * timer::operator new ( size_t ) // X aCC 361
225{
226 // The HPUX compiler seems to require this even though no code
227 // calls it directly
228 throw std::logic_error ( "why is the compiler calling private operator new" );
229}
230
231void timer::operator delete ( void * )224void timer::operator delete ( void * )
232{225{
233 // Visual C++ .net appears to require operator delete if226 // Visual C++ .net appears to require operator delete if
@@ -239,13 +232,6 @@
239 __FILE__, __LINE__ );232 __FILE__, __LINE__ );
240}233}
241234
242void * epicsTimerForC::operator new ( size_t ) // X aCC 361
243{
244 // The HPUX compiler seems to require this even though no code
245 // calls it directly
246 throw std::logic_error ( "why is the compiler calling private operator new" );
247}
248
249void epicsTimerForC::operator delete ( void * )235void epicsTimerForC::operator delete ( void * )
250{236{
251 // Visual C++ .net appears to require operator delete if237 // Visual C++ .net appears to require operator delete if
252238
=== modified file 'src/libCom/timer/timerPrivate.h'
--- src/libCom/timer/timerPrivate.h 2010-10-05 19:27:37 +0000
+++ src/libCom/timer/timerPrivate.h 2012-04-12 17:46:27 +0000
@@ -60,7 +60,6 @@
60 // because if I declare placement new and delete, but60 // because if I declare placement new and delete, but
61 // comment out the placement delete definition there are61 // comment out the placement delete definition there are
62 // no undefined symbols.62 // no undefined symbols.
63 void * operator new ( size_t size );
64 void operator delete ( void * ); 63 void operator delete ( void * );
65 friend class timerQueue;64 friend class timerQueue;
66};65};
@@ -83,7 +82,6 @@
83 // because if I declare placement new and delete, but82 // because if I declare placement new and delete, but
84 // comment out the placement delete definition there are83 // comment out the placement delete definition there are
85 // no undefined symbols.84 // no undefined symbols.
86 void * operator new ( size_t size );
87 void operator delete ( void * ); 85 void operator delete ( void * );
88 friend class timerQueue;86 friend class timerQueue;
89};87};
@@ -118,7 +116,7 @@
118 friend struct epicsTimerForC;116 friend struct epicsTimerForC;
119};117};
120118
121class timerQueueActiveMgrPrivate { // X aCC 655119class timerQueueActiveMgrPrivate {
122public:120public:
123 timerQueueActiveMgrPrivate ();121 timerQueueActiveMgrPrivate ();
124protected:122protected:
125123
=== modified file 'src/std/softIoc/softMain.cpp'
--- src/std/softIoc/softMain.cpp 2010-10-05 19:27:37 +0000
+++ src/std/softIoc/softMain.cpp 2012-04-12 17:46:27 +0000
@@ -129,7 +129,7 @@
129 }129 }
130 130
131 softIoc_registerRecordDeviceDriver(pdbbase);131 softIoc_registerRecordDeviceDriver(pdbbase);
132 registryFunctionAdd("exit", (REGISTRYFUNCTION) exitSubroutine); // X aCC 331132 registryFunctionAdd("exit", (REGISTRYFUNCTION) exitSubroutine);
133133
134 while (argc>1 && **argv == '-') {134 while (argc>1 && **argv == '-') {
135 switch ((*argv)[1]) {135 switch ((*argv)[1]) {
136136
=== modified file 'src/template/base/top/caServerApp/exPV.cc'
--- src/template/base/top/caServerApp/exPV.cc 2003-04-01 19:54:32 +0000
+++ src/template/base/top/caServerApp/exPV.cc 2012-04-12 17:46:27 +0000
@@ -107,7 +107,7 @@
107// exScanTimer::expire ()107// exScanTimer::expire ()
108//108//
109epicsTimerNotify::expireStatus109epicsTimerNotify::expireStatus
110exPV::expire ( const epicsTime & /*currentTime*/ ) // X aCC 361110exPV::expire ( const epicsTime & /*currentTime*/ )
111{111{
112 this->scan();112 this->scan();
113 if ( this->scanOn && this->getScanPeriod() > 0.0 ) {113 if ( this->scanOn && this->getScanPeriod() > 0.0 ) {
114114
=== modified file 'src/template/base/top/caServerApp/exServer.cc'
--- src/template/base/top/caServerApp/exServer.cc 2009-08-14 00:24:09 +0000
+++ src/template/base/top/caServerApp/exServer.cc 2012-04-12 17:46:27 +0000
@@ -167,7 +167,7 @@
167//167//
168// exServer::pvExistTest()168// exServer::pvExistTest()
169//169//
170pvExistReturn exServer::pvExistTest // X aCC 361170pvExistReturn exServer::pvExistTest
171 ( const casCtx& ctxIn, const char * pPVName )171 ( const casCtx& ctxIn, const char * pPVName )
172{172{
173 //173 //
@@ -214,7 +214,7 @@
214//214//
215// exServer::pvAttach()215// exServer::pvAttach()
216//216//
217pvAttachReturn exServer::pvAttach // X aCC 361217pvAttachReturn exServer::pvAttach
218 (const casCtx &ctx, const char *pName)218 (const casCtx &ctx, const char *pName)
219{219{
220 //220 //
221221
=== modified file 'src/template/base/top/caServerApp/exServer.h'
--- src/template/base/top/caServerApp/exServer.h 2009-08-18 00:32:48 +0000
+++ src/template/base/top/caServerApp/exServer.h 2012-04-12 17:46:27 +0000
@@ -103,7 +103,7 @@
103// for this breaking out into a seperate class103// for this breaking out into a seperate class
104// from pvInfo)104// from pvInfo)
105//105//
106class pvEntry // X aCC 655106class pvEntry
107 : public stringId, public tsSLNode < pvEntry > {107 : public stringId, public tsSLNode < pvEntry > {
108public:108public:
109 pvEntry ( pvInfo &infoIn, exServer & casIn, 109 pvEntry ( pvInfo &infoIn, exServer & casIn,
110110
=== modified file 'src/template/base/top/caServerApp/exVectorPV.cc'
--- src/template/base/top/caServerApp/exVectorPV.cc 2005-10-27 23:56:05 +0000
+++ src/template/base/top/caServerApp/exVectorPV.cc 2012-04-12 17:46:27 +0000
@@ -45,7 +45,7 @@
45//45//
46// exVectorPV::maxBound()46// exVectorPV::maxBound()
47//47//
48aitIndex exVectorPV::maxBound (unsigned dimension) const // X aCC 36148aitIndex exVectorPV::maxBound (unsigned dimension) const
49{49{
50 if (dimension==0u) {50 if (dimension==0u) {
51 return this->info.getElementCount();51 return this->info.getElementCount();
5252
=== modified file 'src/tools/Makefile'
--- src/tools/Makefile 2012-03-13 23:00:46 +0000
+++ src/tools/Makefile 2012-04-12 17:46:27 +0000
@@ -36,7 +36,6 @@
36PERL_SCRIPTS += cvsclean.pl36PERL_SCRIPTS += cvsclean.pl
37PERL_SCRIPTS += dos2unix.pl37PERL_SCRIPTS += dos2unix.pl
38PERL_SCRIPTS += expandVars.pl38PERL_SCRIPTS += expandVars.pl
39PERL_SCRIPTS += filterWarnings.pl
40PERL_SCRIPTS += fullPathName.pl39PERL_SCRIPTS += fullPathName.pl
41PERL_SCRIPTS += installEpics.pl40PERL_SCRIPTS += installEpics.pl
42PERL_SCRIPTS += makeDbDepends.pl41PERL_SCRIPTS += makeDbDepends.pl
4342
=== removed file 'src/tools/filterWarnings.pl'
--- src/tools/filterWarnings.pl 2010-10-05 19:27:37 +0000
+++ src/tools/filterWarnings.pl 1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
1eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*-
2 if $running_under_some_shell; # filterWarnings.pl
3#*************************************************************************
4# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
5# National Laboratory.
6# Copyright (c) 2002 The Regents of the University of California, as
7# Operator of Los Alamos National Laboratory.
8# Copyright (c) 2002 Berliner Elektronenspeicherringgesellschaft fuer
9# Synchrotronstrahlung.
10# EPICS BASE Versions 3.13.7
11# and higher are distributed subject to a Software License Agreement found
12# in file LICENSE that is included with this distribution.
13#*************************************************************************
14
15# $Revision-Id$
16#
17# Author: Ralph Lange
18#
19
20use Text::Wrap;
21
22my ($errline, $errno, $codeline, $pointline);
23
24$Text::Wrap::columns = $ENV{COLUMNS} if $ENV{COLUMNS};
25
26sub Usage
27{
28 print "Usage:\n";
29 print "<compile line> 2>&1 | $0\n";
30
31 exit 2;
32}
33
34# Invalid whit space filter on solaris not implemented
35#if ( $ENV{"EPICS_HOST_ARCH"} =~ m/solaris-sparc/ ) {
36# while ( $errline = <> ) {
37# if ( $errline !~ m/invalid white space character in directive/ ) {
38# print $errline;
39# }
40# }
41#} else {
42 while ( $errline = <> ) {
43 if ( $errline =~ m/^(Warning|Error)/ ) {
44 ($errno) = ($errline =~ m/.* ([0-9]+):/);
45 $codeline = <>;
46 $pointline = <>;
47 next if $codeline =~ m|/[/*]\s*X.*aCC[^a-zA-Z]*$errno|;
48
49 print wrap ("", " ", $errline);
50 print $codeline;
51 print $pointline;
52 }
53 }
54#}

Subscribers

People subscribed via source and target branches