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

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

Commit message

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

Description of the change

Jeff,

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

Thanks,

- Andrew

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

To post a comment you must log in.

Preview Diff

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

Subscribers

People subscribed via source and target branches