diff --git a/src/gdd/gdd.cc b/src/gdd/gdd.cc index 4294adbac..d749a7411 100644 --- a/src/gdd/gdd.cc +++ b/src/gdd/gdd.cc @@ -4,6 +4,9 @@ // $Id$ // // $Log$ +// Revision 1.31 2000/03/08 16:24:20 jhill +// doc +// // Revision 1.30 1999/10/28 15:57:09 jhill // now supports copy only the addressed portions between one GDD // and another @@ -431,7 +434,7 @@ gddStatus gdd::getBound(unsigned index_dim, aitIndex& first, aitIndex& count) co } // should the copy functions in gdd use the flatten technique? -gddStatus gdd::copyStuff(gdd* dd,int ctype) +gddStatus gdd::copyStuff(const gdd* dd,int ctype) { unsigned i; gddStatus rc=0; diff --git a/src/gdd/gdd.h b/src/gdd/gdd.h index 168715dce..0e72e8522 100644 --- a/src/gdd/gdd.h +++ b/src/gdd/gdd.h @@ -8,6 +8,9 @@ * $Id$ * * $Log$ + * Revision 1.32 2000/06/12 17:32:11 jhill + * moved stdlib.h (an ANSI C file) outside of OS depen switch + * * Revision 1.31 1999/08/10 17:11:01 jhill * moved inlines in order to eliminate g++ warnings * @@ -284,9 +287,9 @@ public: // copy data into it. // Dup() will copy DD info. bounds, data references copied only. - gddStatus copyInfo(gdd*); - gddStatus copy(gdd*); - gddStatus Dup(gdd*); + gddStatus copyInfo(const gdd*); + gddStatus copy(const gdd*); + gddStatus Dup(const gdd*); // copy the entire DD structure into a contiguous buffer, return the // last byte of the buffer that was used. @@ -570,7 +573,7 @@ protected: void init(int app, aitEnum prim, int dimen); void freeBounds(void); void dumpInfo(void) const; - gddStatus copyStuff(gdd*,int type); + gddStatus copyStuff(const gdd*,int type); gddStatus clearData(void); size_t describedDataSizeBytes(void) const; diff --git a/src/gdd/gddI.h b/src/gdd/gddI.h index 709870afe..cc9222746 100644 --- a/src/gdd/gddI.h +++ b/src/gdd/gddI.h @@ -8,6 +8,9 @@ * $Id$ * * $Log$ + * Revision 1.8 1999/08/10 19:57:15 jhill + * moved inlines in order to eliminate g++ warnings + * * Revision 1.7 1999/08/10 17:23:55 jhill * moved inlines in order to eliminate g++ warnings * @@ -52,9 +55,9 @@ inline const aitType& gdd::getData(void) const { return data; } inline aitType* gdd::dataUnion(void) { return &data; } inline const aitType* gdd::dataUnion(void)const { return &data; } inline void gdd::setApplType(int t) { appl_type=(aitUint16)t; } -inline gddStatus gdd::copyInfo(gdd* dd) { return copyStuff(dd,0); } -inline gddStatus gdd::copy(gdd* dd) { return copyStuff(dd,1); } -inline gddStatus gdd::Dup(gdd* dd) { return copyStuff(dd,2); } +inline gddStatus gdd::copyInfo(const gdd* dd) { return copyStuff(dd,0); } +inline gddStatus gdd::copy(const gdd* dd) { return copyStuff(dd,1); } +inline gddStatus gdd::Dup(const gdd* dd) { return copyStuff(dd,2); } inline const void* gdd::dataAddress(void) const { return (void*)&data; } inline void* gdd::dataAddress(void) { return (void*)&data; } inline const void* gdd::dataPointer(void) const { return data.Pointer; }