From 9223ffc4d2117a565ac6a078f4802178b21d96eb Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 10 Aug 1999 16:54:05 +0000 Subject: [PATCH] moved inlines in order to eliminate g++ warnings --- src/gdd/Makefile.Host | 2 ++ src/gdd/gdd.h | 5 +++++ src/gdd/gddArray.h | 32 +++++++++++++++++--------------- src/gdd/gddArrayI.h | 22 ++++++++++++++++++++++ src/gdd/gddScalar.h | 32 +++++++++++++++++--------------- src/gdd/gddScalarI.h | 24 ++++++++++++++++++++++++ 6 files changed, 87 insertions(+), 30 deletions(-) create mode 100644 src/gdd/gddArrayI.h create mode 100644 src/gdd/gddScalarI.h diff --git a/src/gdd/Makefile.Host b/src/gdd/Makefile.Host index 8b770589a..2aa1f83d4 100644 --- a/src/gdd/Makefile.Host +++ b/src/gdd/Makefile.Host @@ -9,7 +9,9 @@ INC += gddI.h INC += gddContainer.h INC += gddContainerI.h INC += gddArray.h +INC += gddArrayI.h INC += gddScalar.h +INC += gddScalarI.h INC += gddSemaphore.h INC += gddNewDel.h INC += gddUtils.h diff --git a/src/gdd/gdd.h b/src/gdd/gdd.h index 802fb784e..9e6dbea5d 100644 --- a/src/gdd/gdd.h +++ b/src/gdd/gdd.h @@ -8,6 +8,9 @@ * $Id$ * * $Log$ + * Revision 1.29 1999/08/05 22:19:34 jhill + * removed knowledge of class osiTime, and made ref/unref mf const + * * Revision 1.28 1999/05/11 00:31:34 jhill * removed redun gdd: * @@ -599,5 +602,7 @@ private: #include "gddContainer.h" #include "gddI.h" +#include "gddArrayI.h" +#include "gddScalarI.h" #endif diff --git a/src/gdd/gddArray.h b/src/gdd/gddArray.h index 5585b85d0..6d5d51eea 100644 --- a/src/gdd/gddArray.h +++ b/src/gdd/gddArray.h @@ -7,6 +7,9 @@ * * $Id$ * $Log$ + * Revision 1.3 1999/04/30 15:24:53 jhill + * fixed improper container index bug + * * Revision 1.2 1997/04/23 17:13:03 jhill * fixed export of symbols from WIN32 DLL * @@ -26,12 +29,11 @@ class epicsShareClass gddArray : public gdd { public: - gddArray(void) { } - gddArray(gddArray* ad) : gdd(ad) { } - gddArray(int app) : gdd(app) { } - gddArray(int app, aitEnum prim) : gdd(app,prim) { } - gddArray(int app, aitEnum prim, int dimen, aitUint32* size_array): - gdd(app,prim,dimen,size_array) { } + gddArray(void); + gddArray(gddArray* ad); + gddArray(int app); + gddArray(int app, aitEnum prim); + gddArray(int app, aitEnum prim, int dimen, aitUint32* size_array); gddArray(int app, aitEnum prim, int dimen, ...); // view dimension size info as a bounding box instead of first/count @@ -43,17 +45,17 @@ public: void dump(void) const; void test(void); - gddArray& operator=(aitFloat64* v) { *((gdd*)this)=v; return *this; } - gddArray& operator=(aitFloat32* v) { *((gdd*)this)=v; return *this; } - gddArray& operator=(aitUint32* v) { *((gdd*)this)=v; return *this; } - gddArray& operator=(aitInt32* v) { *((gdd*)this)=v; return *this; } - gddArray& operator=(aitUint16* v) { *((gdd*)this)=v; return *this; } - gddArray& operator=(aitInt16* v) { *((gdd*)this)=v; return *this; } - gddArray& operator=(aitUint8* v) { *((gdd*)this)=v; return *this; } - gddArray& operator=(aitInt8* v) { *((gdd*)this)=v; return *this; } + gddArray& operator=(aitFloat64* v); + gddArray& operator=(aitFloat32* v); + gddArray& operator=(aitUint32* v); + gddArray& operator=(aitInt32* v); + gddArray& operator=(aitUint16* v); + gddArray& operator=(aitInt16* v); + gddArray& operator=(aitUint8* v); + gddArray& operator=(aitInt8* v); protected: - ~gddArray(void) { } + ~gddArray(void); private: }; diff --git a/src/gdd/gddArrayI.h b/src/gdd/gddArrayI.h new file mode 100644 index 000000000..4d820b44f --- /dev/null +++ b/src/gdd/gddArrayI.h @@ -0,0 +1,22 @@ + +#ifndef GDD_ARRAYI_H +#define GDD_ARRAYI_H + +inline gddArray::gddArray (void) { } +inline gddArray::gddArray (gddArray* ad) : gdd(ad) { } +inline gddArray::gddArray (int app) : gdd(app) { } +inline gddArray::gddArray (int app, aitEnum prim) : gdd(app,prim) { } +inline gddArray::gddArray (int app, aitEnum prim, int dimen, aitUint32* size_array): + gdd(app,prim,dimen,size_array) { } +inline gddArray& gddArray::operator=(aitFloat64* v) { *((gdd*)this)=v; return *this; } +inline gddArray& gddArray::operator=(aitFloat32* v) { *((gdd*)this)=v; return *this; } +inline gddArray& gddArray::operator=(aitUint32* v) { *((gdd*)this)=v; return *this; } +inline gddArray& gddArray::operator=(aitInt32* v) { *((gdd*)this)=v; return *this; } +inline gddArray& gddArray::operator=(aitUint16* v) { *((gdd*)this)=v; return *this; } +inline gddArray& gddArray::operator=(aitInt16* v) { *((gdd*)this)=v; return *this; } +inline gddArray& gddArray::operator=(aitUint8* v) { *((gdd*)this)=v; return *this; } +inline gddArray& gddArray::operator=(aitInt8* v) { *((gdd*)this)=v; return *this; } + +inline gddArray::~gddArray(void) { } + +#endif \ No newline at end of file diff --git a/src/gdd/gddScalar.h b/src/gdd/gddScalar.h index 1d8ea215a..03cfe2f4b 100644 --- a/src/gdd/gddScalar.h +++ b/src/gdd/gddScalar.h @@ -7,6 +7,9 @@ * * $Id$ * $Log$ + * Revision 1.3 1999/04/30 15:24:53 jhill + * fixed improper container index bug + * * Revision 1.2 1997/04/23 17:13:05 jhill * fixed export of symbols from WIN32 DLL * @@ -25,27 +28,26 @@ class epicsShareClass gddScalar : public gdd { public: - gddScalar(void) { } - gddScalar(gddScalar* ad) : gdd(ad) { } - gddScalar(int app) : gdd(app) { } - gddScalar(int app,aitEnum prim) : gdd(app,prim) { } + gddScalar(void); + gddScalar(gddScalar* ad); + gddScalar(int app); + gddScalar(int app,aitEnum prim); void dump(void) const; void test(void); - gddScalar& operator=(aitFloat64 d) { *((gdd*)this)=d; return *this; } - gddScalar& operator=(aitFloat32 d) { *((gdd*)this)=d; return *this; } - gddScalar& operator=(aitUint32 d) { *((gdd*)this)=d; return *this; } - gddScalar& operator=(aitInt32 d) { *((gdd*)this)=d; return *this; } - gddScalar& operator=(aitUint16 d) { *((gdd*)this)=d; return *this; } - gddScalar& operator=(aitInt16 d) { *((gdd*)this)=d; return *this; } - gddScalar& operator=(aitUint8 d) { *((gdd*)this)=d; return *this; } - gddScalar& operator=(aitInt8 d) { *((gdd*)this)=d; return *this; } + gddScalar& operator=(aitFloat64 d); + gddScalar& operator=(aitFloat32 d); + gddScalar& operator=(aitUint32 d); + gddScalar& operator=(aitInt32 d); + gddScalar& operator=(aitUint16 d); + gddScalar& operator=(aitInt16 d); + gddScalar& operator=(aitUint8 d); + gddScalar& operator=(aitInt8 d); protected: - gddScalar(int app, aitEnum prim, int dimen, aitUint32* size_array): - gdd(app,prim,dimen,size_array) { } - ~gddScalar(void) { } + gddScalar(int app, aitEnum prim, int dimen, aitUint32* size_array); + ~gddScalar(void); private: }; diff --git a/src/gdd/gddScalarI.h b/src/gdd/gddScalarI.h new file mode 100644 index 000000000..f21569232 --- /dev/null +++ b/src/gdd/gddScalarI.h @@ -0,0 +1,24 @@ + +#ifndef GDD_SCALARI_H +#define GDD_SCALARI_H + +inline gddScalar::gddScalar(void) { } +inline gddScalar::gddScalar(gddScalar* ad) : gdd(ad) { } +inline gddScalar::gddScalar(int app) : gdd(app) { } +inline gddScalar::gddScalar(int app,aitEnum prim) : gdd(app,prim) { } + +inline gddScalar& gddScalar::operator=(aitFloat64 d) { *((gdd*)this)=d; return *this; } +inline gddScalar& gddScalar::operator=(aitFloat32 d) { *((gdd*)this)=d; return *this; } +inline gddScalar& gddScalar::operator=(aitUint32 d) { *((gdd*)this)=d; return *this; } +inline gddScalar& gddScalar::operator=(aitInt32 d) { *((gdd*)this)=d; return *this; } +inline gddScalar& gddScalar::operator=(aitUint16 d) { *((gdd*)this)=d; return *this; } +inline gddScalar& gddScalar::operator=(aitInt16 d) { *((gdd*)this)=d; return *this; } +inline gddScalar& gddScalar::operator=(aitUint8 d) { *((gdd*)this)=d; return *this; } +inline gddScalar& gddScalar::operator=(aitInt8 d) { *((gdd*)this)=d; return *this; } + +inline gddScalar::gddScalar(int app, aitEnum prim, int dimen, aitUint32* size_array): + gdd(app,prim,dimen,size_array) { } + +inline gddScalar::~gddScalar(void) { } + +#endif \ No newline at end of file