merged in fix for https://bugs.launchpad.net/epics-base/+bug/1179642

also merged in removal of c++ support for old HPUX compiler
2013-05-16 12:33:31 -06:00
parent 593e313fab
commit e0bc071de3
53 changed files with 635 additions and 399 deletions
--- a/src/ca/searchTimer.cpp
+++ b/src/ca/searchTimer.cpp
@@ -124,7 +124,7 @@ void searchTimer::moveChannels (
 // searchTimer::expire ()
 //
 epicsTimerNotify::expireStatus searchTimer::expire ( 
-    const epicsTime & currentTime ) // X aCC 361
+    const epicsTime & currentTime )
 {
    epicsGuard < epicsMutex > guard ( this->mutex );