From 34d7d51fd088d39a787e999ba03f353b6054401b Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 13 Feb 2002 14:34:12 +0000 Subject: [PATCH] Fixed (mostly suppressed) HPUX aCC warnings --- src/gdd/aitConvert.h | 11 +++++++---- src/gdd/gddI.h | 25 ++++++++++++++----------- src/gdd/gddUtils.h | 9 ++++++--- src/gdd/gddUtilsI.h | 5 ++++- src/gdd/smartGDDPointer.h | 4 ++-- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/gdd/aitConvert.h b/src/gdd/aitConvert.h index 5247330cd..5dacc3f37 100644 --- a/src/gdd/aitConvert.h +++ b/src/gdd/aitConvert.h @@ -8,6 +8,9 @@ * $Id$ * * $Log$ + * Revision 1.15 2001/10/20 00:11:51 jhill + * remove use of std lib for now + * * Revision 1.14 2001/09/05 00:50:36 jhill * removed GNU compiler ifdef * @@ -152,15 +155,15 @@ inline void aitFromNetOrder32(aitUint32* dest,aitUint32* src) inline void aitToNetOrder64(aitUint64* dest, aitUint64* src) { aitUint32 ait_temp_var_; - ait_temp_var_=(aitUint32)htonl(src[1]); - dest[1]=(aitUint32)htonl(src[0]); + ait_temp_var_=(aitUint32)htonl(src[1]); // X aCC 392 + dest[1]=(aitUint32)htonl(src[0]); // X aCC 392 dest[0]=ait_temp_var_; } inline void aitFromNetOrder64(aitUint64* dest, aitUint64* src) { aitUint32 ait_temp_var_; - ait_temp_var_=(aitUint32)ntohl(src[1]); - dest[1]=(aitUint32)ntohl(src[0]); + ait_temp_var_=(aitUint32)ntohl(src[1]); // X aCC 392 + dest[1]=(aitUint32)ntohl(src[0]); // X aCC 392 dest[0]=ait_temp_var_; } diff --git a/src/gdd/gddI.h b/src/gdd/gddI.h index 119a4cb62..84bcd9d47 100644 --- a/src/gdd/gddI.h +++ b/src/gdd/gddI.h @@ -8,6 +8,9 @@ * $Id$ * * $Log$ + * Revision 1.10 2001/01/31 13:33:42 mrk + * osiTime=>epicsTime + * * Revision 1.9 2000/10/13 01:17:52 jhill * made gdd param to copy const * @@ -98,12 +101,12 @@ inline int gdd::isLocalDataFormat(void) const { return !(flags&GDD_NET_MASK); } inline int gdd::isNetworkDataFormat(void) const { return !isLocalDataFormat() || aitLocalNetworkDataFormatSame; } -inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; } -inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; } -inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; } -inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; } -inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; } -inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; } +inline void gdd::markConstant(void) { flags|=GDD_CONSTANT_MASK; } // X aCC 818 +inline void gdd::markFlat(void) { flags|=GDD_FLAT_MASK; } // X aCC 818 +inline void gdd::markManaged(void) { flags|=GDD_MANAGED_MASK; } // X aCC 818 +inline void gdd::markUnmanaged(void) { flags&=~GDD_MANAGED_MASK; } // X aCC 818 +inline void gdd::markLocalDataFormat(void) { flags&=~GDD_NET_MASK; } // X aCC 818 +inline void gdd::markNotLocalDataFormat(void) { flags|=GDD_NET_MASK; } // X aCC 818 inline void gdd::getTimeStamp(struct timespec* const ts) const { time_stamp.get(*ts); } inline void gdd::setTimeStamp(const struct timespec* const ts) { time_stamp=*ts; } @@ -150,7 +153,7 @@ inline gddStatus gdd::noReferencing(void) gddAutoPrint("gdd::noReferencing()",gddErrorNotAllowed); rc=gddErrorNotAllowed; } - else flags|=GDD_NOREF_MASK; + else flags|=GDD_NOREF_MASK; // X aCC 818 return rc; } inline gddStatus gdd::reference(void) const @@ -162,7 +165,7 @@ inline gddStatus gdd::reference(void) const gddAutoPrint("gdd::reference()",gddErrorNotAllowed); rc=gddErrorNotAllowed; } - else ref_cnt++; + else ref_cnt++; // X aCC 818 if(ref_cnt>((1u<<(sizeof(ref_cnt)*CHAR_BIT))-2u)) { @@ -183,7 +186,7 @@ inline gddStatus gdd::unreference(void) const gddAutoPrint("gdd::unreference()",gddErrorUnderflow); rc=gddErrorUnderflow; } - else if(--ref_cnt<=0u) + else if(--ref_cnt<=0u) // X aCC 818 { if(isManaged()) { @@ -430,10 +433,10 @@ inline void gdd::get(aitInt8* d) const if(primitiveType()==aitEnumString && dim==0) { aitString* str = (aitString*)dataAddress(); - strcpy((char*)d,str->string()); + strcpy((char*)d,str->string()); // X aCC 392 } else if(primitiveType()==aitEnumFixedString && dim==0) - strcpy((char*)d,data.FString->fixed_string); + strcpy((char*)d,data.FString->fixed_string); // X aCC 392 else aitConvert(aitEnumInt8,d,primitiveType(),dataPointer(), getDataSizeElements()); diff --git a/src/gdd/gddUtils.h b/src/gdd/gddUtils.h index f31f3b3ef..addcf8525 100644 --- a/src/gdd/gddUtils.h +++ b/src/gdd/gddUtils.h @@ -8,6 +8,9 @@ * $Id$ * * $Log$ + * Revision 1.4 1997/05/19 19:23:51 jbk + * Fixed bug in new/delete operators for gddBounds1D, 2D, and 3D + * * Revision 1.3 1997/04/23 17:13:07 jhill * fixed export of symbols from WIN32 DLL * @@ -126,7 +129,7 @@ private: gddBounds b[1]; gdd_NEWDEL_DATA // required for using generic new/remove }; -inline gddBounds* gddBounds1D::boundArray(void) { return (gddBounds*)b; } +inline gddBounds* gddBounds1D::boundArray(void) { return b; } class epicsShareClass gddBounds2D { @@ -138,7 +141,7 @@ private: gddBounds b[2]; gdd_NEWDEL_DATA // required for using generic new/remove }; -inline gddBounds* gddBounds2D::boundArray(void) { return (gddBounds*)b; } +inline gddBounds* gddBounds2D::boundArray(void) { return b; } class epicsShareClass gddBounds3D { @@ -150,7 +153,7 @@ private: gddBounds b[3]; gdd_NEWDEL_DATA // required for using generic new/remove }; -inline gddBounds* gddBounds3D::boundArray(void) { return (gddBounds*)b; } +inline gddBounds* gddBounds3D::boundArray(void) { return b; } #endif diff --git a/src/gdd/gddUtilsI.h b/src/gdd/gddUtilsI.h index abbdb9f3d..a95bc35a4 100644 --- a/src/gdd/gddUtilsI.h +++ b/src/gdd/gddUtilsI.h @@ -7,6 +7,9 @@ * * $Id$ * $Log$ + * Revision 1.2 1997/03/24 12:41:49 jbk + * fixed bug in gddDestructor constructor. + * * Revision 1.1 1997/03/21 01:56:12 jbk * *** empty log message *** * @@ -25,7 +28,7 @@ inline aitIndex gddBounds::first(void) const { return start; } inline gddDestructor::gddDestructor(void) { ref_cnt=0; arg=NULL; } inline gddDestructor::gddDestructor(void* usr_arg) { ref_cnt=0; arg=usr_arg; } -inline void gddDestructor::reference(void) { ref_cnt++; } +inline void gddDestructor::reference(void) { ref_cnt++; } // X aCC 818 inline int gddDestructor::refCount(void) const { return ref_cnt; } #endif diff --git a/src/gdd/smartGDDPointer.h b/src/gdd/smartGDDPointer.h index 2bb5027ae..c35e8b0f6 100644 --- a/src/gdd/smartGDDPointer.h +++ b/src/gdd/smartGDDPointer.h @@ -171,7 +171,7 @@ inline const gdd & smartConstGDDPointer::operator * () const return *this->pConstValue; } -inline bool smartConstGDDPointer::operator ! () const +inline bool smartConstGDDPointer::operator ! () const // X aCC 361 { if (this->pConstValue) { return false; @@ -181,7 +181,7 @@ inline bool smartConstGDDPointer::operator ! () const } } -inline bool smartConstGDDPointer::valid () const +inline bool smartConstGDDPointer::valid () const // X aCC 361 { if ( this->pConstValue ) { return true;