Changes for HP-UX 11 - first semi-stable version

src/libCom/cxxTemplates/resourceLib.h

@@ -737,7 +737,7 @@ intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::intId (const T &idIn)
 // intId::operator == ()
 //
 template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
-inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator == 
+inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator == // X aCC 361
         (const intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH> &idIn) const
 {
     return this->id == idIn.id;
@@ -747,7 +747,7 @@ inline bool intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::operator ==
 // intId::getId ()
 //
 template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
-inline const T intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::getId () const
+inline const T intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::getId () const // X aCC 361
 {
     return this->id;
 }
@@ -756,7 +756,7 @@ inline const T intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::getId () const
 // const unsigned intId::minIndexBitWidth ()
 //
 template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
-inline const unsigned intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::minIndexBitWidth ()
+inline const unsigned intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::minIndexBitWidth () // X aCC 361
 {
     return MIN_INDEX_WIDTH;
 }
@@ -766,7 +766,7 @@ inline const unsigned intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::minIndexBitWidth
 //  const unsigned intId::maxIndexBitWidth ()
 //
 template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
-inline const unsigned intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::maxIndexBitWidth ()
+inline const unsigned intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::maxIndexBitWidth () // X aCC 361
 {
     return sizeof (resTableIndex) * CHAR_BIT;
 }
@@ -813,7 +813,7 @@ inline resTableIndex integerHash ( unsigned MIN_INDEX_WIDTH,
 // intId::hash()
 //
 template <class T, unsigned MIN_INDEX_WIDTH, unsigned MAX_ID_WIDTH>
-inline resTableIndex intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::hash () const
+inline resTableIndex intId<T, MIN_INDEX_WIDTH, MAX_ID_WIDTH>::hash () const // X aCC 361
 {
     return integerHash ( MIN_INDEX_WIDTH, MAX_ID_WIDTH, this->id );
 }

src/libCom/fdmgr/fdManager.cpp

@@ -1,4 +1,3 @@
-
 //
 //      $Id$
 //
@@ -94,7 +93,7 @@ epicsShareFunc fdManager::fdManager () : pTimerQueue ( 0 )
     assert (status);
 
     for ( i=0u; i < sizeof (this->fdSets) / sizeof ( this->fdSets[0u] ); i++ ) {
-        FD_ZERO ( &this->fdSets[i] );
+        FD_ZERO ( &this->fdSets[i] ); // X aCC 392
     }
     this->maxFD = 0;
     this->processInProg = 0u;

src/libCom/fdmgr/fdmgr.cpp

@@ -234,7 +234,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_timeout (fdctx *pfdctx,
     return 0;
 }
 
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback (
+extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback ( // X aCC 361
     fdctx *pfdctx, SOCKET fd, enum fdi_type fdi, pCallBackFDMgr pFunc, void *pParam)
 {
     oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
@@ -276,7 +276,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback (
     }
 }
  
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback (
+extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback ( // X aCC 361
     fdctx *pfdctx, SOCKET fd, enum fdi_type	fdi)
 {
     oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);

src/libCom/osi/os/posix/osdTime.cpp

@@ -49,7 +49,8 @@ extern "C" epicsShareFunc int epicsShareAPI epicsTimeGetEvent (epicsTimeStamp *p
     return epicsTimeERROR;
 }
 
-int epicsTime_gmtime ( const time_t *pAnsiTime, struct tm *pTM )
+int epicsTime_gmtime ( const time_t *pAnsiTime, // X aCC 361
+                       struct tm *pTM )
 {
     struct tm * pRet = gmtime_r ( pAnsiTime, pTM );
     if ( pRet ) {
@@ -60,7 +61,8 @@ int epicsTime_gmtime ( const time_t *pAnsiTime, struct tm *pTM )
     }
 }
 
-int epicsTime_localtime ( const time_t *clock, struct tm *result )
+int epicsTime_localtime ( const time_t *clock, // X aCC 361
+                          struct tm *result )
 {
     struct tm * pRet = localtime_r ( clock, result );
     if ( pRet ) {

src/libCom/test/Makefile

@@ -4,8 +4,6 @@ include $(TOP)/configure/CONFIG
 
 PROD_LIBS += Com
 
-USR_LIBS_hpux += cma
-
 #epicsListTest_SRCS += epicsListTest.cpp
 PROD_HOST += epicsListTest
 #epicsListTest build fails for vxWorks-ppc604 on win32-x86 host 

src/libCom/test/epicsListTest.cpp

@@ -5,7 +5,10 @@
 // Test code for the epics::List class
 
 #include "epicsList.h"
-#include <iostream.h>
+#include <iostream>
+
+using std::cout;
+using std::endl;
 
 #ifdef vxWorks
   #define MAIN epicsListTest
@@ -41,10 +44,10 @@ int MAIN(int /*argc*/, char* /*argv[]*/) {
 	"A", "B", "C", "D", "E", "F", "G", "H", "I", "J"
     };
     int i;
-    
+
     for (i=0; i<10; i++)
 	apf[i] = new fred(names[i]);
-    
+
     epicsList<fred*> Fred;
     test(Fred.empty());
     test(Fred.size() == 0);

src/libCom/test/epicsMutexTest.cpp

@@ -2,7 +2,7 @@
 
 /* 
  * Author:  Marty Kraimer Date:    26JAN2000 
- *          Jeff HIll (added mutex performance test )
+ *          Jeff Hill (added mutex performance test )
  */
 
 /********************COPYRIGHT NOTIFICATION**********************************
@@ -135,7 +135,7 @@ void verifyTryLock ()
 
     epicsThreadCreate ( "verifyTryLockThread", 40, 
         epicsThreadGetStackSize(epicsThreadStackSmall),
-        (EPICSTHREADFUNC )verifyTryLockThread, &verify );
+        verifyTryLockThread, &verify );
 
     epicsEventWait ( verify.done );
 
@@ -196,7 +196,9 @@ extern "C" void epicsMutexTest(int nthreads,int verbose)
         pinfo[i]->threadnum = i;
         pinfo[i]->mutex = mutex;
         arg[i] = pinfo[i];
-        id[i] = epicsThreadCreate(name[i],40,stackSize,(EPICSTHREADFUNC)mutexThread,arg[i]);
+        id[i] = epicsThreadCreate(name[i],40,stackSize,
+                                  mutexThread,
+                                  arg[i]);
         printf("semTest created mutexThread %d id %p time %ld\n",
             i, id[i],time(&tp));
     }

src/libCom/timer/epicsTimer.h

@@ -44,7 +44,7 @@ public:
     virtual epicsShareFunc void show ( unsigned int level ) const;
 };
 
-class epicsTimer {
+class epicsTimer {              // X aCC 655
 public:
     virtual void destroy () = 0; // requires existence of timer queue
     virtual void start ( epicsTimerNotify &, const epicsTime & ) = 0;
@@ -62,7 +62,7 @@ protected:
     virtual ~epicsTimer () = 0; // use destroy
 };
 
-class epicsTimerQueue {
+class epicsTimerQueue {         // X aCC 655
 public:
     virtual epicsTimer & createTimer () = 0;
     virtual void show ( unsigned int level ) const = 0;
@@ -70,7 +70,8 @@ protected:
     virtual ~epicsTimerQueue () = 0;
 };
 
-class epicsTimerQueueActive : public epicsTimerQueue {
+class epicsTimerQueueActive // X aCC 655
+    : public epicsTimerQueue {
 public:
     static epicsShareFunc epicsTimerQueueActive & allocate (
         bool okToShare, unsigned threadPriority = epicsThreadPriorityMin + 10 );
@@ -79,7 +80,7 @@ protected:
     virtual ~epicsTimerQueueActive () = 0;
 };
 
-class epicsTimerQueueNotify {
+class epicsTimerQueueNotify {   // X aCC 655
 public:
     // called when a new timer is inserted into the queue and the
     // delay to the next expire has changed
@@ -88,7 +89,8 @@ protected:
     virtual ~epicsTimerQueueNotify () = 0;
 };
 
-class epicsTimerQueuePassive : public epicsTimerQueue {
+class epicsTimerQueuePassive // X aCC 655
+    : public epicsTimerQueue {
 public:
     static epicsShareFunc epicsTimerQueuePassive & create ( epicsTimerQueueNotify & );
     virtual ~epicsTimerQueuePassive () = 0;

src/libCom/timer/timerPrivate.h

@@ -99,7 +99,7 @@ private:
     friend class timer;
 };
 
-class timerQueueActiveMgrPrivate {
+class timerQueueActiveMgrPrivate { // X aCC 655
 public:
     timerQueueActiveMgrPrivate ();
 protected: