From bf6f69065c74457a0f5619c0566c6090fcb3d305 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Wed, 22 Jan 1997 21:14:21 +0000 Subject: [PATCH] fixed class decl order for VMS --- src/cxxTemplates/tsDLList.h | 55 ++++++++++++++++-------------- src/cxxTemplates/tsSLList.h | 46 +++++++++++++------------ src/libCom/cxxTemplates/tsDLList.h | 55 ++++++++++++++++-------------- src/libCom/cxxTemplates/tsSLList.h | 46 +++++++++++++------------ 4 files changed, 108 insertions(+), 94 deletions(-) diff --git a/src/cxxTemplates/tsDLList.h b/src/cxxTemplates/tsDLList.h index a943194ce..7e1ef672d 100644 --- a/src/cxxTemplates/tsDLList.h +++ b/src/cxxTemplates/tsDLList.h @@ -31,6 +31,9 @@ * * History * $Log$ + * Revision 1.5 1996/11/02 01:07:19 jhill + * many improvements + * * Revision 1.4 1996/08/14 12:32:09 jbk * added first() to list class, added first()/last() to iterator. * @@ -49,6 +52,31 @@ #ifndef tsDLListH_include #define tsDLListH_include +// +// tsDLNode +// +template +class tsDLNode { +friend class tsDLList; +friend class tsDLIter; +friend class tsDLFwdIter; +friend class tsDLBwdIter; +public: + tsDLNode() : pNext(0), pPrev(0) {} + // + // when someone copies in a class deriving from this + // do _not_ change the node pointers + // + void operator = (tsDLNode &) {} + +protected: + T *getNext(void) { return pNext; } + T *getPrev(void) { return pPrev; } +private: + T *pNext; + T *pPrev; +}; + // // tsDLList // @@ -278,31 +306,6 @@ private: unsigned itemCount; }; -// -// tsDLNode -// -template -class tsDLNode { -friend class tsDLList; -friend class tsDLIter; -friend class tsDLFwdIter; -friend class tsDLBwdIter; -public: - tsDLNode() : pNext(0), pPrev(0) {} - // - // when someone copies in a class deriving from this - // do _not_ change the node pointers - // - void operator = (tsDLNode &) {} - -protected: - T *getNext(void) { return pNext; } - T *getPrev(void) { return pPrev; } -private: - T *pNext; - T *pPrev; -}; - // // tsDLIter // @@ -482,7 +485,7 @@ template class tsDLBwdIter : private tsDLIter { public: tsDLBwdIter(tsDLList &listIn) : - tsDLIter(&listIn) {} + tsDLIter(listIn) {} void reset () { diff --git a/src/cxxTemplates/tsSLList.h b/src/cxxTemplates/tsSLList.h index 056de8391..c0545a115 100644 --- a/src/cxxTemplates/tsSLList.h +++ b/src/cxxTemplates/tsSLList.h @@ -31,6 +31,9 @@ * * History * $Log$ + * Revision 1.5 1996/11/02 01:07:20 jhill + * many improvements + * * Revision 1.4 1996/09/04 19:57:07 jhill * string id resource now copies id * @@ -50,6 +53,27 @@ #include #endif +// +// tsSLNode<> +// +template +class tsSLNode { +friend class tsSLList; +friend class tsSLIter; +public: + tsSLNode() : pNext(0) {} + + // + // when someone copies into a class deriving from this + // do _not_ change the node pointers + // + void operator = (tsSLNode &) {} + +private: + T *pNext; +}; + + // // tsSLList<> // @@ -112,27 +136,7 @@ public: }; // -// tsSLNode<> -// -template -class tsSLNode { -friend class tsSLList; -friend class tsSLIter; -public: - tsSLNode() : pNext(0) {} - - // - // when someone copies into a class deriving from this - // do _not_ change the node pointers - // - void operator = (tsSLNode &) {} - -private: - T *pNext; -}; - -// -// tsDLFwdIter +// tsSLIter // // Notes: // 1) No direct access to pCurrent is provided since diff --git a/src/libCom/cxxTemplates/tsDLList.h b/src/libCom/cxxTemplates/tsDLList.h index a943194ce..7e1ef672d 100644 --- a/src/libCom/cxxTemplates/tsDLList.h +++ b/src/libCom/cxxTemplates/tsDLList.h @@ -31,6 +31,9 @@ * * History * $Log$ + * Revision 1.5 1996/11/02 01:07:19 jhill + * many improvements + * * Revision 1.4 1996/08/14 12:32:09 jbk * added first() to list class, added first()/last() to iterator. * @@ -49,6 +52,31 @@ #ifndef tsDLListH_include #define tsDLListH_include +// +// tsDLNode +// +template +class tsDLNode { +friend class tsDLList; +friend class tsDLIter; +friend class tsDLFwdIter; +friend class tsDLBwdIter; +public: + tsDLNode() : pNext(0), pPrev(0) {} + // + // when someone copies in a class deriving from this + // do _not_ change the node pointers + // + void operator = (tsDLNode &) {} + +protected: + T *getNext(void) { return pNext; } + T *getPrev(void) { return pPrev; } +private: + T *pNext; + T *pPrev; +}; + // // tsDLList // @@ -278,31 +306,6 @@ private: unsigned itemCount; }; -// -// tsDLNode -// -template -class tsDLNode { -friend class tsDLList; -friend class tsDLIter; -friend class tsDLFwdIter; -friend class tsDLBwdIter; -public: - tsDLNode() : pNext(0), pPrev(0) {} - // - // when someone copies in a class deriving from this - // do _not_ change the node pointers - // - void operator = (tsDLNode &) {} - -protected: - T *getNext(void) { return pNext; } - T *getPrev(void) { return pPrev; } -private: - T *pNext; - T *pPrev; -}; - // // tsDLIter // @@ -482,7 +485,7 @@ template class tsDLBwdIter : private tsDLIter { public: tsDLBwdIter(tsDLList &listIn) : - tsDLIter(&listIn) {} + tsDLIter(listIn) {} void reset () { diff --git a/src/libCom/cxxTemplates/tsSLList.h b/src/libCom/cxxTemplates/tsSLList.h index 056de8391..c0545a115 100644 --- a/src/libCom/cxxTemplates/tsSLList.h +++ b/src/libCom/cxxTemplates/tsSLList.h @@ -31,6 +31,9 @@ * * History * $Log$ + * Revision 1.5 1996/11/02 01:07:20 jhill + * many improvements + * * Revision 1.4 1996/09/04 19:57:07 jhill * string id resource now copies id * @@ -50,6 +53,27 @@ #include #endif +// +// tsSLNode<> +// +template +class tsSLNode { +friend class tsSLList; +friend class tsSLIter; +public: + tsSLNode() : pNext(0) {} + + // + // when someone copies into a class deriving from this + // do _not_ change the node pointers + // + void operator = (tsSLNode &) {} + +private: + T *pNext; +}; + + // // tsSLList<> // @@ -112,27 +136,7 @@ public: }; // -// tsSLNode<> -// -template -class tsSLNode { -friend class tsSLList; -friend class tsSLIter; -public: - tsSLNode() : pNext(0) {} - - // - // when someone copies into a class deriving from this - // do _not_ change the node pointers - // - void operator = (tsSLNode &) {} - -private: - T *pNext; -}; - -// -// tsDLFwdIter +// tsSLIter // // Notes: // 1) No direct access to pCurrent is provided since