From 325530e630c68c7c10a2f4339f5b43434fcd0329 Mon Sep 17 00:00:00 2001 From: sc Date: Tue, 28 Nov 2000 14:19:35 +0000 Subject: Incorporation into IvyLeague Ccu -> Ivl ccu -> ivl Smart pointers disappear (too dangerous) Imakefile disappears (Makefile now) An empty cplus_bugs.h has been created locally --- utils/Array.h | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'utils/Array.h') diff --git a/utils/Array.h b/utils/Array.h index a36ed36..2a5da6a 100644 --- a/utils/Array.h +++ b/utils/Array.h @@ -13,45 +13,44 @@ * $CurLog$ */ - #ifndef Array_H_ #define Array_H_ #include "cplus_bugs.h" -typedef void CcuArrayItem; +typedef void IvlArrayItem; -class CcuArray { +class IvlArray { protected: -static CcuArrayItem* InvalidCell; +static IvlArrayItem* InvalidCell; int Length; - CcuArrayItem** Data; + IvlArrayItem** Data; void Clean (); public: - CcuArray (int size, CcuArrayItem* = 0); - CcuArray (const CcuArray&); - ~CcuArray (); - void Reset (CcuArrayItem* = 0); - CcuArrayItem*& operator [] (int i) const; - CcuArrayItem** operator + (int) const; - CcuArray& operator = (const CcuArray&); + IvlArray (int size, IvlArrayItem* = 0); + IvlArray (const IvlArray&); + ~IvlArray (); + void Reset (IvlArrayItem* = 0); + IvlArrayItem*& operator [] (int i) const; + IvlArrayItem** operator + (int) const; + IvlArray& operator = (const IvlArray&); inline int Check (int i) const { return (i >= 0 && i < Length); } inline int GetSize () const { return Length; } - void Resize (int, CcuArrayItem* = 0); + void Resize (int, IvlArrayItem* = 0); }; #ifndef CPLUS_BUG19 -template class CcuArrayOf : public CcuArray { +template class IvlArrayOf : public IvlArray { public: -inline CcuArrayOf (int size, ITEM* value = 0) : CcuArray (size, value) {} -inline CcuArrayOf (const CcuArrayOf& a) : CcuArray (a) {} -inline ~CcuArrayOf () {} -inline void Reset (ITEM* value = 0) { CcuArray::Reset (value); } -inline void Resize (int size, ITEM* value = 0) { CcuArray::Resize (size, value); } -inline ITEM*& operator [] (int i) const { return (ITEM*&) ((* (CcuArray*) this)[i]); } -inline ITEM** operator + (int i) const { return (ITEM**) ((*(CcuArray*) this) + i); } +inline IvlArrayOf (int size, ITEM* value = 0) : IvlArray (size, value) {} +inline IvlArrayOf (const IvlArrayOf& a) : IvlArray (a) {} +inline ~IvlArrayOf () {} +inline void Reset (ITEM* value = 0) { IvlArray::Reset (value); } +inline void Resize (int size, ITEM* value = 0) { IvlArray::Resize (size, value); } +inline ITEM*& operator [] (int i) const { return (ITEM*&) ((* (IvlArray*) this)[i]); } +inline ITEM** operator + (int i) const { return (ITEM**) ((*(IvlArray*) this) + i); } }; #endif -- cgit v1.1