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/comQueSend.cpp
+++ b/src/ca/comQueSend.cpp
@@ -368,7 +368,7 @@ void comQueSend::insertRequestWithPayLoad (
        // the above checks verify that the total size
        // is lest that 0xffffffff
        size = static_cast < ca_uint32_t > 
-            ( dbr_size_n ( dataType, nElem ) ); // X aCC 392
+            ( dbr_size_n ( dataType, nElem ) );
        payloadSize = CA_MESSAGE_ALIGN ( size );
        this->insertRequestHeader ( request, payloadSize, 
            static_cast <ca_uint16_t> ( dataType ),