diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index fca0812..022446c 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -8586,32 +8586,32 @@ namespace ZNsMain void MovePrevIter(iteratorN & ARR_Iterator ) const{--ARR_Iterator;} - TypeData & GetDataInIter(ZCLink* AP_CLink ){return **AP_CLink ;} - TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID ) + TypeData & GetDataInIter(ZCLink * AP_CLink ){return **AP_CLink ;} + TypeData & GetDataInIter(IterEasyID & ARRI_IterEasyID ) { return GetDataInIter((ZCLink*)ARRI_IterEasyID ) ;} - TypeData & GetDataInIter(iterator& ARR_Iterator ){return *ARR_Iterator;} + TypeData & GetDataInIter(iterator & ARR_Iterator ){return *ARR_Iterator;} - TypeDataC& GetDataInIter(TypeLinkC* AP_CLink ) const + TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const { return **AP_CLink ;} - TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID ) const - { return GetDataInIter((TypeLinkC*)ARRI_IterEasyID); } - TypeDataC& GetDataInIter(iteratorN& ARR_Iterator ) + TypeDataC& GetDataInIter(IterEasyIDc& ARRI_IterEasyID ) const + { return GetDataInIter((TypeLinkC*)ARRI_IterEasyID) ;} + TypeDataC& GetDataInIter(iteratorN & ARR_Iterator ) { return *ARR_Iterator ;} - TypeData & GetDataInIter( TypeLink* AP_CLink , TypeSize AI_FarNum) + TypeData & GetDataInIter( TypeLink * AP_CLink , TypeSize AI_FarNum) {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } - TypeData & GetDataInIter( IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum) - { return GetDataInIter((ZCLink*)ARRI_IterEasyID , AI_FarNum); } - TypeData & GetDataInIter( iterator& ARR_Iterator , TypeSize AI_FarNum) - { return GetDataInIter((ZCLink*)ARR_Iterator , AI_FarNum); } + TypeData & GetDataInIter( IterEasyID & ARRI_IterEasyID, TypeSize AI_FarNum) + { return GetDataInIter((ZCLink*)ARRI_IterEasyID , AI_FarNum); } + TypeData & GetDataInIter( iterator & ARR_Iterator , TypeSize AI_FarNum) + { return GetDataInIter((ZCLink*)ARR_Iterator , AI_FarNum); } - TypeDataC& GetDataInIter( TypeLinkC* AP_CLink , TypeSize AI_FarNum) const + TypeDataC& GetDataInIter( TypeLinkC * AP_CLink , TypeSize AI_FarNum) const {return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; } - TypeDataC& GetDataInIter( IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const - { return GetDataInIter((ZCLinkC*)ARRI_IterEasyID , AI_FarNum); } - TypeDataC& GetDataInIter( iteratorN& ARR_Iterator , TypeSize AI_FarNum) const - { return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); } + TypeDataC& GetDataInIter( IterEasyIDc& ARRI_IterEasyID, TypeSize AI_FarNum) const + { return GetDataInIter((ZCLinkC*)ARRI_IterEasyID , AI_FarNum); } + TypeDataC& GetDataInIter( iteratorN & ARR_Iterator , TypeSize AI_FarNum) const + { return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); } iterator begin () { return ZCNodePoint (*this); } diff --git a/ZCppMain/ZtCArray.H b/ZCppMain/ZtCArray.H index 287b787..0072a30 100644 --- a/ZCppMain/ZtCArray.H +++ b/ZCppMain/ZtCArray.H @@ -778,29 +778,29 @@ namespace ZNsMain { MovePrevIter((TypeDataC*&)AI_IterEasyID); } - TypeData& GetDataInIter(TypeData * AP_CType ) {return *AP_CType ;} - TypeData& GetDataInIter(iterator & ARR_CIterator) {return *ARR_CIterator;} - TypeData& GetDataInIter(IterEasyID AI_IterEasyID) + TypeData& GetDataInIter(TypeData * AP_CType ) {return *AP_CType ;} + TypeData& GetDataInIter(iterator & ARR_CIterator) {return *ARR_CIterator;} + TypeData& GetDataInIter(IterEasyID & AI_IterEasyID) { return *(TypeData *)AI_IterEasyID; } - TypeDataC& GetDataInIter(TypeDataC * AP_CType ) const{return *AP_CType;} - TypeDataC& GetDataInIter(iteratorC & ARR_CIterator) const{return *ARR_CIterator;} - TypeDataC& GetDataInIter(IterEasyIDc AI_IterEasyID) const + TypeDataC& GetDataInIter(TypeDataC * AP_CType ) const{return *AP_CType;} + TypeDataC& GetDataInIter(iteratorC & ARR_CIterator) const{return *ARR_CIterator;} + TypeDataC& GetDataInIter(IterEasyIDc& AI_IterEasyID) const { return *(TypeDataC*)AI_IterEasyID; } - TypeData & GetDataInIter(TypeData * AP_Type , TypeSize AI_FarNum) + TypeData & GetDataInIter(TypeData * AP_Type , TypeSize AI_FarNum) { return *(AP_Type + AI_FarNum) ; } - TypeData & GetDataInIter(iterator & ARR_CIterator , TypeSize AI_FarNum) + TypeData & GetDataInIter(iterator & ARR_CIterator , TypeSize AI_FarNum) { return *(ARR_CIterator+AI_FarNum) ; } - TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID , TypeSize AI_FarNum) + TypeData & GetDataInIter(IterEasyID & ARRI_IterEasyID , TypeSize AI_FarNum) { return GetDataInIter((TypeData*)ARRI_IterEasyID , AI_FarNum); } - TypeDataC& GetDataInIter(TypeDataC * AP_Type , TypeSize AI_FarNum) const + TypeDataC& GetDataInIter(TypeDataC * AP_Type , TypeSize AI_FarNum) const { return *(AP_Type + AI_FarNum); } - TypeDataC& GetDataInIter(iterator & ARR_CIterator , TypeSize AI_FarNum) const + TypeDataC& GetDataInIter(iterator & ARR_CIterator , TypeSize AI_FarNum) const { return *(ARR_CIterator+AI_FarNum); } - TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID , TypeSize AI_FarNum) const + TypeDataC& GetDataInIter(IterEasyIDc& ARRI_IterEasyID , TypeSize AI_FarNum) const { return GetDataInIter((TypeDataC*)ARRI_IterEasyID, AI_FarNum); } diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index 39df9fa..d06e38d 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -3099,30 +3099,29 @@ namespace ZNsMain void MovePrevIter(iteratorN & ARR_Iterator ) const{--ARR_Iterator;} - TypeData & GetDataInIter(ZCLink* AP_CLink ){return **AP_CLink ;} - TypeData & GetDataInIter(iterator AR_Iterator ){return *AR_Iterator;} - TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID) - { return GetDataInIter((ZCLink*)ARRI_IterEasyID); } + TypeData & GetDataInIter(ZCLink * AP_CLink ){return **AP_CLink ;} + TypeData & GetDataInIter(iterator & AR_Iterator ){return *AR_Iterator;} + TypeData & GetDataInIter(IterEasyID & ARRI_IterEasyID) + { return GetDataInIter((ZCLink*) ARRI_IterEasyID); } - TypeDataC& GetDataInIter(TypeLinkC* AP_CLink ) const - { return **AP_CLink ; } - TypeDataC& GetDataInIter(iteratorN AR_Iterator ) const{return *AR_Iterator;} - TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID) const + TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const{return **AP_CLink ;} + TypeDataC& GetDataInIter(iteratorN & AR_Iterator ) const{return *AR_Iterator;} + TypeDataC& GetDataInIter(IterEasyIDc& ARRI_IterEasyID) const { return GetDataInIter((TypeLinkC*)ARRI_IterEasyID); } - TypeData & GetDataInIter(TypeLink * AP_CLink , TypeSize AI_FarNum) + TypeData & GetDataInIter(TypeLink * AP_CLink , TypeSize AI_FarNum) {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } - TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum) + TypeData & GetDataInIter(IterEasyID & ARRI_IterEasyID, TypeSize AI_FarNum) { return GetDataInIter((ZCLink*)ARRI_IterEasyID , AI_FarNum); } - TypeData & GetDataInIter(iterator & ARR_Iterator , TypeSize AI_FarNum) + TypeData & GetDataInIter(iterator & ARR_Iterator , TypeSize AI_FarNum) { return GetDataInIter((ZCLink*)ARR_Iterator , AI_FarNum); } - TypeDataC& GetDataInIter(TypeLinkC* AP_CLink , TypeSize AI_FarNum) const + TypeDataC& GetDataInIter(TypeLinkC * AP_CLink , TypeSize AI_FarNum) const {return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; } - TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const + TypeDataC& GetDataInIter(IterEasyIDc& ARRI_IterEasyID, TypeSize AI_FarNum) const { return GetDataInIter((ZCLinkC*)ARRI_IterEasyID, AI_FarNum); } - TypeDataC& GetDataInIter(iteratorN& ARR_Iterator , TypeSize AI_FarNum) const + TypeDataC& GetDataInIter(iteratorN & ARR_Iterator , TypeSize AI_FarNum) const { return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); } diff --git a/ZCppMain/ZtCSimList.H b/ZCppMain/ZtCSimList.H index b59ba0e..fae14bd 100644 --- a/ZCppMain/ZtCSimList.H +++ b/ZCppMain/ZtCSimList.H @@ -2304,42 +2304,24 @@ namespace ZNsMain ///////////////////////////////////////////////////////////////////////////*/ - void MoveNextIter(ZCLink*& APR_CLink) - { APR_CLink=APR_CLink->GetNextPtr() ; } - - void MoveNextIter(IterEasyID& APPI_IterEasyID) - { MoveNextIter((ZCLink*&)APPI_IterEasyID) ; } - - void MoveNextIter(ZCLinkC*& APR_CLink) const - { APR_CLink=APR_CLink->GetNextPtr() ; } - - void MoveNextIter(IterEasyIDc& APPI_IterEasyID) const - { MoveNextIter((ZCLinkC*&)APPI_IterEasyID) ; } - - void MoveNextIter(iterator & ARR_iterator) - { ++ARR_iterator ; } - - void MoveNextIter(iteratorN& ARR_iterator) const - { ++ARR_iterator ; } - - - TypeData & GetDataInIter(ZCLink* AP_CLink) - { return **AP_CLink ; } - - TypeData & GetDataInIter(IterEasyID APPI_IterEasyID) - { return GetDataInIter((ZCLink*)APPI_IterEasyID) ; } - - TypeData & GetDataInIter(iterator & ARR_iterator) - { return *ARR_iterator ; } + void MoveNextIter(ZCLink* & APR_CLink ){ APR_CLink=APR_CLink->GetNextPtr() ; } + void MoveNextIter(iterator & ARR_iterator ){ ++ARR_iterator ; } + void MoveNextIter(IterEasyID & APPI_IterEasyID) + { MoveNextIter((ZCLink* &)APPI_IterEasyID); } /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ - TypeDataC& GetDataInIter(ZCLinkC* AP_CLink) const - { return **AP_CLink ; } + void MoveNextIter(ZCLinkC* & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ; } + void MoveNextIter(iteratorN & ARR_iterator ) const{ ++ARR_iterator ; } + void MoveNextIter(IterEasyIDc& APPI_IterEasyID) const + { MoveNextIter((ZCLinkC*&)APPI_IterEasyID); } - TypeDataC& GetDataInIter(IterEasyIDc APPI_IterEasyID) const - { return GetDataInIter((ZCLinkC*)APPI_IterEasyID) ; } - TypeDataC& GetDataInIter(iteratorN& ARR_iterator) const - { return *ARR_iterator ; } + TypeData & GetDataInIter(ZCLink * AP_CLink ){ return **AP_CLink ; } + TypeData & GetDataInIter(IterEasyID & APPI_IterEasyID){ return GetDataInIter((ZCLink*)APPI_IterEasyID) ; } + TypeData & GetDataInIter(iterator & ARR_iterator ){ return *ARR_iterator ; } + /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ + TypeDataC& GetDataInIter(ZCLinkC * AP_CLink ) const{ return **AP_CLink ; } + TypeDataC& GetDataInIter(IterEasyIDc& APPI_IterEasyID) const{ return GetDataInIter((ZCLinkC*)APPI_IterEasyID) ; } + TypeDataC& GetDataInIter(iteratorN & ARR_iterator ) const{ return *ARR_iterator ; } ZCLink * ItHEasy() {return mp_HeadLink;}