From b316cb1d40376ee9e1db41df657293ffb6ba3340 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 10 Aug 1999 17:11:01 +0000 Subject: [PATCH] moved inlines in order to eliminate g++ warnings --- src/gdd/gdd.h | 4 ++++ src/gdd/gddContainer.h | 21 ++++++++------------- src/gdd/gddContainerI.h | 17 +++++++++++++++++ 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/gdd/gdd.h b/src/gdd/gdd.h index 9e6dbea5d..3f5807a68 100644 --- a/src/gdd/gdd.h +++ b/src/gdd/gdd.h @@ -8,6 +8,9 @@ * $Id$ * * $Log$ + * Revision 1.30 1999/08/10 16:51:05 jhill + * moved inlines in order to eliminate g++ warnings + * * Revision 1.29 1999/08/05 22:19:34 jhill * removed knowledge of class osiTime, and made ref/unref mf const * @@ -604,5 +607,6 @@ private: #include "gddI.h" #include "gddArrayI.h" #include "gddScalarI.h" +#include "gddContainerI.h" #endif diff --git a/src/gdd/gddContainer.h b/src/gdd/gddContainer.h index d6147e7dc..247611c2e 100644 --- a/src/gdd/gddContainer.h +++ b/src/gdd/gddContainer.h @@ -7,6 +7,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1999/05/10 23:42:25 jhill + * fixed many const releated problems + * * Revision 1.3 1999/04/30 15:24:53 jhill * fixed improper container index bug * @@ -49,19 +52,13 @@ public: gdd* cData(void); protected: - gddContainer(int,int,int,int*) { } - ~gddContainer(void) { } + gddContainer(int,int,int,int*); + ~gddContainer(void); void cInit(int num_things_within); - gddStatus changeType(int,aitEnum) { - gddAutoPrint("gddContainer::changeType()",gddErrorNotAllowed); - return gddErrorNotAllowed; } - gddStatus setBound(int,aitIndex,aitIndex) { - gddAutoPrint("setBound()",gddErrorNotAllowed); - return gddErrorNotAllowed; } - gddStatus getBound(int,aitIndex&,aitIndex&) const { - gddAutoPrint("getBound()",gddErrorNotAllowed); - return gddErrorNotAllowed; } + gddStatus changeType(int,aitEnum); + gddStatus setBound(int,aitIndex,aitIndex); + gddStatus getBound(int,aitIndex&,aitIndex&) const; gddStatus setBound(aitIndex,aitIndex); private: @@ -119,6 +116,4 @@ public: gdd* operator[](int index); }; -#include "gddContainerI.h" - #endif diff --git a/src/gdd/gddContainerI.h b/src/gdd/gddContainerI.h index b3d7a046b..503e66eb3 100644 --- a/src/gdd/gddContainerI.h +++ b/src/gdd/gddContainerI.h @@ -7,6 +7,9 @@ * * $Id$ * $Log$ + * Revision 1.4 1999/05/11 00:14:47 jhill + * fixed missing arg + * * Revision 1.3 1999/05/10 23:42:25 jhill * fixed many const releated problems * @@ -19,8 +22,22 @@ * */ +inline gddContainer::gddContainer(int,int,int,int*) { } +inline gddContainer::~gddContainer(void) { } + +inline gddStatus gddContainer::changeType(int,aitEnum) { + gddAutoPrint("gddContainer::changeType()",gddErrorNotAllowed); + return gddErrorNotAllowed; } +inline gddStatus gddContainer::setBound(int,aitIndex,aitIndex) { + gddAutoPrint("setBound()",gddErrorNotAllowed); + return gddErrorNotAllowed; } +inline gddStatus gddContainer::getBound(int,aitIndex&,aitIndex&) const { + gddAutoPrint("getBound()",gddErrorNotAllowed); + return gddErrorNotAllowed; } + inline gdd* gddContainer::cData(void) { return (gdd*)dataPointer(); } + inline const gdd* gddContainer::cData(void) const { return (const gdd*)dataPointer(); }