Merge lp:~anj/epics-base/remove-hpux-artifacts into lp:~epics-core/epics-base/3.15
- remove-hpux-artifacts
- Merge into 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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeff Hill | Pending | ||
Review via email: mp+101785@code.launchpad.net |
Commit message
Merged the remove-
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
1 | === modified file 'documentation/README.1st' | |||
2 | --- documentation/README.1st 2011-10-28 23:27:50 +0000 | |||
3 | +++ documentation/README.1st 2012-04-12 17:46:27 +0000 | |||
4 | @@ -272,7 +272,6 @@ | |||
5 | 272 | cvsclean.pl Remove all .#* files in directory tree | 272 | cvsclean.pl Remove all .#* files in directory tree |
6 | 273 | dos2unix.pl Converts text file from DOS CR/LF to unix ISO | 273 | dos2unix.pl Converts text file from DOS CR/LF to unix ISO |
7 | 274 | expandvars.pl Tool to expand @VAR@ variables while copying a file | 274 | expandvars.pl Tool to expand @VAR@ variables while copying a file |
8 | 275 | filterWarnings.pl Filters warning messages during HP builds | ||
9 | 276 | fullpathName.pl Returns fullpath name of directory arg | 275 | fullpathName.pl Returns fullpath name of directory arg |
10 | 277 | installEpics.pl Installs built files into install directories | 276 | installEpics.pl Installs built files into install directories |
11 | 278 | makeIncludeDbd.pl Creates *Include.dbd file from filename args files | 277 | makeIncludeDbd.pl Creates *Include.dbd file from filename args files |
12 | 279 | 278 | ||
13 | === modified file 'documentation/README.html' | |||
14 | --- documentation/README.html 2011-10-28 23:27:50 +0000 | |||
15 | +++ documentation/README.html 2012-04-12 17:46:27 +0000 | |||
16 | @@ -284,7 +284,6 @@ | |||
17 | 284 | cvsclean.pl Remove all .#* files in directory tree | 284 | cvsclean.pl Remove all .#* files in directory tree |
18 | 285 | dos2unix.pl Converts text file from DOS CR/LF to unix ISO | 285 | dos2unix.pl Converts text file from DOS CR/LF to unix ISO |
19 | 286 | expandvars.pl Tool to expand @VAR@ variables while copying a file | 286 | expandvars.pl Tool to expand @VAR@ variables while copying a file |
20 | 287 | filterWarnings.pl Filters warning messages during HP builds | ||
21 | 288 | fullpathName.pl Returns fullpath name of directory arg | 287 | fullpathName.pl Returns fullpath name of directory arg |
22 | 289 | installEpics.pl Installs built files into install directories | 288 | installEpics.pl Installs built files into install directories |
23 | 290 | makeIncludeDbd.pl Creates *Include.dbd file from filename args files | 289 | makeIncludeDbd.pl Creates *Include.dbd file from filename args files |
24 | 291 | 290 | ||
25 | === modified file 'src/ca/client/CASG.cpp' | |||
26 | --- src/ca/client/CASG.cpp 2010-08-10 21:05:46 +0000 | |||
27 | +++ src/ca/client/CASG.cpp 2012-04-12 17:46:27 +0000 | |||
28 | @@ -295,13 +295,6 @@ | |||
29 | 295 | } | 295 | } |
30 | 296 | } | 296 | } |
31 | 297 | 297 | ||
32 | 298 | void * CASG::operator new ( size_t ) // X aCC 361 | ||
33 | 299 | { | ||
34 | 300 | // The HPUX compiler seems to require this even though no code | ||
35 | 301 | // calls it directly | ||
36 | 302 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
37 | 303 | } | ||
38 | 304 | |||
39 | 305 | void CASG::operator delete ( void * ) | 298 | void CASG::operator delete ( void * ) |
40 | 306 | { | 299 | { |
41 | 307 | // Visual C++ .net appears to require operator delete if | 300 | // Visual C++ .net appears to require operator delete if |
42 | 308 | 301 | ||
43 | === modified file 'src/ca/client/access.cpp' | |||
44 | --- src/ca/client/access.cpp 2009-08-14 19:12:50 +0000 | |||
45 | +++ src/ca/client/access.cpp 2012-04-12 17:46:27 +0000 | |||
46 | @@ -433,7 +433,7 @@ | |||
47 | 433 | } | 433 | } |
48 | 434 | 434 | ||
49 | 435 | // extern "C" | 435 | // extern "C" |
51 | 436 | int epicsShareAPI ca_pend ( ca_real timeout, int early ) // X aCC 361 | 436 | int epicsShareAPI ca_pend ( ca_real timeout, int early ) |
52 | 437 | { | 437 | { |
53 | 438 | if ( early ) { | 438 | if ( early ) { |
54 | 439 | return ca_pend_io ( timeout ); | 439 | return ca_pend_io ( timeout ); |
55 | @@ -516,7 +516,7 @@ | |||
56 | 516 | /* | 516 | /* |
57 | 517 | * CA_TEST_IO () | 517 | * CA_TEST_IO () |
58 | 518 | */ | 518 | */ |
60 | 519 | int epicsShareAPI ca_test_io () // X aCC 361 | 519 | int epicsShareAPI ca_test_io () |
61 | 520 | { | 520 | { |
62 | 521 | ca_client_context *pcac; | 521 | ca_client_context *pcac; |
63 | 522 | int caStatus = fetchClientContext ( &pcac ); | 522 | int caStatus = fetchClientContext ( &pcac ); |
64 | @@ -551,7 +551,7 @@ | |||
65 | 551 | * (if they call this routine again). | 551 | * (if they call this routine again). |
66 | 552 | */ | 552 | */ |
67 | 553 | // extern "C" | 553 | // extern "C" |
69 | 554 | const char * epicsShareAPI ca_message ( long ca_status ) // X aCC 361 | 554 | const char * epicsShareAPI ca_message ( long ca_status ) |
70 | 555 | { | 555 | { |
71 | 556 | unsigned msgNo = CA_EXTRACT_MSG_NO ( ca_status ); | 556 | unsigned msgNo = CA_EXTRACT_MSG_NO ( ca_status ); |
72 | 557 | 557 | ||
73 | 558 | 558 | ||
74 | === modified file 'src/ca/client/bhe.cpp' | |||
75 | --- src/ca/client/bhe.cpp 2010-11-04 16:19:54 +0000 | |||
76 | +++ src/ca/client/bhe.cpp 2012-04-12 17:46:27 +0000 | |||
77 | @@ -332,13 +332,6 @@ | |||
78 | 332 | } | 332 | } |
79 | 333 | } | 333 | } |
80 | 334 | 334 | ||
81 | 335 | void * bhe::operator new ( size_t ) // X aCC 361 | ||
82 | 336 | { | ||
83 | 337 | // The HPUX compiler seems to require this even though no code | ||
84 | 338 | // calls it directly | ||
85 | 339 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
86 | 340 | } | ||
87 | 341 | |||
88 | 342 | void bhe::operator delete ( void * ) | 335 | void bhe::operator delete ( void * ) |
89 | 343 | { | 336 | { |
90 | 344 | // Visual C++ .net appears to require operator delete if | 337 | // Visual C++ .net appears to require operator delete if |
91 | 345 | 338 | ||
92 | === modified file 'src/ca/client/bhe.h' | |||
93 | --- src/ca/client/bhe.h 2010-11-04 16:19:54 +0000 | |||
94 | +++ src/ca/client/bhe.h 2012-04-12 17:46:27 +0000 | |||
95 | @@ -87,7 +87,6 @@ | |||
96 | 87 | const epicsTime & currentTime ); | 87 | const epicsTime & currentTime ); |
97 | 88 | bhe ( const bhe & ); | 88 | bhe ( const bhe & ); |
98 | 89 | bhe & operator = ( const bhe & ); | 89 | bhe & operator = ( const bhe & ); |
99 | 90 | void * operator new ( size_t size ); | ||
100 | 91 | epicsShareFunc void operator delete ( void * ); | 90 | epicsShareFunc void operator delete ( void * ); |
101 | 92 | }; | 91 | }; |
102 | 93 | 92 | ||
103 | 94 | 93 | ||
104 | === modified file 'src/ca/client/ca_client_context.cpp' | |||
105 | --- src/ca/client/ca_client_context.cpp 2010-08-10 21:05:46 +0000 | |||
106 | +++ src/ca/client/ca_client_context.cpp 2012-04-12 17:46:27 +0000 | |||
107 | @@ -106,7 +106,7 @@ | |||
108 | 106 | 106 | ||
109 | 107 | { | 107 | { |
110 | 108 | osiSockIoctl_t yes = true; | 108 | osiSockIoctl_t yes = true; |
112 | 109 | int status = socket_ioctl ( this->sock, // X aCC 392 | 109 | int status = socket_ioctl ( this->sock, |
113 | 110 | FIONBIO, & yes); | 110 | FIONBIO, & yes); |
114 | 111 | if ( status < 0 ) { | 111 | if ( status < 0 ) { |
115 | 112 | char sockErrBuf[64]; | 112 | char sockErrBuf[64]; |
116 | @@ -126,7 +126,7 @@ | |||
117 | 126 | memset ( (char *)&addr, 0 , sizeof ( addr ) ); | 126 | memset ( (char *)&addr, 0 , sizeof ( addr ) ); |
118 | 127 | addr.ia.sin_family = AF_INET; | 127 | addr.ia.sin_family = AF_INET; |
119 | 128 | addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY ); | 128 | addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY ); |
121 | 129 | addr.ia.sin_port = htons ( PORT_ANY ); // X aCC 818 | 129 | addr.ia.sin_port = htons ( PORT_ANY ); |
122 | 130 | int status = bind (this->sock, &addr.sa, sizeof (addr) ); | 130 | int status = bind (this->sock, &addr.sa, sizeof (addr) ); |
123 | 131 | if ( status < 0 ) { | 131 | if ( status < 0 ) { |
124 | 132 | char sockErrBuf[64]; | 132 | char sockErrBuf[64]; |
125 | @@ -277,7 +277,7 @@ | |||
126 | 277 | } | 277 | } |
127 | 278 | 278 | ||
128 | 279 | int ca_client_context :: varArgsPrintFormated ( | 279 | int ca_client_context :: varArgsPrintFormated ( |
130 | 280 | const char *pformat, va_list args ) const // X aCC 361 | 280 | const char *pformat, va_list args ) const |
131 | 281 | { | 281 | { |
132 | 282 | caPrintfFunc * pFunc; | 282 | caPrintfFunc * pFunc; |
133 | 283 | { | 283 | { |
134 | 284 | 284 | ||
135 | === modified file 'src/ca/client/cac.cpp' | |||
136 | --- src/ca/client/cac.cpp 2010-08-23 20:17:16 +0000 | |||
137 | +++ src/ca/client/cac.cpp 2012-04-12 17:46:27 +0000 | |||
138 | @@ -568,7 +568,7 @@ | |||
139 | 568 | } | 568 | } |
140 | 569 | 569 | ||
141 | 570 | void cac::transferChanToVirtCircuit ( | 570 | void cac::transferChanToVirtCircuit ( |
143 | 571 | unsigned cid, unsigned sid, // X aCC 431 | 571 | unsigned cid, unsigned sid, |
144 | 572 | ca_uint16_t typeCode, arrayElementCount count, | 572 | ca_uint16_t typeCode, arrayElementCount count, |
145 | 573 | unsigned minorVersionNumber, const osiSockAddr & addr, | 573 | unsigned minorVersionNumber, const osiSockAddr & addr, |
146 | 574 | const epicsTime & currentTime ) | 574 | const epicsTime & currentTime ) |
147 | @@ -787,7 +787,7 @@ | |||
148 | 787 | netSubscription & cac::subscriptionRequest ( | 787 | netSubscription & cac::subscriptionRequest ( |
149 | 788 | epicsGuard < epicsMutex > & guard, | 788 | epicsGuard < epicsMutex > & guard, |
150 | 789 | nciu & chan, privateInterfaceForIO & privChan, | 789 | nciu & chan, privateInterfaceForIO & privChan, |
152 | 790 | unsigned type, // X aCC 361 | 790 | unsigned type, |
153 | 791 | arrayElementCount nElem, unsigned mask, | 791 | arrayElementCount nElem, unsigned mask, |
154 | 792 | cacStateNotify & notifyIn, | 792 | cacStateNotify & notifyIn, |
155 | 793 | bool chanIsInstalled ) | 793 | bool chanIsInstalled ) |
156 | @@ -1021,7 +1021,7 @@ | |||
157 | 1021 | } | 1021 | } |
158 | 1022 | 1022 | ||
159 | 1023 | bool cac::writeExcep ( | 1023 | bool cac::writeExcep ( |
161 | 1024 | callbackManager & mgr, // X aCC 431 | 1024 | callbackManager & mgr, |
162 | 1025 | tcpiiu &, const caHdrLargeArray & hdr, | 1025 | tcpiiu &, const caHdrLargeArray & hdr, |
163 | 1026 | const char * pCtx, unsigned status ) | 1026 | const char * pCtx, unsigned status ) |
164 | 1027 | { | 1027 | { |
165 | @@ -1093,7 +1093,7 @@ | |||
166 | 1093 | } | 1093 | } |
167 | 1094 | 1094 | ||
168 | 1095 | bool cac::accessRightsRespAction ( | 1095 | bool cac::accessRightsRespAction ( |
170 | 1096 | callbackManager & mgr, tcpiiu &, // X aCC 431 | 1096 | callbackManager & mgr, tcpiiu &, |
171 | 1097 | const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ ) | 1097 | const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ ) |
172 | 1098 | { | 1098 | { |
173 | 1099 | epicsGuard < epicsMutex > guard ( this->mutex ); | 1099 | epicsGuard < epicsMutex > guard ( this->mutex ); |
174 | @@ -1110,7 +1110,7 @@ | |||
175 | 1110 | } | 1110 | } |
176 | 1111 | 1111 | ||
177 | 1112 | bool cac::createChannelRespAction ( | 1112 | bool cac::createChannelRespAction ( |
179 | 1113 | callbackManager & mgr, tcpiiu & iiu, // X aCC 431 | 1113 | callbackManager & mgr, tcpiiu & iiu, |
180 | 1114 | const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ ) | 1114 | const epicsTime &, const caHdrLargeArray & hdr, void * /* pMsgBody */ ) |
181 | 1115 | { | 1115 | { |
182 | 1116 | epicsGuard < epicsMutex > guard ( this->mutex ); | 1116 | epicsGuard < epicsMutex > guard ( this->mutex ); |
183 | @@ -1157,7 +1157,7 @@ | |||
184 | 1157 | } | 1157 | } |
185 | 1158 | 1158 | ||
186 | 1159 | void cac::disconnectChannel ( | 1159 | void cac::disconnectChannel ( |
188 | 1160 | epicsGuard < epicsMutex > & cbGuard, // X aCC 431 | 1160 | epicsGuard < epicsMutex > & cbGuard, |
189 | 1161 | epicsGuard < epicsMutex > & guard, nciu & chan ) | 1161 | epicsGuard < epicsMutex > & guard, nciu & chan ) |
190 | 1162 | { | 1162 | { |
191 | 1163 | guard.assertIdenticalMutex ( this->mutex ); | 1163 | guard.assertIdenticalMutex ( this->mutex ); |
192 | 1164 | 1164 | ||
193 | === modified file 'src/ca/client/cac.h' | |||
194 | --- src/ca/client/cac.h 2011-06-01 22:22:12 +0000 | |||
195 | +++ src/ca/client/cac.h 2012-04-12 17:46:27 +0000 | |||
196 | @@ -55,7 +55,7 @@ | |||
197 | 55 | // used to control access to cac's recycle routines which | 55 | // used to control access to cac's recycle routines which |
198 | 56 | // should only be indirectly invoked by CAC when its lock | 56 | // should only be indirectly invoked by CAC when its lock |
199 | 57 | // is applied | 57 | // is applied |
201 | 58 | class cacRecycle { // X aCC 655 | 58 | class cacRecycle { |
202 | 59 | public: | 59 | public: |
203 | 60 | virtual void recycleReadNotifyIO ( | 60 | virtual void recycleReadNotifyIO ( |
204 | 61 | epicsGuard < epicsMutex > &, netReadNotifyIO &io ) = 0; | 61 | epicsGuard < epicsMutex > &, netReadNotifyIO &io ) = 0; |
205 | 62 | 62 | ||
206 | === modified file 'src/ca/client/cacIO.h' | |||
207 | --- src/ca/client/cacIO.h 2009-02-11 00:50:28 +0000 | |||
208 | +++ src/ca/client/cacIO.h 2012-04-12 17:46:27 +0000 | |||
209 | @@ -69,7 +69,7 @@ | |||
210 | 69 | 69 | ||
211 | 70 | // 1) this should not be passing caerr.h status to the exception callback | 70 | // 1) this should not be passing caerr.h status to the exception callback |
212 | 71 | // 2) needless-to-say the data should be passed here using the new data access API | 71 | // 2) needless-to-say the data should be passed here using the new data access API |
214 | 72 | class epicsShareClass cacWriteNotify { // X aCC 655 | 72 | class epicsShareClass cacWriteNotify { |
215 | 73 | public: | 73 | public: |
216 | 74 | virtual ~cacWriteNotify () = 0; | 74 | virtual ~cacWriteNotify () = 0; |
217 | 75 | virtual void completion ( epicsGuard < epicsMutex > & ) = 0; | 75 | virtual void completion ( epicsGuard < epicsMutex > & ) = 0; |
218 | @@ -82,7 +82,7 @@ | |||
219 | 82 | 82 | ||
220 | 83 | // 1) this should not be passing caerr.h status to the exception callback | 83 | // 1) this should not be passing caerr.h status to the exception callback |
221 | 84 | // 2) needless-to-say the data should be passed here using the new data access API | 84 | // 2) needless-to-say the data should be passed here using the new data access API |
223 | 85 | class epicsShareClass cacReadNotify { // X aCC 655 | 85 | class epicsShareClass cacReadNotify { |
224 | 86 | public: | 86 | public: |
225 | 87 | virtual ~cacReadNotify () = 0; | 87 | virtual ~cacReadNotify () = 0; |
226 | 88 | virtual void completion ( | 88 | virtual void completion ( |
227 | @@ -97,7 +97,7 @@ | |||
228 | 97 | 97 | ||
229 | 98 | // 1) this should not be passing caerr.h status to the exception callback | 98 | // 1) this should not be passing caerr.h status to the exception callback |
230 | 99 | // 2) needless-to-say the data should be passed here using the new data access API | 99 | // 2) needless-to-say the data should be passed here using the new data access API |
232 | 100 | class epicsShareClass cacStateNotify { // X aCC 655 | 100 | class epicsShareClass cacStateNotify { |
233 | 101 | public: | 101 | public: |
234 | 102 | virtual ~cacStateNotify () = 0; | 102 | virtual ~cacStateNotify () = 0; |
235 | 103 | virtual void current ( | 103 | virtual void current ( |
236 | @@ -131,7 +131,7 @@ | |||
237 | 131 | bool f_operatorConfirmationRequest:1; | 131 | bool f_operatorConfirmationRequest:1; |
238 | 132 | }; | 132 | }; |
239 | 133 | 133 | ||
241 | 134 | class epicsShareClass cacChannelNotify { // X aCC 655 | 134 | class epicsShareClass cacChannelNotify { |
242 | 135 | public: | 135 | public: |
243 | 136 | virtual ~cacChannelNotify () = 0; | 136 | virtual ~cacChannelNotify () = 0; |
244 | 137 | virtual void connectNotify ( epicsGuard < epicsMutex > & ) = 0; | 137 | virtual void connectNotify ( epicsGuard < epicsMutex > & ) = 0; |
245 | @@ -258,7 +258,7 @@ | |||
246 | 258 | cacChannel & operator = ( const cacChannel & ); | 258 | cacChannel & operator = ( const cacChannel & ); |
247 | 259 | }; | 259 | }; |
248 | 260 | 260 | ||
250 | 261 | class epicsShareClass cacContext { // X aCC 655 | 261 | class epicsShareClass cacContext { |
251 | 262 | public: | 262 | public: |
252 | 263 | virtual ~cacContext (); | 263 | virtual ~cacContext (); |
253 | 264 | virtual cacChannel & createChannel ( | 264 | virtual cacChannel & createChannel ( |
254 | @@ -277,7 +277,7 @@ | |||
255 | 277 | epicsGuard < epicsMutex > &, unsigned level ) const = 0; | 277 | epicsGuard < epicsMutex > &, unsigned level ) const = 0; |
256 | 278 | }; | 278 | }; |
257 | 279 | 279 | ||
259 | 280 | class epicsShareClass cacContextNotify { // X aCC 655 | 280 | class epicsShareClass cacContextNotify { |
260 | 281 | public: | 281 | public: |
261 | 282 | virtual ~cacContextNotify () = 0; | 282 | virtual ~cacContextNotify () = 0; |
262 | 283 | virtual cacContext & createNetworkContext ( | 283 | virtual cacContext & createNetworkContext ( |
263 | @@ -297,7 +297,7 @@ | |||
264 | 297 | // **** Lock Hierarchy **** | 297 | // **** Lock Hierarchy **** |
265 | 298 | // callbackControl must be taken before mutualExclusion if both are held at | 298 | // callbackControl must be taken before mutualExclusion if both are held at |
266 | 299 | // the same time | 299 | // the same time |
268 | 300 | class epicsShareClass cacService { // X aCC 655 | 300 | class epicsShareClass cacService { |
269 | 301 | public: | 301 | public: |
270 | 302 | virtual ~cacService () = 0; | 302 | virtual ~cacService () = 0; |
271 | 303 | virtual cacContext & contextCreate ( | 303 | virtual cacContext & contextCreate ( |
272 | 304 | 304 | ||
273 | === modified file 'src/ca/client/casw.cpp' | |||
274 | --- src/ca/client/casw.cpp 2006-11-18 00:42:32 +0000 | |||
275 | +++ src/ca/client/casw.cpp 2012-04-12 17:46:27 +0000 | |||
276 | @@ -131,7 +131,7 @@ | |||
277 | 131 | } | 131 | } |
278 | 132 | 132 | ||
279 | 133 | osiSockIoctl_t yes = true; | 133 | osiSockIoctl_t yes = true; |
281 | 134 | status = socket_ioctl ( sock, FIONBIO, &yes ); // X aCC 392 | 134 | status = socket_ioctl ( sock, FIONBIO, &yes ); |
282 | 135 | if ( status < 0 ) { | 135 | if ( status < 0 ) { |
283 | 136 | char sockErrBuf[64]; | 136 | char sockErrBuf[64]; |
284 | 137 | epicsSocketConvertErrnoToString ( | 137 | epicsSocketConvertErrnoToString ( |
285 | @@ -166,7 +166,7 @@ | |||
286 | 166 | } | 166 | } |
287 | 167 | 167 | ||
288 | 168 | osiSockIoctl_t no = false; | 168 | osiSockIoctl_t no = false; |
290 | 169 | status = socket_ioctl ( sock, FIONBIO, &no ); // X aCC 392 | 169 | status = socket_ioctl ( sock, FIONBIO, &no ); |
291 | 170 | if ( status < 0 ) { | 170 | if ( status < 0 ) { |
292 | 171 | char sockErrBuf[64]; | 171 | char sockErrBuf[64]; |
293 | 172 | epicsSocketConvertErrnoToString ( | 172 | epicsSocketConvertErrnoToString ( |
294 | 173 | 173 | ||
295 | === modified file 'src/ca/client/comBuf.h' | |||
296 | --- src/ca/client/comBuf.h 2008-10-02 15:43:04 +0000 | |||
297 | +++ src/ca/client/comBuf.h 2012-04-12 17:46:27 +0000 | |||
298 | @@ -44,7 +44,7 @@ | |||
299 | 44 | virtual void release ( void * ) = 0; | 44 | virtual void release ( void * ) = 0; |
300 | 45 | }; | 45 | }; |
301 | 46 | 46 | ||
303 | 47 | class wireSendAdapter { // X aCC 655 | 47 | class wireSendAdapter { |
304 | 48 | public: | 48 | public: |
305 | 49 | virtual unsigned sendBytes ( const void * pBuf, | 49 | virtual unsigned sendBytes ( const void * pBuf, |
306 | 50 | unsigned nBytesInBuf, | 50 | unsigned nBytesInBuf, |
307 | @@ -65,7 +65,7 @@ | |||
308 | 65 | swioCircuitState circuitState; | 65 | swioCircuitState circuitState; |
309 | 66 | }; | 66 | }; |
310 | 67 | 67 | ||
312 | 68 | class wireRecvAdapter { // X aCC 655 | 68 | class wireRecvAdapter { |
313 | 69 | public: | 69 | public: |
314 | 70 | virtual void recvBytes ( void * pBuf, | 70 | virtual void recvBytes ( void * pBuf, |
315 | 71 | unsigned nBytesInBuf, statusWireIO & ) = 0; | 71 | unsigned nBytesInBuf, statusWireIO & ) = 0; |
316 | @@ -114,7 +114,6 @@ | |||
317 | 114 | unsigned nextWriteIndex; | 114 | unsigned nextWriteIndex; |
318 | 115 | unsigned nextReadIndex; | 115 | unsigned nextReadIndex; |
319 | 116 | epicsUInt8 buf [ comBufSize ]; | 116 | epicsUInt8 buf [ comBufSize ]; |
320 | 117 | void * operator new ( size_t size ); | ||
321 | 118 | void operator delete ( void * ); | 117 | void operator delete ( void * ); |
322 | 119 | template < class T > | 118 | template < class T > |
323 | 120 | bool push ( const T * ); // disabled | 119 | bool push ( const T * ); // disabled |
324 | 121 | 120 | ||
325 | === modified file 'src/ca/client/comQueRecv.cpp' | |||
326 | --- src/ca/client/comQueRecv.cpp 2009-07-07 23:47:38 +0000 | |||
327 | +++ src/ca/client/comQueRecv.cpp 2012-04-12 17:46:27 +0000 | |||
328 | @@ -155,7 +155,7 @@ | |||
329 | 155 | unsigned byte3 = this->popUInt8(); | 155 | unsigned byte3 = this->popUInt8(); |
330 | 156 | unsigned byte4 = this->popUInt8(); | 156 | unsigned byte4 = this->popUInt8(); |
331 | 157 | tmp = static_cast <epicsUInt32> | 157 | tmp = static_cast <epicsUInt32> |
333 | 158 | ( ( byte1 << 24u ) | ( byte2 << 16u ) | //X aCC 392 | 158 | ( ( byte1 << 24u ) | ( byte2 << 16u ) | |
334 | 159 | ( byte3 << 8u ) | byte4 ); | 159 | ( byte3 << 8u ) | byte4 ); |
335 | 160 | } | 160 | } |
336 | 161 | else { | 161 | else { |
337 | 162 | 162 | ||
338 | === modified file 'src/ca/client/comQueSend.cpp' | |||
339 | --- src/ca/client/comQueSend.cpp 2008-10-02 15:43:04 +0000 | |||
340 | +++ src/ca/client/comQueSend.cpp 2012-04-12 17:46:27 +0000 | |||
341 | @@ -368,7 +368,7 @@ | |||
342 | 368 | // the above checks verify that the total size | 368 | // the above checks verify that the total size |
343 | 369 | // is lest that 0xffffffff | 369 | // is lest that 0xffffffff |
344 | 370 | size = static_cast < ca_uint32_t > | 370 | size = static_cast < ca_uint32_t > |
346 | 371 | ( dbr_size_n ( dataType, nElem ) ); // X aCC 392 | 371 | ( dbr_size_n ( dataType, nElem ) ); |
347 | 372 | payloadSize = CA_MESSAGE_ALIGN ( size ); | 372 | payloadSize = CA_MESSAGE_ALIGN ( size ); |
348 | 373 | this->insertRequestHeader ( request, payloadSize, | 373 | this->insertRequestHeader ( request, payloadSize, |
349 | 374 | static_cast <ca_uint16_t> ( dataType ), | 374 | static_cast <ca_uint16_t> ( dataType ), |
350 | 375 | 375 | ||
351 | === modified file 'src/ca/client/disconnectGovernorTimer.cpp' | |||
352 | --- src/ca/client/disconnectGovernorTimer.cpp 2009-08-10 21:51:07 +0000 | |||
353 | +++ src/ca/client/disconnectGovernorTimer.cpp 2012-04-12 17:46:27 +0000 | |||
354 | @@ -65,7 +65,7 @@ | |||
355 | 65 | } | 65 | } |
356 | 66 | 66 | ||
357 | 67 | epicsTimerNotify::expireStatus disconnectGovernorTimer::expire ( | 67 | epicsTimerNotify::expireStatus disconnectGovernorTimer::expire ( |
359 | 68 | const epicsTime & /* currentTime */ ) // X aCC 361 | 68 | const epicsTime & /* currentTime */ ) |
360 | 69 | { | 69 | { |
361 | 70 | epicsGuard < epicsMutex > guard ( this->mutex ); | 70 | epicsGuard < epicsMutex > guard ( this->mutex ); |
362 | 71 | while ( nciu * pChan = chanList.get () ) { | 71 | while ( nciu * pChan = chanList.get () ) { |
363 | 72 | 72 | ||
364 | === modified file 'src/ca/client/disconnectGovernorTimer.h' | |||
365 | --- src/ca/client/disconnectGovernorTimer.h 2005-09-13 13:41:46 +0000 | |||
366 | +++ src/ca/client/disconnectGovernorTimer.h 2012-04-12 17:46:27 +0000 | |||
367 | @@ -43,7 +43,7 @@ | |||
368 | 43 | #include "caProto.h" | 43 | #include "caProto.h" |
369 | 44 | #include "netiiu.h" | 44 | #include "netiiu.h" |
370 | 45 | 45 | ||
372 | 46 | class disconnectGovernorNotify { // X aCC 655 | 46 | class disconnectGovernorNotify { |
373 | 47 | public: | 47 | public: |
374 | 48 | virtual ~disconnectGovernorNotify () = 0; | 48 | virtual ~disconnectGovernorNotify () = 0; |
375 | 49 | virtual void govExpireNotify ( | 49 | virtual void govExpireNotify ( |
376 | 50 | 50 | ||
377 | === modified file 'src/ca/client/getCallback.cpp' | |||
378 | --- src/ca/client/getCallback.cpp 2009-08-13 22:43:21 +0000 | |||
379 | +++ src/ca/client/getCallback.cpp 2012-04-12 17:46:27 +0000 | |||
380 | @@ -90,13 +90,6 @@ | |||
381 | 90 | } | 90 | } |
382 | 91 | } | 91 | } |
383 | 92 | 92 | ||
384 | 93 | void * getCallback::operator new ( size_t ) // X aCC 361 | ||
385 | 94 | { | ||
386 | 95 | // The HPUX compiler seems to require this even though no code | ||
387 | 96 | // calls it directly | ||
388 | 97 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
389 | 98 | } | ||
390 | 99 | |||
391 | 100 | void getCallback::operator delete ( void * ) | 93 | void getCallback::operator delete ( void * ) |
392 | 101 | { | 94 | { |
393 | 102 | // Visual C++ .net appears to require operator delete if | 95 | // Visual C++ .net appears to require operator delete if |
394 | 103 | 96 | ||
395 | === modified file 'src/ca/client/getCopy.cpp' | |||
396 | --- src/ca/client/getCopy.cpp 2009-08-13 22:46:47 +0000 | |||
397 | +++ src/ca/client/getCopy.cpp 2012-04-12 17:46:27 +0000 | |||
398 | @@ -105,13 +105,6 @@ | |||
399 | 105 | } | 105 | } |
400 | 106 | } | 106 | } |
401 | 107 | 107 | ||
402 | 108 | void * getCopy::operator new ( size_t ) // X aCC 361 | ||
403 | 109 | { | ||
404 | 110 | // The HPUX compiler seems to require this even though no code | ||
405 | 111 | // calls it directly | ||
406 | 112 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
407 | 113 | } | ||
408 | 114 | |||
409 | 115 | void getCopy::operator delete ( void * ) | 108 | void getCopy::operator delete ( void * ) |
410 | 116 | { | 109 | { |
411 | 117 | // Visual C++ .net appears to require operator delete if | 110 | // Visual C++ .net appears to require operator delete if |
412 | 118 | 111 | ||
413 | === modified file 'src/ca/client/iocinf.cpp' | |||
414 | --- src/ca/client/iocinf.cpp 2010-08-10 21:05:46 +0000 | |||
415 | +++ src/ca/client/iocinf.cpp 2012-04-12 17:46:27 +0000 | |||
416 | @@ -133,7 +133,7 @@ | |||
417 | 133 | 133 | ||
418 | 134 | if ( pNode->addr.sa.sa_family == AF_INET ) { | 134 | if ( pNode->addr.sa.sa_family == AF_INET ) { |
419 | 135 | 135 | ||
421 | 136 | pTmpNode = (osiSockAddrNode *) ellFirst (pDestList); // X aCC 749 | 136 | pTmpNode = (osiSockAddrNode *) ellFirst (pDestList); |
422 | 137 | while ( pTmpNode ) { | 137 | while ( pTmpNode ) { |
423 | 138 | if (pTmpNode->addr.sa.sa_family == AF_INET) { | 138 | if (pTmpNode->addr.sa.sa_family == AF_INET) { |
424 | 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 && |
425 | @@ -149,7 +149,7 @@ | |||
426 | 149 | break; | 149 | break; |
427 | 150 | } | 150 | } |
428 | 151 | } | 151 | } |
430 | 152 | pTmpNode = (osiSockAddrNode *) ellNext (&pTmpNode->node); // X aCC 749 | 152 | pTmpNode = (osiSockAddrNode *) ellNext (&pTmpNode->node); |
431 | 153 | } | 153 | } |
432 | 154 | if (pNode) { | 154 | if (pNode) { |
433 | 155 | ellAdd (pDestList, &pNode->node); | 155 | ellAdd (pDestList, &pNode->node); |
434 | @@ -168,12 +168,12 @@ | |||
435 | 168 | { | 168 | { |
436 | 169 | osiSockAddrNode *pNode; | 169 | osiSockAddrNode *pNode; |
437 | 170 | 170 | ||
439 | 171 | pNode = ( osiSockAddrNode * ) ellFirst ( pList ); // X aCC 749 | 171 | pNode = ( osiSockAddrNode * ) ellFirst ( pList ); |
440 | 172 | while ( pNode ) { | 172 | while ( pNode ) { |
441 | 173 | if ( pNode->addr.sa.sa_family == AF_INET ) { | 173 | if ( pNode->addr.sa.sa_family == AF_INET ) { |
442 | 174 | pNode->addr.ia.sin_port = htons ( port ); | 174 | pNode->addr.ia.sin_port = htons ( port ); |
443 | 175 | } | 175 | } |
445 | 176 | pNode = ( osiSockAddrNode * ) ellNext ( &pNode->node ); // X aCC 749 | 176 | pNode = ( osiSockAddrNode * ) ellNext ( &pNode->node ); |
446 | 177 | } | 177 | } |
447 | 178 | } | 178 | } |
448 | 179 | 179 | ||
449 | @@ -192,9 +192,9 @@ | |||
450 | 192 | /* | 192 | /* |
451 | 193 | * dont load the list twice | 193 | * dont load the list twice |
452 | 194 | */ | 194 | */ |
454 | 195 | assert ( ellCount (pList) == 0 ); // X aCC 392 | 195 | assert ( ellCount (pList) == 0 ); |
455 | 196 | 196 | ||
457 | 197 | ellInit ( &tmpList ); // X aCC 392 | 197 | ellInit ( &tmpList ); |
458 | 198 | 198 | ||
459 | 199 | /* | 199 | /* |
460 | 200 | * Check to see if the user has disabled | 200 | * Check to see if the user has disabled |
461 | @@ -217,12 +217,12 @@ | |||
462 | 217 | if (yes) { | 217 | if (yes) { |
463 | 218 | ELLLIST bcastList; | 218 | ELLLIST bcastList; |
464 | 219 | osiSockAddr addr; | 219 | osiSockAddr addr; |
466 | 220 | ellInit ( &bcastList ); // X aCC 392 | 220 | ellInit ( &bcastList ); |
467 | 221 | addr.ia.sin_family = AF_UNSPEC; | 221 | addr.ia.sin_family = AF_UNSPEC; |
468 | 222 | osiSockDiscoverBroadcastAddresses ( &bcastList, sock, &addr ); | 222 | osiSockDiscoverBroadcastAddresses ( &bcastList, sock, &addr ); |
469 | 223 | forcePort ( &bcastList, port ); | 223 | forcePort ( &bcastList, port ); |
470 | 224 | removeDuplicateAddresses ( &tmpList, &bcastList, 1 ); | 224 | removeDuplicateAddresses ( &tmpList, &bcastList, 1 ); |
472 | 225 | if ( ellCount ( &tmpList ) == 0 ) { // X aCC 392 | 225 | if ( ellCount ( &tmpList ) == 0 ) { |
473 | 226 | osiSockAddrNode *pNewNode; | 226 | osiSockAddrNode *pNewNode; |
474 | 227 | pNewNode = (osiSockAddrNode *) calloc ( 1, sizeof (*pNewNode) ); | 227 | pNewNode = (osiSockAddrNode *) calloc ( 1, sizeof (*pNewNode) ); |
475 | 228 | if ( pNewNode ) { | 228 | if ( pNewNode ) { |
476 | @@ -254,11 +254,11 @@ | |||
477 | 254 | osiSockAddrNode *pNode; | 254 | osiSockAddrNode *pNode; |
478 | 255 | 255 | ||
479 | 256 | ::printf ( "Channel Access Address List\n" ); | 256 | ::printf ( "Channel Access Address List\n" ); |
481 | 257 | pNode = (osiSockAddrNode *) ellFirst ( pList ); // X aCC 749 | 257 | pNode = (osiSockAddrNode *) ellFirst ( pList ); |
482 | 258 | while (pNode) { | 258 | while (pNode) { |
483 | 259 | char buf[64]; | 259 | char buf[64]; |
484 | 260 | ipAddrToA ( &pNode->addr.ia, buf, sizeof ( buf ) ); | 260 | ipAddrToA ( &pNode->addr.ia, buf, sizeof ( buf ) ); |
485 | 261 | ::printf ( "%s\n", buf ); | 261 | ::printf ( "%s\n", buf ); |
487 | 262 | pNode = (osiSockAddrNode *) ellNext ( &pNode->node ); // X aCC 749 | 262 | pNode = (osiSockAddrNode *) ellNext ( &pNode->node ); |
488 | 263 | } | 263 | } |
489 | 264 | } | 264 | } |
490 | 265 | 265 | ||
491 | === modified file 'src/ca/client/msgForMultiplyDefinedPV.cpp' | |||
492 | --- src/ca/client/msgForMultiplyDefinedPV.cpp 2004-10-08 15:44:44 +0000 | |||
493 | +++ src/ca/client/msgForMultiplyDefinedPV.cpp 2012-04-12 17:46:27 +0000 | |||
494 | @@ -73,13 +73,6 @@ | |||
495 | 73 | } | 73 | } |
496 | 74 | #endif | 74 | #endif |
497 | 75 | 75 | ||
498 | 76 | void * msgForMultiplyDefinedPV::operator new ( size_t ) // X aCC 361 | ||
499 | 77 | { | ||
500 | 78 | // The HPUX compiler seems to require this even though no code | ||
501 | 79 | // calls it directly | ||
502 | 80 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
503 | 81 | } | ||
504 | 82 | |||
505 | 83 | void msgForMultiplyDefinedPV::operator delete ( void * ) | 76 | void msgForMultiplyDefinedPV::operator delete ( void * ) |
506 | 84 | { | 77 | { |
507 | 85 | // Visual C++ .net appears to require operator delete if | 78 | // Visual C++ .net appears to require operator delete if |
508 | 86 | 79 | ||
509 | === modified file 'src/ca/client/msgForMultiplyDefinedPV.h' | |||
510 | --- src/ca/client/msgForMultiplyDefinedPV.h 2004-10-08 15:39:09 +0000 | |||
511 | +++ src/ca/client/msgForMultiplyDefinedPV.h 2012-04-12 17:46:27 +0000 | |||
512 | @@ -39,7 +39,7 @@ | |||
513 | 39 | # define epicsExportSharedSymbols | 39 | # define epicsExportSharedSymbols |
514 | 40 | #endif | 40 | #endif |
515 | 41 | 41 | ||
517 | 42 | class callbackForMultiplyDefinedPV { // X aCC 655 | 42 | class callbackForMultiplyDefinedPV { |
518 | 43 | public: | 43 | public: |
519 | 44 | virtual ~callbackForMultiplyDefinedPV () = 0; | 44 | virtual ~callbackForMultiplyDefinedPV () = 0; |
520 | 45 | virtual void pvMultiplyDefinedNotify ( | 45 | virtual void pvMultiplyDefinedNotify ( |
521 | @@ -64,7 +64,6 @@ | |||
522 | 64 | void transactionComplete ( const char * pHostName ); | 64 | void transactionComplete ( const char * pHostName ); |
523 | 65 | msgForMultiplyDefinedPV ( const msgForMultiplyDefinedPV & ); | 65 | msgForMultiplyDefinedPV ( const msgForMultiplyDefinedPV & ); |
524 | 66 | msgForMultiplyDefinedPV & operator = ( const msgForMultiplyDefinedPV & ); | 66 | msgForMultiplyDefinedPV & operator = ( const msgForMultiplyDefinedPV & ); |
525 | 67 | void * operator new ( size_t size ); | ||
526 | 68 | void operator delete ( void * ); | 67 | void operator delete ( void * ); |
527 | 69 | }; | 68 | }; |
528 | 70 | 69 | ||
529 | 71 | 70 | ||
530 | === modified file 'src/ca/client/nciu.cpp' | |||
531 | --- src/ca/client/nciu.cpp 2010-08-11 21:22:54 +0000 | |||
532 | +++ src/ca/client/nciu.cpp 2012-04-12 17:46:27 +0000 | |||
533 | @@ -94,13 +94,6 @@ | |||
534 | 94 | this->cacCtx.destroyChannel ( guard, *this ); | 94 | this->cacCtx.destroyChannel ( guard, *this ); |
535 | 95 | } | 95 | } |
536 | 96 | 96 | ||
537 | 97 | void * nciu::operator new ( size_t ) // X aCC 361 | ||
538 | 98 | { | ||
539 | 99 | // The HPUX compiler seems to require this even though no code | ||
540 | 100 | // calls it directly | ||
541 | 101 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
542 | 102 | } | ||
543 | 103 | |||
544 | 104 | void nciu::operator delete ( void * ) | 97 | void nciu::operator delete ( void * ) |
545 | 105 | { | 98 | { |
546 | 106 | // Visual C++ .net appears to require operator delete if | 99 | // Visual C++ .net appears to require operator delete if |
547 | 107 | 100 | ||
548 | === modified file 'src/ca/client/nciu.h' | |||
549 | --- src/ca/client/nciu.h 2010-08-11 22:37:56 +0000 | |||
550 | +++ src/ca/client/nciu.h 2012-04-12 17:46:27 +0000 | |||
551 | @@ -121,7 +121,7 @@ | |||
552 | 121 | friend class disconnectGovernorTimer; | 121 | friend class disconnectGovernorTimer; |
553 | 122 | }; | 122 | }; |
554 | 123 | 123 | ||
556 | 124 | class privateInterfaceForIO { // X aCC 655 | 124 | class privateInterfaceForIO { |
557 | 125 | public: | 125 | public: |
558 | 126 | virtual void ioCompletionNotify ( | 126 | virtual void ioCompletionNotify ( |
559 | 127 | epicsGuard < epicsMutex > &, class baseNMIU & ) = 0; | 127 | epicsGuard < epicsMutex > &, class baseNMIU & ) = 0; |
560 | @@ -270,7 +270,6 @@ | |||
561 | 270 | epicsGuard < epicsMutex > & guard ) const throw (); | 270 | epicsGuard < epicsMutex > & guard ) const throw (); |
562 | 271 | nciu ( const nciu & ); | 271 | nciu ( const nciu & ); |
563 | 272 | nciu & operator = ( const nciu & ); | 272 | nciu & operator = ( const nciu & ); |
564 | 273 | void * operator new ( size_t ); | ||
565 | 274 | void operator delete ( void * ); | 273 | void operator delete ( void * ); |
566 | 275 | }; | 274 | }; |
567 | 276 | 275 | ||
568 | 277 | 276 | ||
569 | === modified file 'src/ca/client/netIO.h' | |||
570 | --- src/ca/client/netIO.h 2010-08-11 21:22:54 +0000 | |||
571 | +++ src/ca/client/netIO.h 2012-04-12 17:46:27 +0000 | |||
572 | @@ -42,7 +42,7 @@ | |||
573 | 42 | 42 | ||
574 | 43 | class privateInterfaceForIO; | 43 | class privateInterfaceForIO; |
575 | 44 | 44 | ||
577 | 45 | class baseNMIU : public tsDLNode < baseNMIU >, // X aCC 655 | 45 | class baseNMIU : public tsDLNode < baseNMIU >, |
578 | 46 | public chronIntIdRes < baseNMIU > { | 46 | public chronIntIdRes < baseNMIU > { |
579 | 47 | public: | 47 | public: |
580 | 48 | virtual void destroy ( | 48 | virtual void destroy ( |
581 | @@ -106,7 +106,6 @@ | |||
582 | 106 | const unsigned mask; | 106 | const unsigned mask; |
583 | 107 | bool subscribed; | 107 | bool subscribed; |
584 | 108 | class netSubscription * isSubscription (); | 108 | class netSubscription * isSubscription (); |
585 | 109 | void * operator new ( size_t ); | ||
586 | 110 | void operator delete ( void * ); | 109 | void operator delete ( void * ); |
587 | 111 | void * operator new ( size_t, | 110 | void * operator new ( size_t, |
588 | 112 | tsFreeList < class netSubscription, 1024, epicsMutexNOOP > & ); | 111 | tsFreeList < class netSubscription, 1024, epicsMutexNOOP > & ); |
589 | @@ -147,7 +146,6 @@ | |||
590 | 147 | private: | 146 | private: |
591 | 148 | cacReadNotify & notify; | 147 | cacReadNotify & notify; |
592 | 149 | class privateInterfaceForIO & privateChanForIO; | 148 | class privateInterfaceForIO & privateChanForIO; |
593 | 150 | void * operator new ( size_t ); | ||
594 | 151 | void operator delete ( void * ); | 149 | void operator delete ( void * ); |
595 | 152 | void * operator new ( size_t, | 150 | void * operator new ( size_t, |
596 | 153 | tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & ); | 151 | tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & ); |
597 | @@ -190,7 +188,6 @@ | |||
598 | 190 | private: | 188 | private: |
599 | 191 | cacWriteNotify & notify; | 189 | cacWriteNotify & notify; |
600 | 192 | privateInterfaceForIO & privateChanForIO; | 190 | privateInterfaceForIO & privateChanForIO; |
601 | 193 | void * operator new ( size_t ); | ||
602 | 194 | void operator delete ( void * ); | 191 | void operator delete ( void * ); |
603 | 195 | void * operator new ( size_t, | 192 | void * operator new ( size_t, |
604 | 196 | tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & ); | 193 | tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & ); |
605 | @@ -237,12 +234,12 @@ | |||
606 | 237 | class privateInterfaceForIO & chan, unsigned type, arrayElementCount count, | 234 | class privateInterfaceForIO & chan, unsigned type, arrayElementCount count, |
607 | 238 | unsigned mask, cacStateNotify ¬ify ) | 235 | unsigned mask, cacStateNotify ¬ify ) |
608 | 239 | { | 236 | { |
610 | 240 | return new ( freeList ) netSubscription ( chan, type, // X aCC 930 | 237 | return new ( freeList ) netSubscription ( chan, type, |
611 | 241 | count, mask, notify ); | 238 | count, mask, notify ); |
612 | 242 | } | 239 | } |
613 | 243 | 240 | ||
614 | 244 | inline arrayElementCount netSubscription::getCount ( | 241 | inline arrayElementCount netSubscription::getCount ( |
616 | 245 | epicsGuard < epicsMutex > & guard, bool allow_zero ) const // X aCC 361 | 242 | epicsGuard < epicsMutex > & guard, bool allow_zero ) const |
617 | 246 | { | 243 | { |
618 | 247 | //guard.assertIdenticalMutex ( this->mutex ); | 244 | //guard.assertIdenticalMutex ( this->mutex ); |
619 | 248 | arrayElementCount nativeCount = this->privateChanForIO.nativeElementCount ( guard ); | 245 | arrayElementCount nativeCount = this->privateChanForIO.nativeElementCount ( guard ); |
620 | @@ -268,7 +265,7 @@ | |||
621 | 268 | tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & freeList, | 265 | tsFreeList < class netReadNotifyIO, 1024, epicsMutexNOOP > & freeList, |
622 | 269 | privateInterfaceForIO & ioComplNotifIntf, cacReadNotify & notify ) | 266 | privateInterfaceForIO & ioComplNotifIntf, cacReadNotify & notify ) |
623 | 270 | { | 267 | { |
625 | 271 | return new ( freeList ) netReadNotifyIO ( ioComplNotifIntf, notify ); // X aCC 930 | 268 | return new ( freeList ) netReadNotifyIO ( ioComplNotifIntf, notify ); |
626 | 272 | } | 269 | } |
627 | 273 | 270 | ||
628 | 274 | inline void * netReadNotifyIO::operator new ( size_t size, | 271 | inline void * netReadNotifyIO::operator new ( size_t size, |
629 | @@ -289,7 +286,7 @@ | |||
630 | 289 | tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & freeList, | 286 | tsFreeList < class netWriteNotifyIO, 1024, epicsMutexNOOP > & freeList, |
631 | 290 | privateInterfaceForIO & ioComplNotifyIntf, cacWriteNotify & notify ) | 287 | privateInterfaceForIO & ioComplNotifyIntf, cacWriteNotify & notify ) |
632 | 291 | { | 288 | { |
634 | 292 | return new ( freeList ) netWriteNotifyIO ( ioComplNotifyIntf, notify ); // X aCC 930 | 289 | return new ( freeList ) netWriteNotifyIO ( ioComplNotifyIntf, notify ); |
635 | 293 | } | 290 | } |
636 | 294 | 291 | ||
637 | 295 | inline void * netWriteNotifyIO::operator new ( size_t size, | 292 | inline void * netWriteNotifyIO::operator new ( size_t size, |
638 | 296 | 293 | ||
639 | === modified file 'src/ca/client/netReadNotifyIO.cpp' | |||
640 | --- src/ca/client/netReadNotifyIO.cpp 2004-10-08 15:44:44 +0000 | |||
641 | +++ src/ca/client/netReadNotifyIO.cpp 2012-04-12 17:46:27 +0000 | |||
642 | @@ -119,13 +119,6 @@ | |||
643 | 119 | { | 119 | { |
644 | 120 | } | 120 | } |
645 | 121 | 121 | ||
646 | 122 | void * netReadNotifyIO::operator new ( size_t ) // X aCC 361 | ||
647 | 123 | { | ||
648 | 124 | // The HPUX compiler seems to require this even though no code | ||
649 | 125 | // calls it directly | ||
650 | 126 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
651 | 127 | } | ||
652 | 128 | |||
653 | 129 | void netReadNotifyIO::operator delete ( void * ) | 122 | void netReadNotifyIO::operator delete ( void * ) |
654 | 130 | { | 123 | { |
655 | 131 | // Visual C++ .net appears to require operator delete if | 124 | // Visual C++ .net appears to require operator delete if |
656 | 132 | 125 | ||
657 | === modified file 'src/ca/client/netSubscription.cpp' | |||
658 | --- src/ca/client/netSubscription.cpp 2009-07-08 21:43:38 +0000 | |||
659 | +++ src/ca/client/netSubscription.cpp 2012-04-12 17:46:27 +0000 | |||
660 | @@ -170,13 +170,6 @@ | |||
661 | 170 | guard, chan, *this ); | 170 | guard, chan, *this ); |
662 | 171 | } | 171 | } |
663 | 172 | 172 | ||
664 | 173 | void * netSubscription::operator new ( size_t ) // X aCC 361 | ||
665 | 174 | { | ||
666 | 175 | // The HPUX compiler seems to require this even though no code | ||
667 | 176 | // calls it directly | ||
668 | 177 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
669 | 178 | } | ||
670 | 179 | |||
671 | 180 | void netSubscription::operator delete ( void * ) | 173 | void netSubscription::operator delete ( void * ) |
672 | 181 | { | 174 | { |
673 | 182 | // Visual C++ .net appears to require operator delete if | 175 | // Visual C++ .net appears to require operator delete if |
674 | 183 | 176 | ||
675 | === modified file 'src/ca/client/netWriteNotifyIO.cpp' | |||
676 | --- src/ca/client/netWriteNotifyIO.cpp 2009-07-08 21:43:38 +0000 | |||
677 | +++ src/ca/client/netWriteNotifyIO.cpp 2012-04-12 17:46:27 +0000 | |||
678 | @@ -117,14 +117,6 @@ | |||
679 | 117 | { | 117 | { |
680 | 118 | } | 118 | } |
681 | 119 | 119 | ||
682 | 120 | void * netWriteNotifyIO::operator new ( size_t ) // X aCC 361 | ||
683 | 121 | { | ||
684 | 122 | // The HPUX compiler seems to require this even though no code | ||
685 | 123 | // calls it directly | ||
686 | 124 | throw std::logic_error ( | ||
687 | 125 | "why is the compiler calling private operator new" ); | ||
688 | 126 | } | ||
689 | 127 | |||
690 | 128 | void netWriteNotifyIO::operator delete ( void * ) | 120 | void netWriteNotifyIO::operator delete ( void * ) |
691 | 129 | { | 121 | { |
692 | 130 | // Visual C++ .net appears to require operator delete if | 122 | // Visual C++ .net appears to require operator delete if |
693 | 131 | 123 | ||
694 | === modified file 'src/ca/client/netiiu.h' | |||
695 | --- src/ca/client/netiiu.h 2007-01-11 21:43:40 +0000 | |||
696 | +++ src/ca/client/netiiu.h 2012-04-12 17:46:27 +0000 | |||
697 | @@ -35,7 +35,7 @@ | |||
698 | 35 | class cac; | 35 | class cac; |
699 | 36 | class nciu; | 36 | class nciu; |
700 | 37 | 37 | ||
702 | 38 | class netiiu { // X aCC 655 | 38 | class netiiu { |
703 | 39 | public: | 39 | public: |
704 | 40 | virtual ~netiiu () = 0; | 40 | virtual ~netiiu () = 0; |
705 | 41 | virtual unsigned getHostName ( | 41 | virtual unsigned getHostName ( |
706 | 42 | 42 | ||
707 | === modified file 'src/ca/client/oldAccess.h' | |||
708 | --- src/ca/client/oldAccess.h 2009-08-21 00:53:55 +0000 | |||
709 | +++ src/ca/client/oldAccess.h 2012-04-12 17:46:27 +0000 | |||
710 | @@ -162,7 +162,6 @@ | |||
711 | 162 | unsigned type, arrayElementCount count ); | 162 | unsigned type, arrayElementCount count ); |
712 | 163 | oldChannelNotify ( const oldChannelNotify & ); | 163 | oldChannelNotify ( const oldChannelNotify & ); |
713 | 164 | oldChannelNotify & operator = ( const oldChannelNotify & ); | 164 | oldChannelNotify & operator = ( const oldChannelNotify & ); |
714 | 165 | void * operator new ( size_t size ); | ||
715 | 166 | void operator delete ( void * ); | 165 | void operator delete ( void * ); |
716 | 167 | }; | 166 | }; |
717 | 168 | 167 | ||
718 | @@ -195,7 +194,6 @@ | |||
719 | 195 | const char *pContext, unsigned type, arrayElementCount count ); | 194 | const char *pContext, unsigned type, arrayElementCount count ); |
720 | 196 | getCopy ( const getCopy & ); | 195 | getCopy ( const getCopy & ); |
721 | 197 | getCopy & operator = ( const getCopy & ); | 196 | getCopy & operator = ( const getCopy & ); |
722 | 198 | void * operator new ( size_t size ); | ||
723 | 199 | void operator delete ( void * ); | 197 | void operator delete ( void * ); |
724 | 200 | }; | 198 | }; |
725 | 201 | 199 | ||
726 | @@ -221,7 +219,6 @@ | |||
727 | 221 | const char * pContext, unsigned type, arrayElementCount count ); | 219 | const char * pContext, unsigned type, arrayElementCount count ); |
728 | 222 | getCallback ( const getCallback & ); | 220 | getCallback ( const getCallback & ); |
729 | 223 | getCallback & operator = ( const getCallback & ); | 221 | getCallback & operator = ( const getCallback & ); |
730 | 224 | void * operator new ( size_t size ); | ||
731 | 225 | void operator delete ( void * ); | 222 | void operator delete ( void * ); |
732 | 226 | }; | 223 | }; |
733 | 227 | 224 | ||
734 | @@ -245,7 +242,6 @@ | |||
735 | 245 | unsigned type, arrayElementCount count ); | 242 | unsigned type, arrayElementCount count ); |
736 | 246 | putCallback ( const putCallback & ); | 243 | putCallback ( const putCallback & ); |
737 | 247 | putCallback & operator = ( const putCallback & ); | 244 | putCallback & operator = ( const putCallback & ); |
738 | 248 | void * operator new ( size_t size ); | ||
739 | 249 | void operator delete ( void * ); | 245 | void operator delete ( void * ); |
740 | 250 | }; | 246 | }; |
741 | 251 | 247 | ||
742 | @@ -278,7 +274,6 @@ | |||
743 | 278 | const char *pContext, unsigned type, arrayElementCount count ); | 274 | const char *pContext, unsigned type, arrayElementCount count ); |
744 | 279 | oldSubscription ( const oldSubscription & ); | 275 | oldSubscription ( const oldSubscription & ); |
745 | 280 | oldSubscription & operator = ( const oldSubscription & ); | 276 | oldSubscription & operator = ( const oldSubscription & ); |
746 | 281 | void * operator new ( size_t size ); | ||
747 | 282 | void operator delete ( void * ); | 277 | void operator delete ( void * ); |
748 | 283 | }; | 278 | }; |
749 | 284 | 279 | ||
750 | 285 | 280 | ||
751 | === modified file 'src/ca/client/oldChannelNotify.cpp' | |||
752 | --- src/ca/client/oldChannelNotify.cpp 2010-08-11 21:22:54 +0000 | |||
753 | +++ src/ca/client/oldChannelNotify.cpp 2012-04-12 17:46:27 +0000 | |||
754 | @@ -159,13 +159,6 @@ | |||
755 | 159 | __FILE__, __LINE__, *this, type, count, CA_OP_PUT ); | 159 | __FILE__, __LINE__, *this, type, count, CA_OP_PUT ); |
756 | 160 | } | 160 | } |
757 | 161 | 161 | ||
758 | 162 | void * oldChannelNotify::operator new ( size_t ) // X aCC 361 | ||
759 | 163 | { | ||
760 | 164 | // The HPUX compiler seems to require this even though no code | ||
761 | 165 | // calls it directly | ||
762 | 166 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
763 | 167 | } | ||
764 | 168 | |||
765 | 169 | void oldChannelNotify::operator delete ( void * ) | 162 | void oldChannelNotify::operator delete ( void * ) |
766 | 170 | { | 163 | { |
767 | 171 | // Visual C++ .net appears to require operator delete if | 164 | // Visual C++ .net appears to require operator delete if |
768 | @@ -638,7 +631,7 @@ | |||
769 | 638 | /* | 631 | /* |
770 | 639 | * ca_state () | 632 | * ca_state () |
771 | 640 | */ | 633 | */ |
773 | 641 | enum channel_state epicsShareAPI ca_state ( chid pChan ) // X aCC 361 | 634 | enum channel_state epicsShareAPI ca_state ( chid pChan ) |
774 | 642 | { | 635 | { |
775 | 643 | epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () ); | 636 | epicsGuard < epicsMutex > guard ( pChan->cacCtx.mutexRef () ); |
776 | 644 | if ( pChan->io.connected ( guard ) ) { | 637 | if ( pChan->io.connected ( guard ) ) { |
777 | 645 | 638 | ||
778 | === modified file 'src/ca/client/putCallback.cpp' | |||
779 | --- src/ca/client/putCallback.cpp 2009-08-13 22:44:30 +0000 | |||
780 | +++ src/ca/client/putCallback.cpp 2012-04-12 17:46:27 +0000 | |||
781 | @@ -90,13 +90,6 @@ | |||
782 | 90 | } | 90 | } |
783 | 91 | } | 91 | } |
784 | 92 | 92 | ||
785 | 93 | void * putCallback::operator new ( size_t ) // X aCC 361 | ||
786 | 94 | { | ||
787 | 95 | // The HPUX compiler seems to require this even though no code | ||
788 | 96 | // calls it directly | ||
789 | 97 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
790 | 98 | } | ||
791 | 99 | |||
792 | 100 | void putCallback::operator delete ( void * ) | 93 | void putCallback::operator delete ( void * ) |
793 | 101 | { | 94 | { |
794 | 102 | // Visual C++ .net appears to require operator delete if | 95 | // Visual C++ .net appears to require operator delete if |
795 | 103 | 96 | ||
796 | === modified file 'src/ca/client/repeater.cpp' | |||
797 | --- src/ca/client/repeater.cpp 2009-08-24 17:03:17 +0000 | |||
798 | +++ src/ca/client/repeater.cpp 2012-04-12 17:46:27 +0000 | |||
799 | @@ -178,7 +178,7 @@ | |||
800 | 178 | return true; | 178 | return true; |
801 | 179 | } | 179 | } |
802 | 180 | 180 | ||
804 | 181 | bool repeaterClient::sendConfirm () // X aCC 361 | 181 | bool repeaterClient::sendConfirm () |
805 | 182 | { | 182 | { |
806 | 183 | int status; | 183 | int status; |
807 | 184 | 184 | ||
808 | @@ -204,7 +204,7 @@ | |||
809 | 204 | } | 204 | } |
810 | 205 | } | 205 | } |
811 | 206 | 206 | ||
813 | 207 | bool repeaterClient::sendMessage ( const void *pBuf, unsigned bufSize ) // X aCC 361 | 207 | bool repeaterClient::sendMessage ( const void *pBuf, unsigned bufSize ) |
814 | 208 | { | 208 | { |
815 | 209 | int status; | 209 | int status; |
816 | 210 | 210 | ||
817 | @@ -245,13 +245,6 @@ | |||
818 | 245 | #endif | 245 | #endif |
819 | 246 | } | 246 | } |
820 | 247 | 247 | ||
821 | 248 | void * repeaterClient::operator new ( size_t ) // X aCC 361 | ||
822 | 249 | { | ||
823 | 250 | // The HPUX compiler seems to require this even though no code | ||
824 | 251 | // calls it directly | ||
825 | 252 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
826 | 253 | } | ||
827 | 254 | |||
828 | 255 | void repeaterClient::operator delete ( void * ) | 248 | void repeaterClient::operator delete ( void * ) |
829 | 256 | { | 249 | { |
830 | 257 | // Visual C++ .net appears to require operator delete if | 250 | // Visual C++ .net appears to require operator delete if |
831 | @@ -304,7 +297,7 @@ | |||
832 | 304 | return false; | 297 | return false; |
833 | 305 | } | 298 | } |
834 | 306 | 299 | ||
836 | 307 | bool repeaterClient::verify () // X aCC 361 | 300 | bool repeaterClient::verify () |
837 | 308 | { | 301 | { |
838 | 309 | SOCKET tmpSock; | 302 | SOCKET tmpSock; |
839 | 310 | bool success = makeSocket ( this->port (), false, & tmpSock ); | 303 | bool success = makeSocket ( this->port (), false, & tmpSock ); |
840 | 311 | 304 | ||
841 | === modified file 'src/ca/client/repeaterClient.h' | |||
842 | --- src/ca/client/repeaterClient.h 2004-10-04 18:55:40 +0000 | |||
843 | +++ src/ca/client/repeaterClient.h 2012-04-12 17:46:27 +0000 | |||
844 | @@ -64,7 +64,6 @@ | |||
845 | 64 | osiSockAddr from; | 64 | osiSockAddr from; |
846 | 65 | SOCKET sock; | 65 | SOCKET sock; |
847 | 66 | unsigned short port () const; | 66 | unsigned short port () const; |
848 | 67 | void * operator new ( size_t size ); | ||
849 | 68 | void operator delete ( void * ); | 67 | void operator delete ( void * ); |
850 | 69 | }; | 68 | }; |
851 | 70 | 69 | ||
852 | 71 | 70 | ||
853 | === modified file 'src/ca/client/repeaterSubscribeTimer.cpp' | |||
854 | --- src/ca/client/repeaterSubscribeTimer.cpp 2007-08-23 17:46:28 +0000 | |||
855 | +++ src/ca/client/repeaterSubscribeTimer.cpp 2012-04-12 17:46:27 +0000 | |||
856 | @@ -64,7 +64,7 @@ | |||
857 | 64 | } | 64 | } |
858 | 65 | 65 | ||
859 | 66 | epicsTimerNotify::expireStatus repeaterSubscribeTimer:: | 66 | epicsTimerNotify::expireStatus repeaterSubscribeTimer:: |
861 | 67 | expire ( const epicsTime & /* currentTime */ ) // X aCC 361 | 67 | expire ( const epicsTime & /* currentTime */ ) |
862 | 68 | { | 68 | { |
863 | 69 | static const unsigned nTriesToMsg = 50; | 69 | static const unsigned nTriesToMsg = 50; |
864 | 70 | if ( this->attempts > nTriesToMsg && ! this->once ) { | 70 | if ( this->attempts > nTriesToMsg && ! this->once ) { |
865 | 71 | 71 | ||
866 | === modified file 'src/ca/client/repeaterSubscribeTimer.h' | |||
867 | --- src/ca/client/repeaterSubscribeTimer.h 2010-11-04 16:19:54 +0000 | |||
868 | +++ src/ca/client/repeaterSubscribeTimer.h 2012-04-12 17:46:27 +0000 | |||
869 | @@ -43,7 +43,7 @@ | |||
870 | 43 | class epicsMutex; | 43 | class epicsMutex; |
871 | 44 | class cacContextNotify; | 44 | class cacContextNotify; |
872 | 45 | 45 | ||
874 | 46 | class repeaterTimerNotify { // X aCC 655 | 46 | class repeaterTimerNotify { |
875 | 47 | public: | 47 | public: |
876 | 48 | virtual ~repeaterTimerNotify () = 0; | 48 | virtual ~repeaterTimerNotify () = 0; |
877 | 49 | virtual void repeaterRegistrationMessage ( | 49 | virtual void repeaterRegistrationMessage ( |
878 | 50 | 50 | ||
879 | === modified file 'src/ca/client/searchTimer.cpp' | |||
880 | --- src/ca/client/searchTimer.cpp 2009-08-10 21:51:07 +0000 | |||
881 | +++ src/ca/client/searchTimer.cpp 2012-04-12 17:46:27 +0000 | |||
882 | @@ -124,7 +124,7 @@ | |||
883 | 124 | // searchTimer::expire () | 124 | // searchTimer::expire () |
884 | 125 | // | 125 | // |
885 | 126 | epicsTimerNotify::expireStatus searchTimer::expire ( | 126 | epicsTimerNotify::expireStatus searchTimer::expire ( |
887 | 127 | const epicsTime & currentTime ) // X aCC 361 | 127 | const epicsTime & currentTime ) |
888 | 128 | { | 128 | { |
889 | 129 | epicsGuard < epicsMutex > guard ( this->mutex ); | 129 | epicsGuard < epicsMutex > guard ( this->mutex ); |
890 | 130 | 130 | ||
891 | 131 | 131 | ||
892 | === modified file 'src/ca/client/searchTimer.h' | |||
893 | --- src/ca/client/searchTimer.h 2006-11-18 00:51:08 +0000 | |||
894 | +++ src/ca/client/searchTimer.h 2012-04-12 17:46:27 +0000 | |||
895 | @@ -43,7 +43,7 @@ | |||
896 | 43 | #include "caProto.h" | 43 | #include "caProto.h" |
897 | 44 | #include "netiiu.h" | 44 | #include "netiiu.h" |
898 | 45 | 45 | ||
900 | 46 | class searchTimerNotify { // X aCC 655 | 46 | class searchTimerNotify { |
901 | 47 | public: | 47 | public: |
902 | 48 | virtual ~searchTimerNotify () = 0; | 48 | virtual ~searchTimerNotify () = 0; |
903 | 49 | virtual void boostChannel ( | 49 | virtual void boostChannel ( |
904 | 50 | 50 | ||
905 | === modified file 'src/ca/client/syncGroup.h' | |||
906 | --- src/ca/client/syncGroup.h 2007-08-23 17:46:28 +0000 | |||
907 | +++ src/ca/client/syncGroup.h 2012-04-12 17:46:27 +0000 | |||
908 | @@ -49,7 +49,7 @@ | |||
909 | 49 | // used to control access to CASG's recycle routines which | 49 | // used to control access to CASG's recycle routines which |
910 | 50 | // should only be indirectly invoked by CASG when its lock | 50 | // should only be indirectly invoked by CASG when its lock |
911 | 51 | // is applied | 51 | // is applied |
913 | 52 | class casgRecycle { // X aCC 655 | 52 | class casgRecycle { |
914 | 53 | public: | 53 | public: |
915 | 54 | virtual void recycleSyncGroupWriteNotify ( | 54 | virtual void recycleSyncGroupWriteNotify ( |
916 | 55 | epicsGuard < epicsMutex > &, class syncGroupWriteNotify & io ) = 0; | 55 | epicsGuard < epicsMutex > &, class syncGroupWriteNotify & io ) = 0; |
917 | @@ -104,7 +104,6 @@ | |||
918 | 104 | cacChannel::ioid id; | 104 | cacChannel::ioid id; |
919 | 105 | bool idIsValid; | 105 | bool idIsValid; |
920 | 106 | bool ioComplete; | 106 | bool ioComplete; |
921 | 107 | void * operator new ( size_t ); | ||
922 | 108 | void operator delete ( void * ); | 107 | void operator delete ( void * ); |
923 | 109 | void * operator new ( size_t, | 108 | void * operator new ( size_t, |
924 | 110 | tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & ); | 109 | tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & ); |
925 | @@ -145,7 +144,6 @@ | |||
926 | 145 | cacChannel::ioid id; | 144 | cacChannel::ioid id; |
927 | 146 | bool idIsValid; | 145 | bool idIsValid; |
928 | 147 | bool ioComplete; | 146 | bool ioComplete; |
929 | 148 | void * operator new ( size_t ); | ||
930 | 149 | void operator delete ( void * ); | 147 | void operator delete ( void * ); |
931 | 150 | void * operator new ( size_t, | 148 | void * operator new ( size_t, |
932 | 151 | tsFreeList < class syncGroupWriteNotify, 128, epicsMutexNOOP > & ); | 149 | tsFreeList < class syncGroupWriteNotify, 128, epicsMutexNOOP > & ); |
933 | @@ -215,7 +213,6 @@ | |||
934 | 215 | CASG ( const CASG & ); | 213 | CASG ( const CASG & ); |
935 | 216 | CASG & operator = ( const CASG & ); | 214 | CASG & operator = ( const CASG & ); |
936 | 217 | 215 | ||
937 | 218 | void * operator new ( size_t size ); | ||
938 | 219 | void operator delete ( void * ); | 216 | void operator delete ( void * ); |
939 | 220 | 217 | ||
940 | 221 | ~CASG (); | 218 | ~CASG (); |
941 | 222 | 219 | ||
942 | === modified file 'src/ca/client/syncGroupReadNotify.cpp' | |||
943 | --- src/ca/client/syncGroupReadNotify.cpp 2007-08-23 17:46:28 +0000 | |||
944 | +++ src/ca/client/syncGroupReadNotify.cpp 2012-04-12 17:46:27 +0000 | |||
945 | @@ -58,7 +58,7 @@ | |||
946 | 58 | tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & freeList, | 58 | tsFreeList < class syncGroupReadNotify, 128, epicsMutexNOOP > & freeList, |
947 | 59 | struct CASG & sg, chid chan, void * pValueIn ) | 59 | struct CASG & sg, chid chan, void * pValueIn ) |
948 | 60 | { | 60 | { |
950 | 61 | return new ( freeList ) // X aCC 930 | 61 | return new ( freeList ) |
951 | 62 | syncGroupReadNotify ( sg, chan, pValueIn ); | 62 | syncGroupReadNotify ( sg, chan, pValueIn ); |
952 | 63 | } | 63 | } |
953 | 64 | 64 | ||
954 | @@ -122,13 +122,6 @@ | |||
955 | 122 | } | 122 | } |
956 | 123 | } | 123 | } |
957 | 124 | 124 | ||
958 | 125 | void * syncGroupReadNotify::operator new ( size_t ) // X aCC 361 | ||
959 | 126 | { | ||
960 | 127 | // The HPUX compiler seems to require this even though no code | ||
961 | 128 | // calls it directly | ||
962 | 129 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
963 | 130 | } | ||
964 | 131 | |||
965 | 132 | void syncGroupReadNotify::operator delete ( void * ) | 125 | void syncGroupReadNotify::operator delete ( void * ) |
966 | 133 | { | 126 | { |
967 | 134 | // Visual C++ .net appears to require operator delete if | 127 | // Visual C++ .net appears to require operator delete if |
968 | 135 | 128 | ||
969 | === modified file 'src/ca/client/syncGroupWriteNotify.cpp' | |||
970 | --- src/ca/client/syncGroupWriteNotify.cpp 2007-08-23 17:46:28 +0000 | |||
971 | +++ src/ca/client/syncGroupWriteNotify.cpp 2012-04-12 17:46:27 +0000 | |||
972 | @@ -112,13 +112,6 @@ | |||
973 | 112 | } | 112 | } |
974 | 113 | } | 113 | } |
975 | 114 | 114 | ||
976 | 115 | void * syncGroupWriteNotify::operator new ( size_t ) // X aCC 361 | ||
977 | 116 | { | ||
978 | 117 | // The HPUX compiler seems to require this even though no code | ||
979 | 118 | // calls it directly | ||
980 | 119 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
981 | 120 | } | ||
982 | 121 | |||
983 | 122 | void syncGroupWriteNotify::operator delete ( void * ) | 115 | void syncGroupWriteNotify::operator delete ( void * ) |
984 | 123 | { | 116 | { |
985 | 124 | // Visual C++ .net appears to require operator delete if | 117 | // Visual C++ .net appears to require operator delete if |
986 | 125 | 118 | ||
987 | === modified file 'src/ca/client/syncgrp.cpp' | |||
988 | --- src/ca/client/syncgrp.cpp 2007-01-11 22:02:47 +0000 | |||
989 | +++ src/ca/client/syncgrp.cpp 2012-04-12 17:46:27 +0000 | |||
990 | @@ -23,7 +23,7 @@ | |||
991 | 23 | /* | 23 | /* |
992 | 24 | * ca_sg_create() | 24 | * ca_sg_create() |
993 | 25 | */ | 25 | */ |
995 | 26 | extern "C" int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid ) // X aCC 361 | 26 | extern "C" int epicsShareAPI ca_sg_create ( CA_SYNC_GID * pgid ) |
996 | 27 | { | 27 | { |
997 | 28 | ca_client_context * pcac; | 28 | ca_client_context * pcac; |
998 | 29 | int caStatus; | 29 | int caStatus; |
999 | @@ -143,7 +143,7 @@ | |||
1000 | 143 | /* | 143 | /* |
1001 | 144 | * ca_sg_test | 144 | * ca_sg_test |
1002 | 145 | */ | 145 | */ |
1004 | 146 | extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid ) // X aCC 361 | 146 | extern "C" int epicsShareAPI ca_sg_test ( const CA_SYNC_GID gid ) |
1005 | 147 | { | 147 | { |
1006 | 148 | ca_client_context * pcac; | 148 | ca_client_context * pcac; |
1007 | 149 | int caStatus = fetchClientContext ( &pcac ); | 149 | int caStatus = fetchClientContext ( &pcac ); |
1008 | 150 | 150 | ||
1009 | === modified file 'src/ca/client/tcpRecvWatchdog.cpp' | |||
1010 | --- src/ca/client/tcpRecvWatchdog.cpp 2006-12-05 19:56:28 +0000 | |||
1011 | +++ src/ca/client/tcpRecvWatchdog.cpp 2012-04-12 17:46:27 +0000 | |||
1012 | @@ -45,7 +45,7 @@ | |||
1013 | 45 | } | 45 | } |
1014 | 46 | 46 | ||
1015 | 47 | epicsTimerNotify::expireStatus | 47 | epicsTimerNotify::expireStatus |
1017 | 48 | tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ ) // X aCC 361 | 48 | tcpRecvWatchdog::expire ( const epicsTime & /* currentTime */ ) |
1018 | 49 | { | 49 | { |
1019 | 50 | epicsGuard < epicsMutex > guard ( this->mutex ); | 50 | epicsGuard < epicsMutex > guard ( this->mutex ); |
1020 | 51 | if ( this->shuttingDown ) { | 51 | if ( this->shuttingDown ) { |
1021 | 52 | 52 | ||
1022 | === modified file 'src/ca/client/tcpiiu.cpp' | |||
1023 | --- src/ca/client/tcpiiu.cpp 2011-01-15 00:53:33 +0000 | |||
1024 | +++ src/ca/client/tcpiiu.cpp 2012-04-12 17:46:27 +0000 | |||
1025 | @@ -1135,7 +1135,7 @@ | |||
1026 | 1135 | } | 1135 | } |
1027 | 1136 | } | 1136 | } |
1028 | 1137 | 1137 | ||
1030 | 1138 | bool tcpiiu::setEchoRequestPending ( epicsGuard < epicsMutex > & guard ) // X aCC 361 | 1138 | bool tcpiiu::setEchoRequestPending ( epicsGuard < epicsMutex > & guard ) |
1031 | 1139 | { | 1139 | { |
1032 | 1140 | guard.assertIdenticalMutex ( this->mutex ); | 1140 | guard.assertIdenticalMutex ( this->mutex ); |
1033 | 1141 | 1141 | ||
1034 | @@ -1275,12 +1275,9 @@ | |||
1035 | 1275 | this->msgHeaderAvailable = false; | 1275 | this->msgHeaderAvailable = false; |
1036 | 1276 | this->curDataBytes = 0u; | 1276 | this->curDataBytes = 0u; |
1037 | 1277 | } | 1277 | } |
1038 | 1278 | # if defined ( __HP_aCC ) && _HP_aCC <= 033300 | ||
1039 | 1279 | return false; // to make hpux compiler happy... | ||
1040 | 1280 | # endif | ||
1041 | 1281 | } | 1278 | } |
1042 | 1282 | 1279 | ||
1044 | 1283 | void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431 | 1280 | void tcpiiu::hostNameSetRequest ( epicsGuard < epicsMutex > & guard ) |
1045 | 1284 | { | 1281 | { |
1046 | 1285 | guard.assertIdenticalMutex ( this->mutex ); | 1282 | guard.assertIdenticalMutex ( this->mutex ); |
1047 | 1286 | 1283 | ||
1048 | @@ -1310,7 +1307,7 @@ | |||
1049 | 1310 | /* | 1307 | /* |
1050 | 1311 | * tcpiiu::userNameSetRequest () | 1308 | * tcpiiu::userNameSetRequest () |
1051 | 1312 | */ | 1309 | */ |
1053 | 1313 | void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431 | 1310 | void tcpiiu::userNameSetRequest ( epicsGuard < epicsMutex > & guard ) |
1054 | 1314 | { | 1311 | { |
1055 | 1315 | guard.assertIdenticalMutex ( this->mutex ); | 1312 | guard.assertIdenticalMutex ( this->mutex ); |
1056 | 1316 | 1313 | ||
1057 | @@ -1338,7 +1335,7 @@ | |||
1058 | 1338 | } | 1335 | } |
1059 | 1339 | 1336 | ||
1060 | 1340 | void tcpiiu::disableFlowControlRequest ( | 1337 | void tcpiiu::disableFlowControlRequest ( |
1062 | 1341 | epicsGuard < epicsMutex > & guard ) // X aCC 431 | 1338 | epicsGuard < epicsMutex > & guard ) |
1063 | 1342 | { | 1339 | { |
1064 | 1343 | guard.assertIdenticalMutex ( this->mutex ); | 1340 | guard.assertIdenticalMutex ( this->mutex ); |
1065 | 1344 | 1341 | ||
1066 | @@ -1354,7 +1351,7 @@ | |||
1067 | 1354 | } | 1351 | } |
1068 | 1355 | 1352 | ||
1069 | 1356 | void tcpiiu::enableFlowControlRequest ( | 1353 | void tcpiiu::enableFlowControlRequest ( |
1071 | 1357 | epicsGuard < epicsMutex > & guard ) // X aCC 431 | 1354 | epicsGuard < epicsMutex > & guard ) |
1072 | 1358 | { | 1355 | { |
1073 | 1359 | guard.assertIdenticalMutex ( this->mutex ); | 1356 | guard.assertIdenticalMutex ( this->mutex ); |
1074 | 1360 | 1357 | ||
1075 | @@ -1369,7 +1366,7 @@ | |||
1076 | 1369 | minder.commit (); | 1366 | minder.commit (); |
1077 | 1370 | } | 1367 | } |
1078 | 1371 | 1368 | ||
1080 | 1372 | void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard, // X aCC 431 | 1369 | void tcpiiu::versionMessage ( epicsGuard < epicsMutex > & guard, |
1081 | 1373 | const cacChannel::priLev & priority ) | 1370 | const cacChannel::priLev & priority ) |
1082 | 1374 | { | 1371 | { |
1083 | 1375 | guard.assertIdenticalMutex ( this->mutex ); | 1372 | guard.assertIdenticalMutex ( this->mutex ); |
1084 | @@ -1389,7 +1386,7 @@ | |||
1085 | 1389 | minder.commit (); | 1386 | minder.commit (); |
1086 | 1390 | } | 1387 | } |
1087 | 1391 | 1388 | ||
1089 | 1392 | void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard ) // X aCC 431 | 1389 | void tcpiiu::echoRequest ( epicsGuard < epicsMutex > & guard ) |
1090 | 1393 | { | 1390 | { |
1091 | 1394 | guard.assertIdenticalMutex ( this->mutex ); | 1391 | guard.assertIdenticalMutex ( this->mutex ); |
1092 | 1395 | 1392 | ||
1093 | @@ -1410,7 +1407,7 @@ | |||
1094 | 1410 | minder.commit (); | 1407 | minder.commit (); |
1095 | 1411 | } | 1408 | } |
1096 | 1412 | 1409 | ||
1098 | 1413 | void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 | 1410 | void tcpiiu::writeRequest ( epicsGuard < epicsMutex > & guard, |
1099 | 1414 | nciu &chan, unsigned type, arrayElementCount nElem, const void *pValue ) | 1411 | nciu &chan, unsigned type, arrayElementCount nElem, const void *pValue ) |
1100 | 1415 | { | 1412 | { |
1101 | 1416 | guard.assertIdenticalMutex ( this->mutex ); | 1413 | guard.assertIdenticalMutex ( this->mutex ); |
1102 | @@ -1425,7 +1422,7 @@ | |||
1103 | 1425 | } | 1422 | } |
1104 | 1426 | 1423 | ||
1105 | 1427 | 1424 | ||
1107 | 1428 | void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 | 1425 | void tcpiiu::writeNotifyRequest ( epicsGuard < epicsMutex > & guard, |
1108 | 1429 | nciu &chan, netWriteNotifyIO &io, unsigned type, | 1426 | nciu &chan, netWriteNotifyIO &io, unsigned type, |
1109 | 1430 | arrayElementCount nElem, const void *pValue ) | 1427 | arrayElementCount nElem, const void *pValue ) |
1110 | 1431 | { | 1428 | { |
1111 | @@ -1444,7 +1441,7 @@ | |||
1112 | 1444 | minder.commit (); | 1441 | minder.commit (); |
1113 | 1445 | } | 1442 | } |
1114 | 1446 | 1443 | ||
1116 | 1447 | void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 | 1444 | void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard, |
1117 | 1448 | nciu & chan, netReadNotifyIO & io, | 1445 | nciu & chan, netReadNotifyIO & io, |
1118 | 1449 | unsigned dataType, arrayElementCount nElem ) | 1446 | unsigned dataType, arrayElementCount nElem ) |
1119 | 1450 | { | 1447 | { |
1120 | @@ -1477,7 +1474,7 @@ | |||
1121 | 1477 | } | 1474 | } |
1122 | 1478 | 1475 | ||
1123 | 1479 | void tcpiiu::createChannelRequest ( | 1476 | void tcpiiu::createChannelRequest ( |
1125 | 1480 | nciu & chan, epicsGuard < epicsMutex > & guard ) // X aCC 431 | 1477 | nciu & chan, epicsGuard < epicsMutex > & guard ) |
1126 | 1481 | { | 1478 | { |
1127 | 1482 | guard.assertIdenticalMutex ( this->mutex ); | 1479 | guard.assertIdenticalMutex ( this->mutex ); |
1128 | 1483 | 1480 | ||
1129 | @@ -1525,7 +1522,7 @@ | |||
1130 | 1525 | minder.commit (); | 1522 | minder.commit (); |
1131 | 1526 | } | 1523 | } |
1132 | 1527 | 1524 | ||
1134 | 1528 | void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 | 1525 | void tcpiiu::clearChannelRequest ( epicsGuard < epicsMutex > & guard, |
1135 | 1529 | ca_uint32_t sid, ca_uint32_t cid ) | 1526 | ca_uint32_t sid, ca_uint32_t cid ) |
1136 | 1530 | { | 1527 | { |
1137 | 1531 | guard.assertIdenticalMutex ( this->mutex ); | 1528 | guard.assertIdenticalMutex ( this->mutex ); |
1138 | @@ -1547,7 +1544,7 @@ | |||
1139 | 1547 | // is to try again the next time that we reconnect | 1544 | // is to try again the next time that we reconnect |
1140 | 1548 | // | 1545 | // |
1141 | 1549 | void tcpiiu::subscriptionRequest ( | 1546 | void tcpiiu::subscriptionRequest ( |
1143 | 1550 | epicsGuard < epicsMutex > & guard, // X aCC 431 | 1547 | epicsGuard < epicsMutex > & guard, |
1144 | 1551 | nciu & chan, netSubscription & subscr ) | 1548 | nciu & chan, netSubscription & subscr ) |
1145 | 1552 | { | 1549 | { |
1146 | 1553 | guard.assertIdenticalMutex ( this->mutex ); | 1550 | guard.assertIdenticalMutex ( this->mutex ); |
1147 | @@ -1599,7 +1596,7 @@ | |||
1148 | 1599 | // is to try again the next time that we reconnect | 1596 | // is to try again the next time that we reconnect |
1149 | 1600 | // | 1597 | // |
1150 | 1601 | void tcpiiu::subscriptionUpdateRequest ( | 1598 | void tcpiiu::subscriptionUpdateRequest ( |
1152 | 1602 | epicsGuard < epicsMutex > & guard, // X aCC 431 | 1599 | epicsGuard < epicsMutex > & guard, |
1153 | 1603 | nciu & chan, netSubscription & subscr ) | 1600 | nciu & chan, netSubscription & subscr ) |
1154 | 1604 | { | 1601 | { |
1155 | 1605 | guard.assertIdenticalMutex ( this->mutex ); | 1602 | guard.assertIdenticalMutex ( this->mutex ); |
1156 | @@ -1634,7 +1631,7 @@ | |||
1157 | 1634 | minder.commit (); | 1631 | minder.commit (); |
1158 | 1635 | } | 1632 | } |
1159 | 1636 | 1633 | ||
1161 | 1637 | void tcpiiu::subscriptionCancelRequest ( epicsGuard < epicsMutex > & guard, // X aCC 431 | 1634 | void tcpiiu::subscriptionCancelRequest ( epicsGuard < epicsMutex > & guard, |
1162 | 1638 | nciu & chan, netSubscription & subscr ) | 1635 | nciu & chan, netSubscription & subscr ) |
1163 | 1639 | { | 1636 | { |
1164 | 1640 | guard.assertIdenticalMutex ( this->mutex ); | 1637 | guard.assertIdenticalMutex ( this->mutex ); |
1165 | @@ -2052,7 +2049,7 @@ | |||
1166 | 2052 | return false; | 2049 | return false; |
1167 | 2053 | #else | 2050 | #else |
1168 | 2054 | osiSockIoctl_t bytesPending = 0; /* shut up purifys yapping */ | 2051 | osiSockIoctl_t bytesPending = 0; /* shut up purifys yapping */ |
1170 | 2055 | int status = socket_ioctl ( this->sock, // X aCC 392 | 2052 | int status = socket_ioctl ( this->sock, |
1171 | 2056 | FIONREAD, & bytesPending ); | 2053 | FIONREAD, & bytesPending ); |
1172 | 2057 | if ( status >= 0 ) { | 2054 | if ( status >= 0 ) { |
1173 | 2058 | if ( bytesPending > 0 ) { | 2055 | if ( bytesPending > 0 ) { |
1174 | 2059 | 2056 | ||
1175 | === modified file 'src/ca/client/test_event.cpp' | |||
1176 | --- src/ca/client/test_event.cpp 2004-10-08 15:44:44 +0000 | |||
1177 | +++ src/ca/client/test_event.cpp 2012-04-12 17:46:27 +0000 | |||
1178 | @@ -78,7 +78,7 @@ | |||
1179 | 78 | dbr_short_t *pvalue = (dbr_short_t *)pbuffer; | 78 | dbr_short_t *pvalue = (dbr_short_t *)pbuffer; |
1180 | 79 | for (i = 0; i < count; i++,pvalue++){ | 79 | for (i = 0; i < count; i++,pvalue++){ |
1181 | 80 | if(count!=1 && (i%10 == 0)) printf("\n"); | 80 | if(count!=1 && (i%10 == 0)) printf("\n"); |
1183 | 81 | printf("%d ",* (short *)pvalue); // X aCC 392 | 81 | printf("%d ",* (short *)pvalue); |
1184 | 82 | } | 82 | } |
1185 | 83 | break; | 83 | break; |
1186 | 84 | } | 84 | } |
1187 | @@ -96,7 +96,7 @@ | |||
1188 | 96 | dbr_float_t *pvalue = (dbr_float_t *)pbuffer; | 96 | dbr_float_t *pvalue = (dbr_float_t *)pbuffer; |
1189 | 97 | for (i = 0; i < count; i++,pvalue++){ | 97 | for (i = 0; i < count; i++,pvalue++){ |
1190 | 98 | if(count!=1 && (i%10 == 0)) printf("\n"); | 98 | if(count!=1 && (i%10 == 0)) printf("\n"); |
1192 | 99 | printf("%6.4f ",*(float *)pvalue); // X aCC 392 | 99 | printf("%6.4f ",*(float *)pvalue); |
1193 | 100 | } | 100 | } |
1194 | 101 | break; | 101 | break; |
1195 | 102 | } | 102 | } |
1196 | 103 | 103 | ||
1197 | === modified file 'src/ca/client/udpiiu.cpp' | |||
1198 | --- src/ca/client/udpiiu.cpp 2011-12-12 23:10:24 +0000 | |||
1199 | +++ src/ca/client/udpiiu.cpp 2012-04-12 17:46:27 +0000 | |||
1200 | @@ -201,7 +201,7 @@ | |||
1201 | 201 | memset ( (char *)&addr, 0 , sizeof (addr) ); | 201 | memset ( (char *)&addr, 0 , sizeof (addr) ); |
1202 | 202 | addr.ia.sin_family = AF_INET; | 202 | addr.ia.sin_family = AF_INET; |
1203 | 203 | addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY ); | 203 | addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY ); |
1205 | 204 | addr.ia.sin_port = htons ( PORT_ANY ); // X aCC 818 | 204 | addr.ia.sin_port = htons ( PORT_ANY ); |
1206 | 205 | status = bind (this->sock, &addr.sa, sizeof (addr) ); | 205 | status = bind (this->sock, &addr.sa, sizeof (addr) ); |
1207 | 206 | if ( status < 0 ) { | 206 | if ( status < 0 ) { |
1208 | 207 | char sockErrBuf[64]; | 207 | char sockErrBuf[64]; |
1209 | @@ -471,7 +471,7 @@ | |||
1210 | 471 | } | 471 | } |
1211 | 472 | 472 | ||
1212 | 473 | memset ( (char *) &msg, 0, sizeof (msg) ); | 473 | memset ( (char *) &msg, 0, sizeof (msg) ); |
1214 | 474 | AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = REPEATER_REGISTER; // X aCC 818 | 474 | AlignedWireRef < epicsUInt16 > ( msg.m_cmmd ) = REPEATER_REGISTER; |
1215 | 475 | msg.m_available = saddr.ia.sin_addr.s_addr; | 475 | msg.m_available = saddr.ia.sin_addr.s_addr; |
1216 | 476 | 476 | ||
1217 | 477 | /* | 477 | /* |
1218 | 478 | 478 | ||
1219 | === modified file 'src/ca/client/virtualCircuit.h' | |||
1220 | --- src/ca/client/virtualCircuit.h 2010-08-13 18:12:06 +0000 | |||
1221 | +++ src/ca/client/virtualCircuit.h 2012-04-12 17:46:27 +0000 | |||
1222 | @@ -335,7 +335,6 @@ | |||
1223 | 335 | 335 | ||
1224 | 336 | tcpiiu ( const tcpiiu & ); | 336 | tcpiiu ( const tcpiiu & ); |
1225 | 337 | tcpiiu & operator = ( const tcpiiu & ); | 337 | tcpiiu & operator = ( const tcpiiu & ); |
1226 | 338 | void * operator new ( size_t size ); | ||
1227 | 339 | void operator delete ( void * ); | 338 | void operator delete ( void * ); |
1228 | 340 | }; | 339 | }; |
1229 | 341 | 340 | ||
1230 | @@ -372,7 +371,7 @@ | |||
1231 | 372 | } | 371 | } |
1232 | 373 | 372 | ||
1233 | 374 | inline bool tcpiiu::alive ( | 373 | inline bool tcpiiu::alive ( |
1235 | 375 | epicsGuard < epicsMutex > & ) const // X aCC 361 | 374 | epicsGuard < epicsMutex > & ) const |
1236 | 376 | { | 375 | { |
1237 | 377 | return ( this->state == iiucs_connecting || | 376 | return ( this->state == iiucs_connecting || |
1238 | 378 | this->state == iiucs_connected ); | 377 | this->state == iiucs_connected ); |
1239 | 379 | 378 | ||
1240 | === modified file 'src/ca/legacy/gdd/aitConvert.h' | |||
1241 | --- src/ca/legacy/gdd/aitConvert.h 2010-10-05 19:27:37 +0000 | |||
1242 | +++ src/ca/legacy/gdd/aitConvert.h 2012-04-12 17:46:27 +0000 | |||
1243 | @@ -114,15 +114,15 @@ | |||
1244 | 114 | inline void aitToNetOrder64(aitUint64* dest, aitUint64* src) | 114 | inline void aitToNetOrder64(aitUint64* dest, aitUint64* src) |
1245 | 115 | { | 115 | { |
1246 | 116 | aitUint32 ait_temp_var_; | 116 | aitUint32 ait_temp_var_; |
1249 | 117 | ait_temp_var_=(aitUint32)htonl(src[1]); // X aCC 392 | 117 | ait_temp_var_=(aitUint32)htonl(src[1]); |
1250 | 118 | dest[1]=(aitUint32)htonl(src[0]); // X aCC 392 | 118 | dest[1]=(aitUint32)htonl(src[0]); |
1251 | 119 | dest[0]=ait_temp_var_; | 119 | dest[0]=ait_temp_var_; |
1252 | 120 | } | 120 | } |
1253 | 121 | inline void aitFromNetOrder64(aitUint64* dest, aitUint64* src) | 121 | inline void aitFromNetOrder64(aitUint64* dest, aitUint64* src) |
1254 | 122 | { | 122 | { |
1255 | 123 | aitUint32 ait_temp_var_; | 123 | aitUint32 ait_temp_var_; |
1258 | 124 | ait_temp_var_=(aitUint32)ntohl(src[1]); // X aCC 392 | 124 | ait_temp_var_=(aitUint32)ntohl(src[1]); |
1259 | 125 | dest[1]=(aitUint32)ntohl(src[0]); // X aCC 392 | 125 | dest[1]=(aitUint32)ntohl(src[0]); |
1260 | 126 | dest[0]=ait_temp_var_; | 126 | dest[0]=ait_temp_var_; |
1261 | 127 | } | 127 | } |
1262 | 128 | 128 | ||
1263 | 129 | 129 | ||
1264 | === modified file 'src/ca/legacy/gdd/gddAppTable.cc' | |||
1265 | --- src/ca/legacy/gdd/gddAppTable.cc 2010-10-05 19:27:37 +0000 | |||
1266 | +++ src/ca/legacy/gdd/gddAppTable.cc 2012-04-12 17:46:27 +0000 | |||
1267 | @@ -61,21 +61,6 @@ | |||
1268 | 61 | GenerateTypes(); | 61 | GenerateTypes(); |
1269 | 62 | } | 62 | } |
1270 | 63 | 63 | ||
1271 | 64 | #if 0 | ||
1272 | 65 | void* operator new(size_t x) | ||
1273 | 66 | { | ||
1274 | 67 | void* v = (void*)malloc(x); | ||
1275 | 68 | fprintf(stderr,"%8.8x In operator new %d\n",v,(int)x); | ||
1276 | 69 | return v; | ||
1277 | 70 | } | ||
1278 | 71 | |||
1279 | 72 | void operator delete(void* x) | ||
1280 | 73 | { | ||
1281 | 74 | fprintf(stderr,"%8.8x In operator delete\n",x); | ||
1282 | 75 | free((char*)x); | ||
1283 | 76 | } | ||
1284 | 77 | #endif | ||
1285 | 78 | |||
1286 | 79 | gddApplicationTypeTable::~gddApplicationTypeTable(void) | 64 | gddApplicationTypeTable::~gddApplicationTypeTable(void) |
1287 | 80 | { | 65 | { |
1288 | 81 | unsigned i,j; | 66 | unsigned i,j; |
1289 | 82 | 67 | ||
1290 | === modified file 'src/ca/legacy/gdd/gddI.h' | |||
1291 | --- src/ca/legacy/gdd/gddI.h 2010-10-05 19:27:37 +0000 | |||
1292 | +++ src/ca/legacy/gdd/gddI.h 2012-04-12 17:46:27 +0000 | |||
1293 | @@ -79,12 +79,12 @@ | |||
1294 | 79 | inline int gdd::isNetworkDataFormat(void) const | 79 | inline int gdd::isNetworkDataFormat(void) const |
1295 | 80 | { return !isLocalDataFormat() || aitLocalNetworkDataFormatSame; } | 80 | { return !isLocalDataFormat() || aitLocalNetworkDataFormatSame; } |
1296 | 81 | 81 | ||
1303 | 82 | inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; } // X aCC 818 | 82 | inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; } |
1304 | 83 | inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; } // X aCC 818 | 83 | inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; } |
1305 | 84 | inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; } // X aCC 818 | 84 | inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; } |
1306 | 85 | inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; } // X aCC 818 | 85 | inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; } |
1307 | 86 | inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; } // X aCC 818 | 86 | inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; } |
1308 | 87 | inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; } // X aCC 818 | 87 | inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; } |
1309 | 88 | 88 | ||
1310 | 89 | inline void gdd::getTimeStamp(struct timespec* const ts) const { time_stamp.get(*ts); } | 89 | inline void gdd::getTimeStamp(struct timespec* const ts) const { time_stamp.get(*ts); } |
1311 | 90 | inline void gdd::setTimeStamp(const struct timespec* const ts) { time_stamp=*ts; } | 90 | inline void gdd::setTimeStamp(const struct timespec* const ts) { time_stamp=*ts; } |
1312 | @@ -132,7 +132,7 @@ | |||
1313 | 132 | gddAutoPrint("gdd::noReferencing()",gddErrorNotAllowed); | 132 | gddAutoPrint("gdd::noReferencing()",gddErrorNotAllowed); |
1314 | 133 | rc=gddErrorNotAllowed; | 133 | rc=gddErrorNotAllowed; |
1315 | 134 | } | 134 | } |
1317 | 135 | else flags|=GDD_NOREF_MASK; // X aCC 818 | 135 | else flags|=GDD_NOREF_MASK; |
1318 | 136 | return rc; | 136 | return rc; |
1319 | 137 | } | 137 | } |
1320 | 138 | inline gddStatus gdd::reference(void) const | 138 | inline gddStatus gdd::reference(void) const |
1321 | @@ -148,7 +148,7 @@ | |||
1322 | 148 | rc = gddErrorNotAllowed; | 148 | rc = gddErrorNotAllowed; |
1323 | 149 | } | 149 | } |
1324 | 150 | else if ( this->ref_cnt < 0xffffffff ) { | 150 | else if ( this->ref_cnt < 0xffffffff ) { |
1326 | 151 | this->ref_cnt++; // X aCC 818 | 151 | this->ref_cnt++; |
1327 | 152 | } | 152 | } |
1328 | 153 | else { | 153 | else { |
1329 | 154 | fprintf(stderr,"gdd reference count overflow!!\n"); | 154 | fprintf(stderr,"gdd reference count overflow!!\n"); |
1330 | @@ -399,10 +399,10 @@ | |||
1331 | 399 | if(primitiveType()==aitEnumString && dim==0) | 399 | if(primitiveType()==aitEnumString && dim==0) |
1332 | 400 | { | 400 | { |
1333 | 401 | aitString* str = (aitString*)dataAddress(); | 401 | aitString* str = (aitString*)dataAddress(); |
1335 | 402 | strcpy((char*)d,str->string()); // X aCC 392 | 402 | strcpy((char*)d,str->string()); |
1336 | 403 | } | 403 | } |
1337 | 404 | else if(primitiveType()==aitEnumFixedString && dim==0) | 404 | else if(primitiveType()==aitEnumFixedString && dim==0) |
1339 | 405 | strcpy((char*)d,data.FString->fixed_string); // X aCC 392 | 405 | strcpy((char*)d,data.FString->fixed_string); |
1340 | 406 | else | 406 | else |
1341 | 407 | aitConvert(aitEnumInt8,d,primitiveType(),dataPointer(), | 407 | aitConvert(aitEnumInt8,d,primitiveType(),dataPointer(), |
1342 | 408 | getDataSizeElements()); | 408 | getDataSizeElements()); |
1343 | 409 | 409 | ||
1344 | === modified file 'src/ca/legacy/gdd/gddUtilsI.h' | |||
1345 | --- src/ca/legacy/gdd/gddUtilsI.h 2010-10-05 19:27:37 +0000 | |||
1346 | +++ src/ca/legacy/gdd/gddUtilsI.h 2012-04-12 17:46:27 +0000 | |||
1347 | @@ -30,7 +30,7 @@ | |||
1348 | 30 | 30 | ||
1349 | 31 | inline gddDestructor::gddDestructor(void) { ref_cnt=0; arg=NULL; } | 31 | inline gddDestructor::gddDestructor(void) { ref_cnt=0; arg=NULL; } |
1350 | 32 | inline gddDestructor::gddDestructor(void* usr_arg) { ref_cnt=0; arg=usr_arg; } | 32 | inline gddDestructor::gddDestructor(void* usr_arg) { ref_cnt=0; arg=usr_arg; } |
1352 | 33 | inline void gddDestructor::reference(void) { ref_cnt++; } // X aCC 818 | 33 | inline void gddDestructor::reference(void) { ref_cnt++; } |
1353 | 34 | inline int gddDestructor::refCount(void) const { return ref_cnt; } | 34 | inline int gddDestructor::refCount(void) const { return ref_cnt; } |
1354 | 35 | 35 | ||
1355 | 36 | #endif | 36 | #endif |
1356 | 37 | 37 | ||
1357 | === modified file 'src/ca/legacy/gdd/smartGDDPointer.h' | |||
1358 | --- src/ca/legacy/gdd/smartGDDPointer.h 2009-08-31 23:21:37 +0000 | |||
1359 | +++ src/ca/legacy/gdd/smartGDDPointer.h 2012-04-12 17:46:27 +0000 | |||
1360 | @@ -157,13 +157,13 @@ | |||
1361 | 157 | } | 157 | } |
1362 | 158 | 158 | ||
1363 | 159 | template < class T > | 159 | template < class T > |
1365 | 160 | inline bool smartGDDPointerTemplate < T > :: operator ! () const // X aCC 361 | 160 | inline bool smartGDDPointerTemplate < T > :: operator ! () const |
1366 | 161 | { | 161 | { |
1367 | 162 | return this->pValue ? false : true; | 162 | return this->pValue ? false : true; |
1368 | 163 | } | 163 | } |
1369 | 164 | 164 | ||
1370 | 165 | template < class T > | 165 | template < class T > |
1372 | 166 | inline bool smartGDDPointerTemplate < T > :: valid () const // X aCC 361 | 166 | inline bool smartGDDPointerTemplate < T > :: valid () const |
1373 | 167 | { | 167 | { |
1374 | 168 | return this->pValue ? true : false; | 168 | return this->pValue ? true : false; |
1375 | 169 | } | 169 | } |
1376 | 170 | 170 | ||
1377 | === modified file 'src/ca/legacy/pcas/example/directoryService/directoryServer.h' | |||
1378 | --- src/ca/legacy/pcas/example/directoryService/directoryServer.h 2009-08-24 17:09:55 +0000 | |||
1379 | +++ src/ca/legacy/pcas/example/directoryService/directoryServer.h 2012-04-12 17:46:27 +0000 | |||
1380 | @@ -74,7 +74,7 @@ | |||
1381 | 74 | // for this breaking out into a seperate class | 74 | // for this breaking out into a seperate class |
1382 | 75 | // from pvInfo) | 75 | // from pvInfo) |
1383 | 76 | // | 76 | // |
1385 | 77 | class pvEntry // X aCC 655 | 77 | class pvEntry |
1386 | 78 | : public stringId, public tsSLNode<pvEntry> { | 78 | : public stringId, public tsSLNode<pvEntry> { |
1387 | 79 | public: | 79 | public: |
1388 | 80 | pvEntry (const pvInfo &infoIn, directoryServer &casIn, | 80 | pvEntry (const pvInfo &infoIn, directoryServer &casIn, |
1389 | 81 | 81 | ||
1390 | === modified file 'src/ca/legacy/pcas/example/directoryService/main.cc' | |||
1391 | --- src/ca/legacy/pcas/example/directoryService/main.cc 2009-07-09 15:27:43 +0000 | |||
1392 | +++ src/ca/legacy/pcas/example/directoryService/main.cc 2012-04-12 17:46:27 +0000 | |||
1393 | @@ -206,7 +206,4 @@ | |||
1394 | 206 | } | 206 | } |
1395 | 207 | nPV++; | 207 | nPV++; |
1396 | 208 | } | 208 | } |
1397 | 209 | #if defined ( __HP_aCC ) && ( _HP_aCC <= 033300 ) | ||
1398 | 210 | return 0; // Make HP compiler happy | ||
1399 | 211 | #endif | ||
1400 | 212 | } | 209 | } |
1401 | 213 | 210 | ||
1402 | === modified file 'src/ca/legacy/pcas/generic/caNetAddr.cc' | |||
1403 | --- src/ca/legacy/pcas/generic/caNetAddr.cc 2010-10-05 19:27:37 +0000 | |||
1404 | +++ src/ca/legacy/pcas/generic/caNetAddr.cc 2012-04-12 17:46:27 +0000 | |||
1405 | @@ -71,7 +71,7 @@ | |||
1406 | 71 | return this->type != casnaUDF; | 71 | return this->type != casnaUDF; |
1407 | 72 | } | 72 | } |
1408 | 73 | 73 | ||
1410 | 74 | bool caNetAddr::operator == (const caNetAddr &rhs) const // X aCC 361 | 74 | bool caNetAddr::operator == (const caNetAddr &rhs) const |
1411 | 75 | { | 75 | { |
1412 | 76 | if ( this->type != rhs.type ) { | 76 | if ( this->type != rhs.type ) { |
1413 | 77 | return false; | 77 | return false; |
1414 | 78 | 78 | ||
1415 | === modified file 'src/ca/legacy/pcas/generic/caServer.cc' | |||
1416 | --- src/ca/legacy/pcas/generic/caServer.cc 2010-10-05 19:27:37 +0000 | |||
1417 | +++ src/ca/legacy/pcas/generic/caServer.cc 2012-04-12 17:46:27 +0000 | |||
1418 | @@ -65,7 +65,7 @@ | |||
1419 | 65 | return this->createPV ( ctx, pAliasName ); | 65 | return this->createPV ( ctx, pAliasName ); |
1420 | 66 | } | 66 | } |
1421 | 67 | 67 | ||
1423 | 68 | casEventMask caServer::registerEvent (const char *pName) // X aCC 361 | 68 | casEventMask caServer::registerEvent (const char *pName) |
1424 | 69 | { | 69 | { |
1425 | 70 | if (this->pCAS) { | 70 | if (this->pCAS) { |
1426 | 71 | return this->pCAS->registerEvent(pName); | 71 | return this->pCAS->registerEvent(pName); |
1427 | @@ -97,7 +97,7 @@ | |||
1428 | 97 | } | 97 | } |
1429 | 98 | } | 98 | } |
1430 | 99 | 99 | ||
1432 | 100 | unsigned caServer::getDebugLevel () const // X aCC 361 | 100 | unsigned caServer::getDebugLevel () const |
1433 | 101 | { | 101 | { |
1434 | 102 | if (pCAS) { | 102 | if (pCAS) { |
1435 | 103 | return this->pCAS->getDebugLevel(); | 103 | return this->pCAS->getDebugLevel(); |
1436 | @@ -108,7 +108,7 @@ | |||
1437 | 108 | } | 108 | } |
1438 | 109 | } | 109 | } |
1439 | 110 | 110 | ||
1441 | 111 | casEventMask caServer::valueEventMask () const // X aCC 361 | 111 | casEventMask caServer::valueEventMask () const |
1442 | 112 | { | 112 | { |
1443 | 113 | if (pCAS) { | 113 | if (pCAS) { |
1444 | 114 | return this->pCAS->valueEventMask(); | 114 | return this->pCAS->valueEventMask(); |
1445 | @@ -119,7 +119,7 @@ | |||
1446 | 119 | } | 119 | } |
1447 | 120 | } | 120 | } |
1448 | 121 | 121 | ||
1450 | 122 | casEventMask caServer::logEventMask () const // X aCC 361 | 122 | casEventMask caServer::logEventMask () const |
1451 | 123 | { | 123 | { |
1452 | 124 | if (pCAS) { | 124 | if (pCAS) { |
1453 | 125 | return this->pCAS->logEventMask(); | 125 | return this->pCAS->logEventMask(); |
1454 | @@ -130,7 +130,7 @@ | |||
1455 | 130 | } | 130 | } |
1456 | 131 | } | 131 | } |
1457 | 132 | 132 | ||
1459 | 133 | casEventMask caServer::alarmEventMask () const // X aCC 361 | 133 | casEventMask caServer::alarmEventMask () const |
1460 | 134 | { | 134 | { |
1461 | 135 | if ( pCAS ) { | 135 | if ( pCAS ) { |
1462 | 136 | return this->pCAS->alarmEventMask (); | 136 | return this->pCAS->alarmEventMask (); |
1463 | @@ -146,7 +146,7 @@ | |||
1464 | 146 | return fileDescriptorManager.createTimer (); | 146 | return fileDescriptorManager.createTimer (); |
1465 | 147 | } | 147 | } |
1466 | 148 | 148 | ||
1468 | 149 | unsigned caServer::subscriptionEventsProcessed () const // X aCC 361 | 149 | unsigned caServer::subscriptionEventsProcessed () const |
1469 | 150 | { | 150 | { |
1470 | 151 | if ( pCAS ) { | 151 | if ( pCAS ) { |
1471 | 152 | return this->pCAS->subscriptionEventsProcessed (); | 152 | return this->pCAS->subscriptionEventsProcessed (); |
1472 | @@ -156,7 +156,7 @@ | |||
1473 | 156 | } | 156 | } |
1474 | 157 | } | 157 | } |
1475 | 158 | 158 | ||
1477 | 159 | unsigned caServer::subscriptionEventsPosted () const // X aCC 361 | 159 | unsigned caServer::subscriptionEventsPosted () const |
1478 | 160 | { | 160 | { |
1479 | 161 | if ( pCAS ) { | 161 | if ( pCAS ) { |
1480 | 162 | return this->pCAS->subscriptionEventsPosted (); | 162 | return this->pCAS->subscriptionEventsPosted (); |
1481 | 163 | 163 | ||
1482 | === modified file 'src/ca/legacy/pcas/generic/casChannel.cc' | |||
1483 | --- src/ca/legacy/pcas/generic/casChannel.cc 2010-10-05 19:27:37 +0000 | |||
1484 | +++ src/ca/legacy/pcas/generic/casChannel.cc 2012-04-12 17:46:27 +0000 | |||
1485 | @@ -37,7 +37,7 @@ | |||
1486 | 37 | this->destroy (); | 37 | this->destroy (); |
1487 | 38 | } | 38 | } |
1488 | 39 | 39 | ||
1490 | 40 | casPV * casChannel::getPV () // X aCC 361 | 40 | casPV * casChannel::getPV () |
1491 | 41 | { | 41 | { |
1492 | 42 | if ( this->pChanI ) { | 42 | if ( this->pChanI ) { |
1493 | 43 | casPVI & pvi = this->pChanI->getPVI (); | 43 | casPVI & pvi = this->pChanI->getPVI (); |
1494 | 44 | 44 | ||
1495 | === modified file 'src/ca/legacy/pcas/generic/casDGClient.cc' | |||
1496 | --- src/ca/legacy/pcas/generic/casDGClient.cc 2010-10-05 19:27:37 +0000 | |||
1497 | +++ src/ca/legacy/pcas/generic/casDGClient.cc 2012-04-12 17:46:27 +0000 | |||
1498 | @@ -448,7 +448,7 @@ | |||
1499 | 448 | // | 448 | // |
1500 | 449 | // casDGClient::xRecv () | 449 | // casDGClient::xRecv () |
1501 | 450 | // | 450 | // |
1503 | 451 | inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRecv, // X aCC 361 | 451 | inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRecv, |
1504 | 452 | fillParameter parm, bufSizeT &nByesRecv) | 452 | fillParameter parm, bufSizeT &nByesRecv) |
1505 | 453 | { | 453 | { |
1506 | 454 | const char *pAfter = pBufIn + nBytesToRecv; | 454 | const char *pAfter = pBufIn + nBytesToRecv; |
1507 | 455 | 455 | ||
1508 | === modified file 'src/ca/legacy/pcas/generic/casMonEvent.cc' | |||
1509 | --- src/ca/legacy/pcas/generic/casMonEvent.cc 2010-10-05 19:27:37 +0000 | |||
1510 | +++ src/ca/legacy/pcas/generic/casMonEvent.cc 2012-04-12 17:46:27 +0000 | |||
1511 | @@ -57,13 +57,6 @@ | |||
1512 | 57 | } | 57 | } |
1513 | 58 | #endif | 58 | #endif |
1514 | 59 | 59 | ||
1515 | 60 | void * casMonEvent::operator new ( size_t ) // X aCC 361 | ||
1516 | 61 | { | ||
1517 | 62 | // The HPUX compiler seems to require this even though no code | ||
1518 | 63 | // calls it directly | ||
1519 | 64 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
1520 | 65 | } | ||
1521 | 66 | |||
1522 | 67 | void casMonEvent::operator delete ( void * ) | 60 | void casMonEvent::operator delete ( void * ) |
1523 | 68 | { | 61 | { |
1524 | 69 | // Visual C++ .net appears to require operator delete if | 62 | // Visual C++ .net appears to require operator delete if |
1525 | 70 | 63 | ||
1526 | === modified file 'src/ca/legacy/pcas/generic/casMonEvent.h' | |||
1527 | --- src/ca/legacy/pcas/generic/casMonEvent.h 2010-10-05 19:27:37 +0000 | |||
1528 | +++ src/ca/legacy/pcas/generic/casMonEvent.h 2012-04-12 17:46:27 +0000 | |||
1529 | @@ -49,7 +49,6 @@ | |||
1530 | 49 | private: | 49 | private: |
1531 | 50 | class casMonitor & monitor; | 50 | class casMonitor & monitor; |
1532 | 51 | smartConstGDDPointer pValue; | 51 | smartConstGDDPointer pValue; |
1533 | 52 | void * operator new ( size_t ); | ||
1534 | 53 | void operator delete ( void * ); | 52 | void operator delete ( void * ); |
1535 | 54 | caStatus cbFunc ( | 53 | caStatus cbFunc ( |
1536 | 55 | casCoreClient &, | 54 | casCoreClient &, |
1537 | 56 | 55 | ||
1538 | === modified file 'src/ca/legacy/pcas/generic/casMonitor.cc' | |||
1539 | --- src/ca/legacy/pcas/generic/casMonitor.cc 2010-10-05 19:27:37 +0000 | |||
1540 | +++ src/ca/legacy/pcas/generic/casMonitor.cc 2012-04-12 17:46:27 +0000 | |||
1541 | @@ -77,7 +77,7 @@ | |||
1542 | 77 | this->overFlowEvent.swapValues ( *pLog ); | 77 | this->overFlowEvent.swapValues ( *pLog ); |
1543 | 78 | eventLogQue.insertAfter ( *pLog, this->overFlowEvent ); | 78 | eventLogQue.insertAfter ( *pLog, this->overFlowEvent ); |
1544 | 79 | assert ( this->nPend != UCHAR_MAX ); | 79 | assert ( this->nPend != UCHAR_MAX ); |
1546 | 80 | this->nPend++; // X aCC 818 | 80 | this->nPend++; |
1547 | 81 | } | 81 | } |
1548 | 82 | else { | 82 | else { |
1549 | 83 | // replace the old OVF value with the current one | 83 | // replace the old OVF value with the current one |
1550 | @@ -97,7 +97,7 @@ | |||
1551 | 97 | } | 97 | } |
1552 | 98 | pLog->assign ( event ); | 98 | pLog->assign ( event ); |
1553 | 99 | assert ( this->nPend != UCHAR_MAX ); | 99 | assert ( this->nPend != UCHAR_MAX ); |
1555 | 100 | this->nPend++; // X aCC 818 | 100 | this->nPend++; |
1556 | 101 | } | 101 | } |
1557 | 102 | eventLogQue.add ( *pLog ); | 102 | eventLogQue.add ( *pLog ); |
1558 | 103 | } | 103 | } |
1559 | @@ -117,7 +117,7 @@ | |||
1560 | 117 | 117 | ||
1561 | 118 | client.getCAS().incrEventsProcessedCounter (); | 118 | client.getCAS().incrEventsProcessedCounter (); |
1562 | 119 | assert ( this->nPend != 0u ); | 119 | assert ( this->nPend != 0u ); |
1564 | 120 | this->nPend--; // X aCC 818 | 120 | this->nPend--; |
1565 | 121 | 121 | ||
1566 | 122 | // delete event object if it isnt a cache entry | 122 | // delete event object if it isnt a cache entry |
1567 | 123 | // saved in the call back object | 123 | // saved in the call back object |
1568 | 124 | 124 | ||
1569 | === modified file 'src/ca/legacy/pcas/generic/casMonitor.h' | |||
1570 | --- src/ca/legacy/pcas/generic/casMonitor.h 2010-10-05 19:27:37 +0000 | |||
1571 | +++ src/ca/legacy/pcas/generic/casMonitor.h 2012-04-12 17:46:27 +0000 | |||
1572 | @@ -39,7 +39,7 @@ | |||
1573 | 39 | class casMonitor; | 39 | class casMonitor; |
1574 | 40 | class casClientMutex; | 40 | class casClientMutex; |
1575 | 41 | 41 | ||
1577 | 42 | class casMonitorCallbackInterface { // X aCC 655 | 42 | class casMonitorCallbackInterface { |
1578 | 43 | public: | 43 | public: |
1579 | 44 | virtual caStatus casMonitorCallBack ( | 44 | virtual caStatus casMonitorCallBack ( |
1580 | 45 | epicsGuard < casClientMutex > &, casMonitor &, | 45 | epicsGuard < casClientMutex > &, casMonitor &, |
1581 | @@ -87,7 +87,6 @@ | |||
1582 | 87 | unsigned char nPend; | 87 | unsigned char nPend; |
1583 | 88 | bool destroyPending; | 88 | bool destroyPending; |
1584 | 89 | bool ovf; | 89 | bool ovf; |
1585 | 90 | void * operator new ( size_t ); | ||
1586 | 91 | void operator delete ( void * ); | 90 | void operator delete ( void * ); |
1587 | 92 | casMonitor ( const casMonitor & ); | 91 | casMonitor ( const casMonitor & ); |
1588 | 93 | casMonitor & operator = ( const casMonitor & ); | 92 | casMonitor & operator = ( const casMonitor & ); |
1589 | 94 | 93 | ||
1590 | === modified file 'src/ca/legacy/pcas/generic/casPVI.cc' | |||
1591 | --- src/ca/legacy/pcas/generic/casPVI.cc 2010-10-05 19:27:37 +0000 | |||
1592 | +++ src/ca/legacy/pcas/generic/casPVI.cc 2012-04-12 17:46:27 +0000 | |||
1593 | @@ -317,7 +317,7 @@ | |||
1594 | 317 | return pMon; | 317 | return pMon; |
1595 | 318 | } | 318 | } |
1596 | 319 | 319 | ||
1598 | 320 | caServer *casPVI::getExtServer () const // X aCC 361 | 320 | caServer *casPVI::getExtServer () const |
1599 | 321 | { | 321 | { |
1600 | 322 | epicsGuard < epicsMutex > guard ( this->mutex ); | 322 | epicsGuard < epicsMutex > guard ( this->mutex ); |
1601 | 323 | if ( this->pCAS ) { | 323 | if ( this->pCAS ) { |
1602 | @@ -415,7 +415,7 @@ | |||
1603 | 415 | this->ioBlockedList::signal(); | 415 | this->ioBlockedList::signal(); |
1604 | 416 | } | 416 | } |
1605 | 417 | 417 | ||
1607 | 418 | caStatus casPVI::bestDBRType ( unsigned & dbrType ) // X aCC 361 | 418 | caStatus casPVI::bestDBRType ( unsigned & dbrType ) |
1608 | 419 | { | 419 | { |
1609 | 420 | epicsGuard < epicsMutex > guard ( this->mutex ); | 420 | epicsGuard < epicsMutex > guard ( this->mutex ); |
1610 | 421 | aitEnum bestAIT = this->bestExternalType (); | 421 | aitEnum bestAIT = this->bestExternalType (); |
1611 | 422 | 422 | ||
1612 | === modified file 'src/ca/legacy/pcas/generic/casStrmClient.cc' | |||
1613 | --- src/ca/legacy/pcas/generic/casStrmClient.cc 2010-09-29 05:44:47 +0000 | |||
1614 | +++ src/ca/legacy/pcas/generic/casStrmClient.cc 2012-04-12 17:46:27 +0000 | |||
1615 | @@ -1629,7 +1629,7 @@ | |||
1616 | 1629 | if ( ! pvar.getPV()->pPVI ) { | 1629 | if ( ! pvar.getPV()->pPVI ) { |
1617 | 1630 | // @#$!* Tornado 2 Cygnus GNU compiler bugs | 1630 | // @#$!* Tornado 2 Cygnus GNU compiler bugs |
1618 | 1631 | # if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 ) | 1631 | # if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 ) |
1620 | 1632 | pvar.getPV()->pPVI = new ( std::nothrow ) // X aCC 930 | 1632 | pvar.getPV()->pPVI = new ( std::nothrow ) |
1621 | 1633 | casPVI ( *pvar.getPV() ); | 1633 | casPVI ( *pvar.getPV() ); |
1622 | 1634 | # else | 1634 | # else |
1623 | 1635 | try { | 1635 | try { |
1624 | @@ -1678,7 +1678,7 @@ | |||
1625 | 1678 | if ( ! pChan->pChanI ) { | 1678 | if ( ! pChan->pChanI ) { |
1626 | 1679 | // @#$!* Tornado 2 Cygnus GNU compiler bugs | 1679 | // @#$!* Tornado 2 Cygnus GNU compiler bugs |
1627 | 1680 | # if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 ) | 1680 | # if ! defined (__GNUC__) || __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 92 ) |
1629 | 1681 | pChan->pChanI = new ( std::nothrow ) // X aCC 930 | 1681 | pChan->pChanI = new ( std::nothrow ) |
1630 | 1682 | casChannelI ( * this, *pChan, | 1682 | casChannelI ( * this, *pChan, |
1631 | 1683 | * pvar.getPV()->pPVI, hdr.m_cid ); | 1683 | * pvar.getPV()->pPVI, hdr.m_cid ); |
1632 | 1684 | # else | 1684 | # else |
1633 | @@ -1848,7 +1848,7 @@ | |||
1634 | 1848 | assert ( hdr.m_cid == chan.getCID() ); | 1848 | assert ( hdr.m_cid == chan.getCID() ); |
1635 | 1849 | status = this->out.copyInHeader ( CA_PROTO_CREATE_CHAN, 0, | 1849 | status = this->out.copyInHeader ( CA_PROTO_CREATE_CHAN, 0, |
1636 | 1850 | static_cast <ca_uint16_t> ( nativeTypeDBR ), | 1850 | static_cast <ca_uint16_t> ( nativeTypeDBR ), |
1638 | 1851 | static_cast <ca_uint32_t> ( nativeCount ), // X aCC 392 | 1851 | static_cast <ca_uint32_t> ( nativeCount ), |
1639 | 1852 | chan.getCID(), chan.getSID(), 0 ); | 1852 | chan.getCID(), chan.getSID(), 0 ); |
1640 | 1853 | if ( status != S_cas_success ) { | 1853 | if ( status != S_cas_success ) { |
1641 | 1854 | this->out.popCtx ( outctx ); | 1854 | this->out.popCtx ( outctx ); |
1642 | @@ -2150,7 +2150,7 @@ | |||
1643 | 2150 | } | 2150 | } |
1644 | 2151 | 2151 | ||
1645 | 2152 | class channelDestroyEvent * pEvent = | 2152 | class channelDestroyEvent * pEvent = |
1647 | 2153 | new ( std::nothrow ) class channelDestroyEvent ( // X aCC 930 | 2153 | new ( std::nothrow ) class channelDestroyEvent ( |
1648 | 2154 | immediateUninstallNeeded ? & chan : 0, | 2154 | immediateUninstallNeeded ? & chan : 0, |
1649 | 2155 | chan.getSID() ); | 2155 | chan.getSID() ); |
1650 | 2156 | if ( pEvent ) { | 2156 | if ( pEvent ) { |
1651 | 2157 | 2157 | ||
1652 | === modified file 'src/ca/legacy/pcas/generic/casdef.h' | |||
1653 | --- src/ca/legacy/pcas/generic/casdef.h 2009-08-06 01:36:30 +0000 | |||
1654 | +++ src/ca/legacy/pcas/generic/casdef.h 2012-04-12 17:46:27 +0000 | |||
1655 | @@ -113,7 +113,7 @@ | |||
1656 | 113 | class casCtx; | 113 | class casCtx; |
1657 | 114 | class casChannel; | 114 | class casChannel; |
1658 | 115 | 115 | ||
1660 | 116 | class epicsShareClass pvExistReturn { // X aCC 361 | 116 | class epicsShareClass pvExistReturn { |
1661 | 117 | public: | 117 | public: |
1662 | 118 | // most server tools will use this | 118 | // most server tools will use this |
1663 | 119 | pvExistReturn ( pvExistReturnEnum s = pverDoesNotExistHere ); | 119 | pvExistReturn ( pvExistReturnEnum s = pverDoesNotExistHere ); |
1664 | 120 | 120 | ||
1665 | === modified file 'src/ca/legacy/pcas/generic/chanIntfForPV.h' | |||
1666 | --- src/ca/legacy/pcas/generic/chanIntfForPV.h 2010-10-05 19:27:37 +0000 | |||
1667 | +++ src/ca/legacy/pcas/generic/chanIntfForPV.h 2012-04-12 17:46:27 +0000 | |||
1668 | @@ -41,7 +41,7 @@ | |||
1669 | 41 | class casEventMask; | 41 | class casEventMask; |
1670 | 42 | class gdd; | 42 | class gdd; |
1671 | 43 | 43 | ||
1673 | 44 | class casChannelDestroyFromPV { // X aCC 655 | 44 | class casChannelDestroyFromPV { |
1674 | 45 | public: | 45 | public: |
1675 | 46 | virtual void postDestroyEvent () = 0; | 46 | virtual void postDestroyEvent () = 0; |
1676 | 47 | protected: | 47 | protected: |
1677 | 48 | 48 | ||
1678 | === modified file 'src/ca/legacy/pcas/generic/inBuf.cc' | |||
1679 | --- src/ca/legacy/pcas/generic/inBuf.cc 2010-10-05 19:27:37 +0000 | |||
1680 | +++ src/ca/legacy/pcas/generic/inBuf.cc 2012-04-12 17:46:27 +0000 | |||
1681 | @@ -117,7 +117,7 @@ | |||
1682 | 117 | // | 117 | // |
1683 | 118 | // inBuf::pushCtx () | 118 | // inBuf::pushCtx () |
1684 | 119 | // | 119 | // |
1686 | 120 | const inBufCtx inBuf::pushCtx ( bufSizeT headerSize, // X aCC 361 | 120 | const inBufCtx inBuf::pushCtx ( bufSizeT headerSize, |
1687 | 121 | bufSizeT bodySize ) | 121 | bufSizeT bodySize ) |
1688 | 122 | { | 122 | { |
1689 | 123 | if ( headerSize + bodySize > ( this->bytesInBuffer - this->nextReadIndex ) || | 123 | if ( headerSize + bodySize > ( this->bytesInBuffer - this->nextReadIndex ) || |
1690 | @@ -140,7 +140,7 @@ | |||
1691 | 140 | // | 140 | // |
1692 | 141 | // inBuf::popCtx () | 141 | // inBuf::popCtx () |
1693 | 142 | // | 142 | // |
1695 | 143 | bufSizeT inBuf::popCtx ( const inBufCtx &ctx ) // X aCC 361 | 143 | bufSizeT inBuf::popCtx ( const inBufCtx &ctx ) |
1696 | 144 | { | 144 | { |
1697 | 145 | if ( ctx.stat==inBufCtx::pushCtxSuccess ) { | 145 | if ( ctx.stat==inBufCtx::pushCtxSuccess ) { |
1698 | 146 | bufSizeT bytesRemoved = this->nextReadIndex; | 146 | bufSizeT bytesRemoved = this->nextReadIndex; |
1699 | 147 | 147 | ||
1700 | === modified file 'src/ca/legacy/pcas/generic/inBuf.h' | |||
1701 | --- src/ca/legacy/pcas/generic/inBuf.h 2009-07-30 23:48:43 +0000 | |||
1702 | +++ src/ca/legacy/pcas/generic/inBuf.h 2012-04-12 17:46:27 +0000 | |||
1703 | @@ -44,7 +44,7 @@ | |||
1704 | 44 | bufSizeT nextReadIndex; | 44 | bufSizeT nextReadIndex; |
1705 | 45 | }; | 45 | }; |
1706 | 46 | 46 | ||
1708 | 47 | class inBufClient { // X aCC 655 | 47 | class inBufClient { |
1709 | 48 | public: | 48 | public: |
1710 | 49 | enum fillCondition { casFillNone, casFillProgress, | 49 | enum fillCondition { casFillNone, casFillProgress, |
1711 | 50 | casFillDisconnect }; | 50 | casFillDisconnect }; |
1712 | 51 | 51 | ||
1713 | === modified file 'src/ca/legacy/pcas/generic/outBuf.cc' | |||
1714 | --- src/ca/legacy/pcas/generic/outBuf.cc 2010-10-05 19:27:37 +0000 | |||
1715 | +++ src/ca/legacy/pcas/generic/outBuf.cc 2012-04-12 17:46:27 +0000 | |||
1716 | @@ -265,7 +265,7 @@ | |||
1717 | 265 | // | 265 | // |
1718 | 266 | // outBuf::pushCtx () | 266 | // outBuf::pushCtx () |
1719 | 267 | // | 267 | // |
1721 | 268 | const outBufCtx outBuf::pushCtx ( bufSizeT headerSize, // X aCC 361 | 268 | const outBufCtx outBuf::pushCtx ( bufSizeT headerSize, |
1722 | 269 | bufSizeT maxBodySize, | 269 | bufSizeT maxBodySize, |
1723 | 270 | void *&pHeader ) | 270 | void *&pHeader ) |
1724 | 271 | { | 271 | { |
1725 | @@ -292,7 +292,7 @@ | |||
1726 | 292 | // | 292 | // |
1727 | 293 | // outBuf::popCtx () | 293 | // outBuf::popCtx () |
1728 | 294 | // | 294 | // |
1730 | 295 | bufSizeT outBuf::popCtx (const outBufCtx &ctx) // X aCC 361 | 295 | bufSizeT outBuf::popCtx (const outBufCtx &ctx) |
1731 | 296 | { | 296 | { |
1732 | 297 | if (ctx.stat==outBufCtx::pushCtxSuccess) { | 297 | if (ctx.stat==outBufCtx::pushCtxSuccess) { |
1733 | 298 | bufSizeT bytesAdded = this->stack; | 298 | bufSizeT bytesAdded = this->stack; |
1734 | 299 | 299 | ||
1735 | === modified file 'src/ca/legacy/pcas/generic/outBuf.h' | |||
1736 | --- src/ca/legacy/pcas/generic/outBuf.h 2009-07-25 00:43:28 +0000 | |||
1737 | +++ src/ca/legacy/pcas/generic/outBuf.h 2012-04-12 17:46:27 +0000 | |||
1738 | @@ -45,7 +45,7 @@ | |||
1739 | 45 | bufSizeT stack; | 45 | bufSizeT stack; |
1740 | 46 | }; | 46 | }; |
1741 | 47 | 47 | ||
1743 | 48 | class outBufClient { // X aCC 655 | 48 | class outBufClient { |
1744 | 49 | public: | 49 | public: |
1745 | 50 | enum flushCondition { | 50 | enum flushCondition { |
1746 | 51 | flushNone = 0, | 51 | flushNone = 0, |
1747 | 52 | 52 | ||
1748 | === modified file 'src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc' | |||
1749 | --- src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc 2010-10-05 19:27:37 +0000 | |||
1750 | +++ src/ca/legacy/pcas/io/bsdSocket/caServerIO.cc 2012-04-12 17:46:27 +0000 | |||
1751 | @@ -167,7 +167,7 @@ | |||
1752 | 167 | // | 167 | // |
1753 | 168 | // getToken() | 168 | // getToken() |
1754 | 169 | // | 169 | // |
1756 | 170 | static char *getToken(const char **ppString, // X aCC 361 | 170 | static char *getToken(const char **ppString, |
1757 | 171 | char *pBuf, unsigned bufSIze) | 171 | char *pBuf, unsigned bufSIze) |
1758 | 172 | { | 172 | { |
1759 | 173 | const char *pToken; | 173 | const char *pToken; |
1760 | 174 | 174 | ||
1761 | === modified file 'src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc' | |||
1762 | --- src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc 2009-08-04 19:10:30 +0000 | |||
1763 | +++ src/ca/legacy/pcas/io/bsdSocket/casDGIntfIO.cc 2012-04-12 17:46:27 +0000 | |||
1764 | @@ -297,7 +297,7 @@ | |||
1765 | 297 | { | 297 | { |
1766 | 298 | osiSockIoctl_t yes = true; | 298 | osiSockIoctl_t yes = true; |
1767 | 299 | 299 | ||
1769 | 300 | int status = socket_ioctl ( this->sock, FIONBIO, &yes ); // X aCC 392 | 300 | int status = socket_ioctl ( this->sock, FIONBIO, &yes ); |
1770 | 301 | if ( status < 0 ) { | 301 | if ( status < 0 ) { |
1771 | 302 | char sockErrBuf[64]; | 302 | char sockErrBuf[64]; |
1772 | 303 | epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); | 303 | epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); |
1773 | @@ -307,7 +307,7 @@ | |||
1774 | 307 | 307 | ||
1775 | 308 | if ( this->bcastRecvSock != INVALID_SOCKET ) { | 308 | if ( this->bcastRecvSock != INVALID_SOCKET ) { |
1776 | 309 | yes = true; | 309 | yes = true; |
1778 | 310 | int status = socket_ioctl ( this->bcastRecvSock, // X aCC 392 | 310 | int status = socket_ioctl ( this->bcastRecvSock, |
1779 | 311 | FIONBIO, &yes ); | 311 | FIONBIO, &yes ); |
1780 | 312 | if ( status < 0 ) { | 312 | if ( status < 0 ) { |
1781 | 313 | char sockErrBuf[64]; | 313 | char sockErrBuf[64]; |
1782 | @@ -319,7 +319,7 @@ | |||
1783 | 319 | } | 319 | } |
1784 | 320 | 320 | ||
1785 | 321 | inBufClient::fillCondition | 321 | inBufClient::fillCondition |
1787 | 322 | casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size, // X aCC 361 | 322 | casDGIntfIO::osdRecv ( char * pBufIn, bufSizeT size, |
1788 | 323 | fillParameter parm, bufSizeT & actualSize, caNetAddr & fromOut ) | 323 | fillParameter parm, bufSizeT & actualSize, caNetAddr & fromOut ) |
1789 | 324 | { | 324 | { |
1790 | 325 | int status; | 325 | int status; |
1791 | @@ -366,7 +366,7 @@ | |||
1792 | 366 | } | 366 | } |
1793 | 367 | 367 | ||
1794 | 368 | outBufClient::flushCondition | 368 | outBufClient::flushCondition |
1796 | 369 | casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size, // X aCC 361 | 369 | casDGIntfIO::osdSend ( const char * pBufIn, bufSizeT size, |
1797 | 370 | const caNetAddr & to ) | 370 | const caNetAddr & to ) |
1798 | 371 | { | 371 | { |
1799 | 372 | int status; | 372 | int status; |
1800 | 373 | 373 | ||
1801 | === modified file 'src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc' | |||
1802 | --- src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc 2010-08-10 21:05:46 +0000 | |||
1803 | +++ src/ca/legacy/pcas/io/bsdSocket/casIntfIO.cc 2012-04-12 17:46:27 +0000 | |||
1804 | @@ -198,7 +198,7 @@ | |||
1805 | 198 | int status; | 198 | int status; |
1806 | 199 | osiSockIoctl_t yes = true; | 199 | osiSockIoctl_t yes = true; |
1807 | 200 | 200 | ||
1809 | 201 | status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392 | 201 | status = socket_ioctl(this->sock, FIONBIO, &yes); |
1810 | 202 | if ( status < 0 ) { | 202 | if ( status < 0 ) { |
1811 | 203 | char sockErrBuf[64]; | 203 | char sockErrBuf[64]; |
1812 | 204 | epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); | 204 | epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) ); |
1813 | 205 | 205 | ||
1814 | === modified file 'src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc' | |||
1815 | --- src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc 2010-08-10 21:05:46 +0000 | |||
1816 | +++ src/ca/legacy/pcas/io/bsdSocket/casStreamIO.cc 2012-04-12 17:46:27 +0000 | |||
1817 | @@ -168,7 +168,7 @@ | |||
1818 | 168 | 168 | ||
1819 | 169 | // casStreamIO::osdRecv() | 169 | // casStreamIO::osdRecv() |
1820 | 170 | inBufClient::fillCondition | 170 | inBufClient::fillCondition |
1822 | 171 | casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes, // X aCC 361 | 171 | casStreamIO::osdRecv ( char * pInBuf, bufSizeT nBytes, |
1823 | 172 | bufSizeT & nBytesActual ) | 172 | bufSizeT & nBytesActual ) |
1824 | 173 | { | 173 | { |
1825 | 174 | int nchars; | 174 | int nchars; |
1826 | @@ -250,7 +250,7 @@ | |||
1827 | 250 | int status; | 250 | int status; |
1828 | 251 | osiSockIoctl_t yes = true; | 251 | osiSockIoctl_t yes = true; |
1829 | 252 | 252 | ||
1831 | 253 | status = socket_ioctl(this->sock, FIONBIO, &yes); // X aCC 392 | 253 | status = socket_ioctl(this->sock, FIONBIO, &yes); |
1832 | 254 | if (status>=0) { | 254 | if (status>=0) { |
1833 | 255 | this->blockingFlag = xIsntBlocking; | 255 | this->blockingFlag = xIsntBlocking; |
1834 | 256 | } | 256 | } |
1835 | 257 | 257 | ||
1836 | === modified file 'src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp' | |||
1837 | --- src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp 2004-10-08 14:58:59 +0000 | |||
1838 | +++ src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.cpp 2012-04-12 17:46:27 +0000 | |||
1839 | @@ -67,13 +67,6 @@ | |||
1840 | 67 | } | 67 | } |
1841 | 68 | #endif | 68 | #endif |
1842 | 69 | 69 | ||
1843 | 70 | void * ipIgnoreEntry::operator new ( size_t ) // X aCC 361 | ||
1844 | 71 | { | ||
1845 | 72 | // The HPUX compiler seems to require this even though no code | ||
1846 | 73 | // calls it directly | ||
1847 | 74 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
1848 | 75 | } | ||
1849 | 76 | |||
1850 | 77 | void ipIgnoreEntry::operator delete ( void * ) | 70 | void ipIgnoreEntry::operator delete ( void * ) |
1851 | 78 | { | 71 | { |
1852 | 79 | // Visual C++ .net appears to require operator delete if | 72 | // Visual C++ .net appears to require operator delete if |
1853 | 80 | 73 | ||
1854 | === modified file 'src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h' | |||
1855 | --- src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h 2010-10-05 19:27:37 +0000 | |||
1856 | +++ src/ca/legacy/pcas/io/bsdSocket/ipIgnoreEntry.h 2012-04-12 17:46:27 +0000 | |||
1857 | @@ -44,7 +44,6 @@ | |||
1858 | 44 | unsigned ipAddr; | 44 | unsigned ipAddr; |
1859 | 45 | ipIgnoreEntry ( const ipIgnoreEntry & ); | 45 | ipIgnoreEntry ( const ipIgnoreEntry & ); |
1860 | 46 | ipIgnoreEntry & operator = ( const ipIgnoreEntry & ); | 46 | ipIgnoreEntry & operator = ( const ipIgnoreEntry & ); |
1861 | 47 | void * operator new ( size_t size ); | ||
1862 | 48 | void operator delete ( void * ); | 47 | void operator delete ( void * ); |
1863 | 49 | }; | 48 | }; |
1864 | 50 | 49 | ||
1865 | 51 | 50 | ||
1866 | === modified file 'src/ioc/db/dbCAC.h' | |||
1867 | --- src/ioc/db/dbCAC.h 2011-06-01 22:22:12 +0000 | |||
1868 | +++ src/ioc/db/dbCAC.h 2012-04-12 17:46:27 +0000 | |||
1869 | @@ -62,7 +62,7 @@ | |||
1870 | 62 | class dbPutNotifyBlocker; | 62 | class dbPutNotifyBlocker; |
1871 | 63 | class dbSubscriptionIO; | 63 | class dbSubscriptionIO; |
1872 | 64 | 64 | ||
1874 | 65 | class dbBaseIO // X aCC 655 | 65 | class dbBaseIO |
1875 | 66 | : public chronIntIdRes < dbBaseIO > { | 66 | : public chronIntIdRes < dbBaseIO > { |
1876 | 67 | public: | 67 | public: |
1877 | 68 | virtual dbSubscriptionIO * isSubscription () = 0; | 68 | virtual dbSubscriptionIO * isSubscription () = 0; |
1878 | @@ -110,7 +110,6 @@ | |||
1879 | 110 | dbSubscriptionIO ( const dbSubscriptionIO & ); | 110 | dbSubscriptionIO ( const dbSubscriptionIO & ); |
1880 | 111 | dbSubscriptionIO & operator = ( const dbSubscriptionIO & ); | 111 | dbSubscriptionIO & operator = ( const dbSubscriptionIO & ); |
1881 | 112 | virtual ~dbSubscriptionIO (); | 112 | virtual ~dbSubscriptionIO (); |
1882 | 113 | void * operator new ( size_t size ); | ||
1883 | 114 | void operator delete ( void * ); | 113 | void operator delete ( void * ); |
1884 | 115 | }; | 114 | }; |
1885 | 116 | 115 | ||
1886 | 117 | 116 | ||
1887 | === modified file 'src/ioc/db/dbChannelIO.cpp' | |||
1888 | --- src/ioc/db/dbChannelIO.cpp 2010-10-05 19:27:37 +0000 | |||
1889 | +++ src/ioc/db/dbChannelIO.cpp 2012-04-12 17:46:27 +0000 | |||
1890 | @@ -204,13 +204,6 @@ | |||
1891 | 204 | return freeList.allocate ( size ); | 204 | return freeList.allocate ( size ); |
1892 | 205 | } | 205 | } |
1893 | 206 | 206 | ||
1894 | 207 | void * dbChannelIO::operator new ( size_t ) // X aCC 361 | ||
1895 | 208 | { | ||
1896 | 209 | // The HPUX compiler seems to require this even though no code | ||
1897 | 210 | // calls it directly | ||
1898 | 211 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
1899 | 212 | } | ||
1900 | 213 | |||
1901 | 214 | #ifdef CXX_PLACEMENT_DELETE | 207 | #ifdef CXX_PLACEMENT_DELETE |
1902 | 215 | void dbChannelIO::operator delete ( void *pCadaver, | 208 | void dbChannelIO::operator delete ( void *pCadaver, |
1903 | 216 | tsFreeList < dbChannelIO, 256, epicsMutexNOOP > & freeList ) | 209 | tsFreeList < dbChannelIO, 256, epicsMutexNOOP > & freeList ) |
1904 | 217 | 210 | ||
1905 | === modified file 'src/ioc/db/dbChannelIO.h' | |||
1906 | --- src/ioc/db/dbChannelIO.h 2010-10-05 19:27:37 +0000 | |||
1907 | +++ src/ioc/db/dbChannelIO.h 2012-04-12 17:46:27 +0000 | |||
1908 | @@ -111,7 +111,6 @@ | |||
1909 | 111 | epicsGuard < epicsMutex > & ) const; | 111 | epicsGuard < epicsMutex > & ) const; |
1910 | 112 | dbChannelIO ( const dbChannelIO & ); | 112 | dbChannelIO ( const dbChannelIO & ); |
1911 | 113 | dbChannelIO & operator = ( const dbChannelIO & ); | 113 | dbChannelIO & operator = ( const dbChannelIO & ); |
1912 | 114 | void * operator new ( size_t size ); | ||
1913 | 115 | void operator delete ( void * ); | 114 | void operator delete ( void * ); |
1914 | 116 | }; | 115 | }; |
1915 | 117 | 116 | ||
1916 | 118 | 117 | ||
1917 | === modified file 'src/ioc/db/dbContext.cpp' | |||
1918 | --- src/ioc/db/dbContext.cpp 2010-10-05 19:27:37 +0000 | |||
1919 | +++ src/ioc/db/dbContext.cpp 2012-04-12 17:46:27 +0000 | |||
1920 | @@ -83,7 +83,7 @@ | |||
1921 | 83 | } | 83 | } |
1922 | 84 | } | 84 | } |
1923 | 85 | 85 | ||
1925 | 86 | cacChannel & dbContext::createChannel ( // X aCC 361 | 86 | cacChannel & dbContext::createChannel ( |
1926 | 87 | epicsGuard < epicsMutex > & guard, const char * pName, | 87 | epicsGuard < epicsMutex > & guard, const char * pName, |
1927 | 88 | cacChannelNotify & notifyIn, cacChannel::priLev priority ) | 88 | cacChannelNotify & notifyIn, cacChannel::priLev priority ) |
1928 | 89 | { | 89 | { |
1929 | 90 | 90 | ||
1930 | === modified file 'src/ioc/db/dbPutNotifyBlocker.cpp' | |||
1931 | --- src/ioc/db/dbPutNotifyBlocker.cpp 2011-10-19 18:07:00 +0000 | |||
1932 | +++ src/ioc/db/dbPutNotifyBlocker.cpp 2012-04-12 17:46:27 +0000 | |||
1933 | @@ -212,13 +212,6 @@ | |||
1934 | 212 | return freeList.allocate ( size ); | 212 | return freeList.allocate ( size ); |
1935 | 213 | } | 213 | } |
1936 | 214 | 214 | ||
1937 | 215 | void * dbPutNotifyBlocker::operator new ( size_t ) // X aCC 361 | ||
1938 | 216 | { | ||
1939 | 217 | // The HPUX compiler seems to require this even though no code | ||
1940 | 218 | // calls it directly | ||
1941 | 219 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
1942 | 220 | } | ||
1943 | 221 | |||
1944 | 222 | #ifdef CXX_PLACEMENT_DELETE | 215 | #ifdef CXX_PLACEMENT_DELETE |
1945 | 223 | void dbPutNotifyBlocker::operator delete ( void *pCadaver, | 216 | void dbPutNotifyBlocker::operator delete ( void *pCadaver, |
1946 | 224 | tsFreeList < dbPutNotifyBlocker, 64, epicsMutexNOOP > & freeList ) | 217 | tsFreeList < dbPutNotifyBlocker, 64, epicsMutexNOOP > & freeList ) |
1947 | 225 | 218 | ||
1948 | === modified file 'src/ioc/db/dbPutNotifyBlocker.h' | |||
1949 | --- src/ioc/db/dbPutNotifyBlocker.h 2010-10-05 19:27:37 +0000 | |||
1950 | +++ src/ioc/db/dbPutNotifyBlocker.h 2012-04-12 17:46:27 +0000 | |||
1951 | @@ -82,7 +82,6 @@ | |||
1952 | 82 | dbPutNotifyBlocker ( const dbPutNotifyBlocker & ); | 82 | dbPutNotifyBlocker ( const dbPutNotifyBlocker & ); |
1953 | 83 | dbPutNotifyBlocker & operator = ( const dbPutNotifyBlocker & ); | 83 | dbPutNotifyBlocker & operator = ( const dbPutNotifyBlocker & ); |
1954 | 84 | virtual ~dbPutNotifyBlocker (); | 84 | virtual ~dbPutNotifyBlocker (); |
1955 | 85 | void * operator new ( size_t size ); | ||
1956 | 86 | void operator delete ( void * ); | 85 | void operator delete ( void * ); |
1957 | 87 | }; | 86 | }; |
1958 | 88 | 87 | ||
1959 | 89 | 88 | ||
1960 | === modified file 'src/ioc/db/dbSubscriptionIO.cpp' | |||
1961 | --- src/ioc/db/dbSubscriptionIO.cpp 2010-10-05 19:27:37 +0000 | |||
1962 | +++ src/ioc/db/dbSubscriptionIO.cpp 2012-04-12 17:46:27 +0000 | |||
1963 | @@ -94,13 +94,6 @@ | |||
1964 | 94 | this->chan.pName(guard), this->type, this->count ); | 94 | this->chan.pName(guard), this->type, this->count ); |
1965 | 95 | } | 95 | } |
1966 | 96 | 96 | ||
1967 | 97 | void * dbSubscriptionIO::operator new ( size_t ) // X aCC 361 | ||
1968 | 98 | { | ||
1969 | 99 | // The HPUX compiler seems to require this even though no code | ||
1970 | 100 | // calls it directly | ||
1971 | 101 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
1972 | 102 | } | ||
1973 | 103 | |||
1974 | 104 | void dbSubscriptionIO::operator delete ( void * ) | 97 | void dbSubscriptionIO::operator delete ( void * ) |
1975 | 105 | { | 98 | { |
1976 | 106 | // Visual C++ .net appears to require operator delete if | 99 | // Visual C++ .net appears to require operator delete if |
1977 | 107 | 100 | ||
1978 | === modified file 'src/libCom/cxxTemplates/resourceLib.h' | |||
1979 | --- src/libCom/cxxTemplates/resourceLib.h 2010-10-05 19:27:37 +0000 | |||
1980 | +++ src/libCom/cxxTemplates/resourceLib.h 2012-04-12 17:46:27 +0000 | |||
1981 | @@ -296,7 +296,7 @@ | |||
1982 | 296 | // remove a res from the resTable | 296 | // remove a res from the resTable |
1983 | 297 | // | 297 | // |
1984 | 298 | template <class T, class ID> | 298 | template <class T, class ID> |
1986 | 299 | T * resTable<T,ID>::remove ( const ID & idIn ) // X aCC 361 | 299 | T * resTable<T,ID>::remove ( const ID & idIn ) |
1987 | 300 | { | 300 | { |
1988 | 301 | if ( this->pTable ) { | 301 | if ( this->pTable ) { |
1989 | 302 | // search list for idIn and remove the first match | 302 | // search list for idIn and remove the first match |
1990 | @@ -341,7 +341,7 @@ | |||
1991 | 341 | // resTable::lookup () | 341 | // resTable::lookup () |
1992 | 342 | // | 342 | // |
1993 | 343 | template <class T, class ID> | 343 | template <class T, class ID> |
1995 | 344 | inline T * resTable<T,ID>::lookup ( const ID & idIn ) const // X aCC 361 | 344 | inline T * resTable<T,ID>::lookup ( const ID & idIn ) const |
1996 | 345 | { | 345 | { |
1997 | 346 | if ( this->pTable ) { | 346 | if ( this->pTable ) { |
1998 | 347 | tsSLList<T> & list = this->pTable [ this->hash ( idIn ) ]; | 347 | tsSLList<T> & list = this->pTable [ this->hash ( idIn ) ]; |
1999 | @@ -514,7 +514,7 @@ | |||
2000 | 514 | } | 514 | } |
2001 | 515 | 515 | ||
2002 | 516 | template <class T, class ID> | 516 | template <class T, class ID> |
2004 | 517 | inline unsigned resTable<T,ID>::tableSize () const // X aCC 361 | 517 | inline unsigned resTable<T,ID>::tableSize () const |
2005 | 518 | { | 518 | { |
2006 | 519 | if ( this->pTable ) { | 519 | if ( this->pTable ) { |
2007 | 520 | return ( this->hashIxMask + 1 ) + this->nextSplitIndex; | 520 | return ( this->hashIxMask + 1 ) + this->nextSplitIndex; |
2008 | @@ -1010,7 +1010,7 @@ | |||
2009 | 1010 | // intId::operator == () | 1010 | // intId::operator == () |
2010 | 1011 | // | 1011 | // |
2011 | 1012 | template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH> | 1012 | template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH> |
2013 | 1013 | inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator == // X aCC 361 | 1013 | inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator == |
2014 | 1014 | (const intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH> &idIn) const | 1014 | (const intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH> &idIn) const |
2015 | 1015 | { | 1015 | { |
2016 | 1016 | return this->id == idIn.id; | 1016 | return this->id == idIn.id; |
2017 | @@ -1020,7 +1020,7 @@ | |||
2018 | 1020 | // intId::getId () | 1020 | // intId::getId () |
2019 | 1021 | // | 1021 | // |
2020 | 1022 | template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH> | 1022 | template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH> |
2022 | 1023 | inline const T intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::getId () const // X aCC 361 | 1023 | inline const T intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::getId () const |
2023 | 1024 | { | 1024 | { |
2024 | 1025 | return this->id; | 1025 | return this->id; |
2025 | 1026 | } | 1026 | } |
2026 | @@ -1067,7 +1067,7 @@ | |||
2027 | 1067 | // intId::hash() | 1067 | // intId::hash() |
2028 | 1068 | // | 1068 | // |
2029 | 1069 | template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH> | 1069 | template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH> |
2031 | 1070 | inline resTableIndex intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::hash () const // X aCC 361 | 1070 | inline resTableIndex intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::hash () const |
2032 | 1071 | { | 1071 | { |
2033 | 1072 | return integerHash ( MIN_INDEX_WIDTH, MAX_ID_WIDTH, this->id ); | 1072 | return integerHash ( MIN_INDEX_WIDTH, MAX_ID_WIDTH, this->id ); |
2034 | 1073 | } | 1073 | } |
2035 | 1074 | 1074 | ||
2036 | === modified file 'src/libCom/fdmgr/fdmgr.cpp' | |||
2037 | --- src/libCom/fdmgr/fdmgr.cpp 2004-10-08 15:12:20 +0000 | |||
2038 | +++ src/libCom/fdmgr/fdmgr.cpp 2012-04-12 17:46:27 +0000 | |||
2039 | @@ -228,7 +228,7 @@ | |||
2040 | 228 | return 0; | 228 | return 0; |
2041 | 229 | } | 229 | } |
2042 | 230 | 230 | ||
2044 | 231 | extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback ( // X aCC 361 | 231 | extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback ( |
2045 | 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) |
2046 | 233 | { | 233 | { |
2047 | 234 | oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx); | 234 | oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx); |
2048 | @@ -270,7 +270,7 @@ | |||
2049 | 270 | } | 270 | } |
2050 | 271 | } | 271 | } |
2051 | 272 | 272 | ||
2053 | 273 | extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback ( // X aCC 361 | 273 | extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback ( |
2054 | 274 | fdctx *pfdctx, SOCKET fd, enum fdi_type fdi) | 274 | fdctx *pfdctx, SOCKET fd, enum fdi_type fdi) |
2055 | 275 | { | 275 | { |
2056 | 276 | oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx); | 276 | oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx); |
2057 | 277 | 277 | ||
2058 | === modified file 'src/libCom/misc/ipAddrToAsciiAsynchronous.cpp' | |||
2059 | --- src/libCom/misc/ipAddrToAsciiAsynchronous.cpp 2008-10-21 20:26:48 +0000 | |||
2060 | +++ src/libCom/misc/ipAddrToAsciiAsynchronous.cpp 2012-04-12 17:46:27 +0000 | |||
2061 | @@ -61,7 +61,6 @@ | |||
2062 | 61 | bool pending; | 61 | bool pending; |
2063 | 62 | void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ); | 62 | void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ); |
2064 | 63 | void release (); | 63 | void release (); |
2065 | 64 | void * operator new ( size_t ); | ||
2066 | 65 | void operator delete ( void * ); | 64 | void operator delete ( void * ); |
2067 | 66 | friend class ipAddrToAsciiEnginePrivate; | 65 | friend class ipAddrToAsciiEnginePrivate; |
2068 | 67 | ipAddrToAsciiTransactionPrivate & operator = ( const ipAddrToAsciiTransactionPrivate & ); | 66 | ipAddrToAsciiTransactionPrivate & operator = ( const ipAddrToAsciiTransactionPrivate & ); |
2069 | @@ -272,13 +271,6 @@ | |||
2070 | 272 | } | 271 | } |
2071 | 273 | #endif | 272 | #endif |
2072 | 274 | 273 | ||
2073 | 275 | void * ipAddrToAsciiTransactionPrivate::operator new ( size_t ) // X aCC 361 | ||
2074 | 276 | { | ||
2075 | 277 | // The HPUX compiler seems to require this even though no code | ||
2076 | 278 | // calls it directly | ||
2077 | 279 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
2078 | 280 | } | ||
2079 | 281 | |||
2080 | 282 | void ipAddrToAsciiTransactionPrivate::operator delete ( void * ) | 274 | void ipAddrToAsciiTransactionPrivate::operator delete ( void * ) |
2081 | 283 | { | 275 | { |
2082 | 284 | // Visual C++ .net appears to require operator delete if | 276 | // Visual C++ .net appears to require operator delete if |
2083 | 285 | 277 | ||
2084 | === modified file 'src/libCom/misc/ipAddrToAsciiAsynchronous.h' | |||
2085 | --- src/libCom/misc/ipAddrToAsciiAsynchronous.h 2010-10-05 19:27:37 +0000 | |||
2086 | +++ src/libCom/misc/ipAddrToAsciiAsynchronous.h 2012-04-12 17:46:27 +0000 | |||
2087 | @@ -36,7 +36,7 @@ | |||
2088 | 36 | virtual ~ipAddrToAsciiCallBack () = 0; | 36 | virtual ~ipAddrToAsciiCallBack () = 0; |
2089 | 37 | }; | 37 | }; |
2090 | 38 | 38 | ||
2092 | 39 | class epicsShareClass ipAddrToAsciiTransaction { // X aCC 655 | 39 | class epicsShareClass ipAddrToAsciiTransaction { |
2093 | 40 | public: | 40 | public: |
2094 | 41 | virtual void release () = 0; | 41 | virtual void release () = 0; |
2095 | 42 | virtual void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ) = 0; | 42 | virtual void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ) = 0; |
2096 | @@ -46,7 +46,7 @@ | |||
2097 | 46 | virtual ~ipAddrToAsciiTransaction () = 0; | 46 | virtual ~ipAddrToAsciiTransaction () = 0; |
2098 | 47 | }; | 47 | }; |
2099 | 48 | 48 | ||
2101 | 49 | class epicsShareClass ipAddrToAsciiEngine { // X aCC 655 | 49 | class epicsShareClass ipAddrToAsciiEngine { |
2102 | 50 | public: | 50 | public: |
2103 | 51 | virtual void release () = 0; | 51 | virtual void release () = 0; |
2104 | 52 | virtual ipAddrToAsciiTransaction & createTransaction () = 0; | 52 | virtual ipAddrToAsciiTransaction & createTransaction () = 0; |
2105 | 53 | 53 | ||
2106 | === modified file 'src/libCom/osi/epicsMutex.cpp' | |||
2107 | --- src/libCom/osi/epicsMutex.cpp 2010-03-17 01:09:51 +0000 | |||
2108 | +++ src/libCom/osi/epicsMutex.cpp 2012-04-12 17:46:27 +0000 | |||
2109 | @@ -239,7 +239,7 @@ | |||
2110 | 239 | } | 239 | } |
2111 | 240 | } | 240 | } |
2112 | 241 | 241 | ||
2114 | 242 | bool epicsMutex::tryLock () // X aCC 361 | 242 | bool epicsMutex::tryLock () |
2115 | 243 | { | 243 | { |
2116 | 244 | epicsMutexLockStatus status = epicsMutexTryLock ( this->id ); | 244 | epicsMutexLockStatus status = epicsMutexTryLock ( this->id ); |
2117 | 245 | if ( status == epicsMutexLockOK ) { | 245 | if ( status == epicsMutexLockOK ) { |
2118 | 246 | 246 | ||
2119 | === modified file 'src/libCom/osi/os/posix/osdTime.cpp' | |||
2120 | --- src/libCom/osi/os/posix/osdTime.cpp 2008-09-15 20:07:23 +0000 | |||
2121 | +++ src/libCom/osi/os/posix/osdTime.cpp 2012-04-12 17:46:27 +0000 | |||
2122 | @@ -60,7 +60,7 @@ | |||
2123 | 60 | static int done = timeRegister(); | 60 | static int done = timeRegister(); |
2124 | 61 | 61 | ||
2125 | 62 | 62 | ||
2127 | 63 | int epicsTime_gmtime ( const time_t *pAnsiTime, // X aCC 361 | 63 | int epicsTime_gmtime ( const time_t *pAnsiTime, |
2128 | 64 | struct tm *pTM ) | 64 | struct tm *pTM ) |
2129 | 65 | { | 65 | { |
2130 | 66 | struct tm * pRet = gmtime_r ( pAnsiTime, pTM ); | 66 | struct tm * pRet = gmtime_r ( pAnsiTime, pTM ); |
2131 | @@ -72,7 +72,7 @@ | |||
2132 | 72 | } | 72 | } |
2133 | 73 | } | 73 | } |
2134 | 74 | 74 | ||
2136 | 75 | int epicsTime_localtime ( const time_t *clock, // X aCC 361 | 75 | int epicsTime_localtime ( const time_t *clock, |
2137 | 76 | struct tm *result ) | 76 | struct tm *result ) |
2138 | 77 | { | 77 | { |
2139 | 78 | struct tm * pRet = localtime_r ( clock, result ); | 78 | struct tm * pRet = localtime_r ( clock, result ); |
2140 | 79 | 79 | ||
2141 | === modified file 'src/libCom/timer/epicsTimer.h' | |||
2142 | --- src/libCom/timer/epicsTimer.h 2010-11-04 16:19:54 +0000 | |||
2143 | +++ src/libCom/timer/epicsTimer.h 2012-04-12 17:46:27 +0000 | |||
2144 | @@ -47,7 +47,7 @@ | |||
2145 | 47 | virtual void show ( unsigned int level ) const; | 47 | virtual void show ( unsigned int level ) const; |
2146 | 48 | }; | 48 | }; |
2147 | 49 | 49 | ||
2149 | 50 | class epicsShareClass epicsTimer { /* X aCC 655 */ | 50 | class epicsShareClass epicsTimer { |
2150 | 51 | public: | 51 | public: |
2151 | 52 | /* calls cancel (see warning below) and then destroys the timer */ | 52 | /* calls cancel (see warning below) and then destroys the timer */ |
2152 | 53 | virtual void destroy () = 0; | 53 | virtual void destroy () = 0; |
2153 | @@ -70,7 +70,7 @@ | |||
2154 | 70 | virtual ~epicsTimer () = 0; /* protected => delete() must not be called */ | 70 | virtual ~epicsTimer () = 0; /* protected => delete() must not be called */ |
2155 | 71 | }; | 71 | }; |
2156 | 72 | 72 | ||
2158 | 73 | class epicsTimerQueue { /* X aCC 655 */ | 73 | class epicsTimerQueue { |
2159 | 74 | public: | 74 | public: |
2160 | 75 | virtual epicsTimer & createTimer () = 0; | 75 | virtual epicsTimer & createTimer () = 0; |
2161 | 76 | virtual void show ( unsigned int level ) const = 0; | 76 | virtual void show ( unsigned int level ) const = 0; |
2162 | @@ -78,7 +78,7 @@ | |||
2163 | 78 | epicsShareFunc virtual ~epicsTimerQueue () = 0; | 78 | epicsShareFunc virtual ~epicsTimerQueue () = 0; |
2164 | 79 | }; | 79 | }; |
2165 | 80 | 80 | ||
2167 | 81 | class epicsTimerQueueActive /* X aCC 655 */ | 81 | class epicsTimerQueueActive |
2168 | 82 | : public epicsTimerQueue { | 82 | : public epicsTimerQueue { |
2169 | 83 | public: | 83 | public: |
2170 | 84 | static epicsShareFunc epicsTimerQueueActive & allocate ( | 84 | static epicsShareFunc epicsTimerQueueActive & allocate ( |
2171 | @@ -88,7 +88,7 @@ | |||
2172 | 88 | epicsShareFunc virtual ~epicsTimerQueueActive () = 0; | 88 | epicsShareFunc virtual ~epicsTimerQueueActive () = 0; |
2173 | 89 | }; | 89 | }; |
2174 | 90 | 90 | ||
2176 | 91 | class epicsTimerQueueNotify { /* X aCC 655 */ | 91 | class epicsTimerQueueNotify { |
2177 | 92 | public: | 92 | public: |
2178 | 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 */ |
2179 | 94 | /* delay to the next expire has changed */ | 94 | /* delay to the next expire has changed */ |
2180 | @@ -100,7 +100,7 @@ | |||
2181 | 100 | epicsShareFunc virtual ~epicsTimerQueueNotify () = 0; | 100 | epicsShareFunc virtual ~epicsTimerQueueNotify () = 0; |
2182 | 101 | }; | 101 | }; |
2183 | 102 | 102 | ||
2185 | 103 | class epicsTimerQueuePassive /* X aCC 655 */ | 103 | class epicsTimerQueuePassive |
2186 | 104 | : public epicsTimerQueue { | 104 | : public epicsTimerQueue { |
2187 | 105 | public: | 105 | public: |
2188 | 106 | static epicsShareFunc epicsTimerQueuePassive & create ( epicsTimerQueueNotify & ); | 106 | static epicsShareFunc epicsTimerQueuePassive & create ( epicsTimerQueueNotify & ); |
2189 | 107 | 107 | ||
2190 | === modified file 'src/libCom/timer/timer.cpp' | |||
2191 | --- src/libCom/timer/timer.cpp 2009-08-10 21:41:59 +0000 | |||
2192 | +++ src/libCom/timer/timer.cpp 2012-04-12 17:46:27 +0000 | |||
2193 | @@ -221,13 +221,6 @@ | |||
2194 | 221 | } | 221 | } |
2195 | 222 | } | 222 | } |
2196 | 223 | 223 | ||
2197 | 224 | void * timer::operator new ( size_t ) // X aCC 361 | ||
2198 | 225 | { | ||
2199 | 226 | // The HPUX compiler seems to require this even though no code | ||
2200 | 227 | // calls it directly | ||
2201 | 228 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
2202 | 229 | } | ||
2203 | 230 | |||
2204 | 231 | void timer::operator delete ( void * ) | 224 | void timer::operator delete ( void * ) |
2205 | 232 | { | 225 | { |
2206 | 233 | // Visual C++ .net appears to require operator delete if | 226 | // Visual C++ .net appears to require operator delete if |
2207 | @@ -239,13 +232,6 @@ | |||
2208 | 239 | __FILE__, __LINE__ ); | 232 | __FILE__, __LINE__ ); |
2209 | 240 | } | 233 | } |
2210 | 241 | 234 | ||
2211 | 242 | void * epicsTimerForC::operator new ( size_t ) // X aCC 361 | ||
2212 | 243 | { | ||
2213 | 244 | // The HPUX compiler seems to require this even though no code | ||
2214 | 245 | // calls it directly | ||
2215 | 246 | throw std::logic_error ( "why is the compiler calling private operator new" ); | ||
2216 | 247 | } | ||
2217 | 248 | |||
2218 | 249 | void epicsTimerForC::operator delete ( void * ) | 235 | void epicsTimerForC::operator delete ( void * ) |
2219 | 250 | { | 236 | { |
2220 | 251 | // Visual C++ .net appears to require operator delete if | 237 | // Visual C++ .net appears to require operator delete if |
2221 | 252 | 238 | ||
2222 | === modified file 'src/libCom/timer/timerPrivate.h' | |||
2223 | --- src/libCom/timer/timerPrivate.h 2010-10-05 19:27:37 +0000 | |||
2224 | +++ src/libCom/timer/timerPrivate.h 2012-04-12 17:46:27 +0000 | |||
2225 | @@ -60,7 +60,6 @@ | |||
2226 | 60 | // because if I declare placement new and delete, but | 60 | // because if I declare placement new and delete, but |
2227 | 61 | // comment out the placement delete definition there are | 61 | // comment out the placement delete definition there are |
2228 | 62 | // no undefined symbols. | 62 | // no undefined symbols. |
2229 | 63 | void * operator new ( size_t size ); | ||
2230 | 64 | void operator delete ( void * ); | 63 | void operator delete ( void * ); |
2231 | 65 | friend class timerQueue; | 64 | friend class timerQueue; |
2232 | 66 | }; | 65 | }; |
2233 | @@ -83,7 +82,6 @@ | |||
2234 | 83 | // because if I declare placement new and delete, but | 82 | // because if I declare placement new and delete, but |
2235 | 84 | // comment out the placement delete definition there are | 83 | // comment out the placement delete definition there are |
2236 | 85 | // no undefined symbols. | 84 | // no undefined symbols. |
2237 | 86 | void * operator new ( size_t size ); | ||
2238 | 87 | void operator delete ( void * ); | 85 | void operator delete ( void * ); |
2239 | 88 | friend class timerQueue; | 86 | friend class timerQueue; |
2240 | 89 | }; | 87 | }; |
2241 | @@ -118,7 +116,7 @@ | |||
2242 | 118 | friend struct epicsTimerForC; | 116 | friend struct epicsTimerForC; |
2243 | 119 | }; | 117 | }; |
2244 | 120 | 118 | ||
2246 | 121 | class timerQueueActiveMgrPrivate { // X aCC 655 | 119 | class timerQueueActiveMgrPrivate { |
2247 | 122 | public: | 120 | public: |
2248 | 123 | timerQueueActiveMgrPrivate (); | 121 | timerQueueActiveMgrPrivate (); |
2249 | 124 | protected: | 122 | protected: |
2250 | 125 | 123 | ||
2251 | === modified file 'src/std/softIoc/softMain.cpp' | |||
2252 | --- src/std/softIoc/softMain.cpp 2010-10-05 19:27:37 +0000 | |||
2253 | +++ src/std/softIoc/softMain.cpp 2012-04-12 17:46:27 +0000 | |||
2254 | @@ -129,7 +129,7 @@ | |||
2255 | 129 | } | 129 | } |
2256 | 130 | 130 | ||
2257 | 131 | softIoc_registerRecordDeviceDriver(pdbbase); | 131 | softIoc_registerRecordDeviceDriver(pdbbase); |
2259 | 132 | registryFunctionAdd("exit", (REGISTRYFUNCTION) exitSubroutine); // X aCC 331 | 132 | registryFunctionAdd("exit", (REGISTRYFUNCTION) exitSubroutine); |
2260 | 133 | 133 | ||
2261 | 134 | while (argc>1 && **argv == '-') { | 134 | while (argc>1 && **argv == '-') { |
2262 | 135 | switch ((*argv)[1]) { | 135 | switch ((*argv)[1]) { |
2263 | 136 | 136 | ||
2264 | === modified file 'src/template/base/top/caServerApp/exPV.cc' | |||
2265 | --- src/template/base/top/caServerApp/exPV.cc 2003-04-01 19:54:32 +0000 | |||
2266 | +++ src/template/base/top/caServerApp/exPV.cc 2012-04-12 17:46:27 +0000 | |||
2267 | @@ -107,7 +107,7 @@ | |||
2268 | 107 | // exScanTimer::expire () | 107 | // exScanTimer::expire () |
2269 | 108 | // | 108 | // |
2270 | 109 | epicsTimerNotify::expireStatus | 109 | epicsTimerNotify::expireStatus |
2272 | 110 | exPV::expire ( const epicsTime & /*currentTime*/ ) // X aCC 361 | 110 | exPV::expire ( const epicsTime & /*currentTime*/ ) |
2273 | 111 | { | 111 | { |
2274 | 112 | this->scan(); | 112 | this->scan(); |
2275 | 113 | if ( this->scanOn && this->getScanPeriod() > 0.0 ) { | 113 | if ( this->scanOn && this->getScanPeriod() > 0.0 ) { |
2276 | 114 | 114 | ||
2277 | === modified file 'src/template/base/top/caServerApp/exServer.cc' | |||
2278 | --- src/template/base/top/caServerApp/exServer.cc 2009-08-14 00:24:09 +0000 | |||
2279 | +++ src/template/base/top/caServerApp/exServer.cc 2012-04-12 17:46:27 +0000 | |||
2280 | @@ -167,7 +167,7 @@ | |||
2281 | 167 | // | 167 | // |
2282 | 168 | // exServer::pvExistTest() | 168 | // exServer::pvExistTest() |
2283 | 169 | // | 169 | // |
2285 | 170 | pvExistReturn exServer::pvExistTest // X aCC 361 | 170 | pvExistReturn exServer::pvExistTest |
2286 | 171 | ( const casCtx& ctxIn, const char * pPVName ) | 171 | ( const casCtx& ctxIn, const char * pPVName ) |
2287 | 172 | { | 172 | { |
2288 | 173 | // | 173 | // |
2289 | @@ -214,7 +214,7 @@ | |||
2290 | 214 | // | 214 | // |
2291 | 215 | // exServer::pvAttach() | 215 | // exServer::pvAttach() |
2292 | 216 | // | 216 | // |
2294 | 217 | pvAttachReturn exServer::pvAttach // X aCC 361 | 217 | pvAttachReturn exServer::pvAttach |
2295 | 218 | (const casCtx &ctx, const char *pName) | 218 | (const casCtx &ctx, const char *pName) |
2296 | 219 | { | 219 | { |
2297 | 220 | // | 220 | // |
2298 | 221 | 221 | ||
2299 | === modified file 'src/template/base/top/caServerApp/exServer.h' | |||
2300 | --- src/template/base/top/caServerApp/exServer.h 2009-08-18 00:32:48 +0000 | |||
2301 | +++ src/template/base/top/caServerApp/exServer.h 2012-04-12 17:46:27 +0000 | |||
2302 | @@ -103,7 +103,7 @@ | |||
2303 | 103 | // for this breaking out into a seperate class | 103 | // for this breaking out into a seperate class |
2304 | 104 | // from pvInfo) | 104 | // from pvInfo) |
2305 | 105 | // | 105 | // |
2307 | 106 | class pvEntry // X aCC 655 | 106 | class pvEntry |
2308 | 107 | : public stringId, public tsSLNode < pvEntry > { | 107 | : public stringId, public tsSLNode < pvEntry > { |
2309 | 108 | public: | 108 | public: |
2310 | 109 | pvEntry ( pvInfo &infoIn, exServer & casIn, | 109 | pvEntry ( pvInfo &infoIn, exServer & casIn, |
2311 | 110 | 110 | ||
2312 | === modified file 'src/template/base/top/caServerApp/exVectorPV.cc' | |||
2313 | --- src/template/base/top/caServerApp/exVectorPV.cc 2005-10-27 23:56:05 +0000 | |||
2314 | +++ src/template/base/top/caServerApp/exVectorPV.cc 2012-04-12 17:46:27 +0000 | |||
2315 | @@ -45,7 +45,7 @@ | |||
2316 | 45 | // | 45 | // |
2317 | 46 | // exVectorPV::maxBound() | 46 | // exVectorPV::maxBound() |
2318 | 47 | // | 47 | // |
2320 | 48 | aitIndex exVectorPV::maxBound (unsigned dimension) const // X aCC 361 | 48 | aitIndex exVectorPV::maxBound (unsigned dimension) const |
2321 | 49 | { | 49 | { |
2322 | 50 | if (dimension==0u) { | 50 | if (dimension==0u) { |
2323 | 51 | return this->info.getElementCount(); | 51 | return this->info.getElementCount(); |
2324 | 52 | 52 | ||
2325 | === modified file 'src/tools/Makefile' | |||
2326 | --- src/tools/Makefile 2012-03-13 23:00:46 +0000 | |||
2327 | +++ src/tools/Makefile 2012-04-12 17:46:27 +0000 | |||
2328 | @@ -36,7 +36,6 @@ | |||
2329 | 36 | PERL_SCRIPTS += cvsclean.pl | 36 | PERL_SCRIPTS += cvsclean.pl |
2330 | 37 | PERL_SCRIPTS += dos2unix.pl | 37 | PERL_SCRIPTS += dos2unix.pl |
2331 | 38 | PERL_SCRIPTS += expandVars.pl | 38 | PERL_SCRIPTS += expandVars.pl |
2332 | 39 | PERL_SCRIPTS += filterWarnings.pl | ||
2333 | 40 | PERL_SCRIPTS += fullPathName.pl | 39 | PERL_SCRIPTS += fullPathName.pl |
2334 | 41 | PERL_SCRIPTS += installEpics.pl | 40 | PERL_SCRIPTS += installEpics.pl |
2335 | 42 | PERL_SCRIPTS += makeDbDepends.pl | 41 | PERL_SCRIPTS += makeDbDepends.pl |
2336 | 43 | 42 | ||
2337 | === removed file 'src/tools/filterWarnings.pl' | |||
2338 | --- src/tools/filterWarnings.pl 2010-10-05 19:27:37 +0000 | |||
2339 | +++ src/tools/filterWarnings.pl 1970-01-01 00:00:00 +0000 | |||
2340 | @@ -1,54 +0,0 @@ | |||
2341 | 1 | eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*- | ||
2342 | 2 | if $running_under_some_shell; # filterWarnings.pl | ||
2343 | 3 | #************************************************************************* | ||
2344 | 4 | # Copyright (c) 2002 The University of Chicago, as Operator of Argonne | ||
2345 | 5 | # National Laboratory. | ||
2346 | 6 | # Copyright (c) 2002 The Regents of the University of California, as | ||
2347 | 7 | # Operator of Los Alamos National Laboratory. | ||
2348 | 8 | # Copyright (c) 2002 Berliner Elektronenspeicherringgesellschaft fuer | ||
2349 | 9 | # Synchrotronstrahlung. | ||
2350 | 10 | # EPICS BASE Versions 3.13.7 | ||
2351 | 11 | # and higher are distributed subject to a Software License Agreement found | ||
2352 | 12 | # in file LICENSE that is included with this distribution. | ||
2353 | 13 | #************************************************************************* | ||
2354 | 14 | |||
2355 | 15 | # $Revision-Id$ | ||
2356 | 16 | # | ||
2357 | 17 | # Author: Ralph Lange | ||
2358 | 18 | # | ||
2359 | 19 | |||
2360 | 20 | use Text::Wrap; | ||
2361 | 21 | |||
2362 | 22 | my ($errline, $errno, $codeline, $pointline); | ||
2363 | 23 | |||
2364 | 24 | $Text::Wrap::columns = $ENV{COLUMNS} if $ENV{COLUMNS}; | ||
2365 | 25 | |||
2366 | 26 | sub Usage | ||
2367 | 27 | { | ||
2368 | 28 | print "Usage:\n"; | ||
2369 | 29 | print "<compile line> 2>&1 | $0\n"; | ||
2370 | 30 | |||
2371 | 31 | exit 2; | ||
2372 | 32 | } | ||
2373 | 33 | |||
2374 | 34 | # Invalid whit space filter on solaris not implemented | ||
2375 | 35 | #if ( $ENV{"EPICS_HOST_ARCH"} =~ m/solaris-sparc/ ) { | ||
2376 | 36 | # while ( $errline = <> ) { | ||
2377 | 37 | # if ( $errline !~ m/invalid white space character in directive/ ) { | ||
2378 | 38 | # print $errline; | ||
2379 | 39 | # } | ||
2380 | 40 | # } | ||
2381 | 41 | #} else { | ||
2382 | 42 | while ( $errline = <> ) { | ||
2383 | 43 | if ( $errline =~ m/^(Warning|Error)/ ) { | ||
2384 | 44 | ($errno) = ($errline =~ m/.* ([0-9]+):/); | ||
2385 | 45 | $codeline = <>; | ||
2386 | 46 | $pointline = <>; | ||
2387 | 47 | next if $codeline =~ m|/[/*]\s*X.*aCC[^a-zA-Z]*$errno|; | ||
2388 | 48 | |||
2389 | 49 | print wrap ("", " ", $errline); | ||
2390 | 50 | print $codeline; | ||
2391 | 51 | print $pointline; | ||
2392 | 52 | } | ||
2393 | 53 | } | ||
2394 | 54 | #} |