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/comQueRecv.cpp
+++ b/src/ca/comQueRecv.cpp
@@ -155,7 +155,7 @@ epicsUInt32 comQueRecv::multiBufferPopUInt32 ()
        unsigned byte3 = this->popUInt8();
        unsigned byte4 = this->popUInt8();
        tmp = static_cast <epicsUInt32>
-            ( ( byte1 << 24u ) | ( byte2 << 16u ) | //X aCC 392
+            ( ( byte1 << 24u ) | ( byte2 << 16u ) |
              ( byte3 << 8u ) | byte4 );
    }
    else {