moved inlines in order to eliminate g++ warnings

This commit is contained in:
Jeff Hill
1999-08-10 16:54:05 +00:00
parent a3ad16c742
commit 9223ffc4d2
6 changed files with 87 additions and 30 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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:
};

22
src/gdd/gddArrayI.h Normal file
View File

@@ -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

View File

@@ -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:
};

24
src/gdd/gddScalarI.h Normal file
View File

@@ -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