diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 00580c0..1e088da 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -8679,20 +8679,20 @@ namespace ZNsMain IterEasyIDc ItHIDc () const{return GetHeadIterEasyIDc();} IterEasyIDc ItTIDc () const{return GetTailIterEasyIDc();} - void ItNext(ZCLink* & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;} - void ItNext(IterEasyID & ARRI_IterEasyID) const{ItNext((ZCLink*&)(ARRI_IterEasyID));} - void ItNext(TypeLinkC* & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;} - void ItNext(iterator & ARR_Iterator ) const{++ARR_Iterator;} - void ItNext(iteratorN & ARR_Iterator ) const{++ARR_Iterator;} - void ItNext(IterEasyIDc& ARRI_IterEasyID) const + void ItNext(ZCLink * & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;} + void ItNext(IterEasyID & ARRI_IterEasyID) const{ItNext((ZCLink*&)(ARRI_IterEasyID));} + void ItNext(TypeLinkC* & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;} + void ItNext(iterator & ARR_Iterator ) const{++ARR_Iterator;} + void ItNext(iteratorN & ARR_Iterator ) const{++ARR_Iterator;} + void ItNext(IterEasyIDc & ARRI_IterEasyID) const { ItNext((TypeLinkC*&) (ARRI_IterEasyID)); } - void ItPrev(ZCLink* & APR_CLink ) const{ APR_CLink=APR_CLink->GetPrevPtr() ;} - void ItPrev(IterEasyID & ARRI_IterEasyID) const{ItPrev((ZCLink*&)(ARRI_IterEasyID));} - void ItPrev(TypeLinkC* & APR_CLink ) const{ APR_CLink=APR_CLink->GetPrevPtr() ;} - void ItPrev(iterator & ARR_Iterator ) const{--ARR_Iterator;} - void ItPrev(iteratorN & ARR_Iterator ) const{--ARR_Iterator;} - void ItPrev(IterEasyIDc& ARRI_IterEasyID) const + void ItPrev(ZCLink * & APR_CLink ) const{ APR_CLink=APR_CLink->GetPrevPtr() ;} + void ItPrev(IterEasyID & ARRI_IterEasyID) const{ItPrev((ZCLink*&)(ARRI_IterEasyID));} + void ItPrev(TypeLinkC* & APR_CLink ) const{ APR_CLink=APR_CLink->GetPrevPtr() ;} + void ItPrev(iterator & ARR_Iterator ) const{--ARR_Iterator;} + void ItPrev(iteratorN & ARR_Iterator ) const{--ARR_Iterator;} + void ItPrev(IterEasyIDc & ARRI_IterEasyID) const { ItPrev((TypeLinkC*&) (ARRI_IterEasyID)); } TypeData & ItD(IterEasy AP_CLink ) {return GetDataInIter(AP_CLink );} diff --git a/ZCppMain/ZtCArray.H b/ZCppMain/ZtCArray.H index ca9d88d..c5f2d54 100644 --- a/ZCppMain/ZtCArray.H +++ b/ZCppMain/ZtCArray.H @@ -820,22 +820,22 @@ namespace ZNsMain IterEasyIDc ItHIDc () const{return (IterEasyIDc) mp_TypeArr ;} IterEasyIDc ItTIDc () const{return (IterEasyIDc)(mp_TypeArr+ml_UseSize-1);} - void ItNext(TypeData* & APR_CType ) const{++APR_CType ;} - void ItNext(iterator & ARR_CIterator) const{++ARR_CIterator;} - void ItNext(IterEasyID & AI_IterEasyID) const + void ItNext(TypeData* & APR_CType ) const{++APR_CType ;} + void ItNext(iterator & ARR_CIterator) const{++ARR_CIterator;} + void ItNext(IterEasyID & AI_IterEasyID) const { ItNext((TypeData *&)AI_IterEasyID); } - void ItNext(TypeDataC* & APR_CType ) const{++APR_CType ;} - void ItNext(iteratorC & ARR_CIterator) const{++ARR_CIterator;} - void ItNext(IterEasyIDc& AI_IterEasyID) const + void ItNext(TypeDataC* & APR_CType ) const{++APR_CType ;} + void ItNext(iteratorC & ARR_CIterator) const{++ARR_CIterator;} + void ItNext(IterEasyIDc & AI_IterEasyID) const { ItNext((TypeDataC*&)AI_IterEasyID); } - void ItPrev(TypeData* & APR_CType ) const{--APR_CType ;} - void ItPrev(iterator & ARR_CIterator) const{--ARR_CIterator;} - void ItPrev(IterEasyID & AI_IterEasyID) const + void ItPrev(TypeData* & APR_CType ) const{--APR_CType ;} + void ItPrev(iterator & ARR_CIterator) const{--ARR_CIterator;} + void ItPrev(IterEasyID & AI_IterEasyID) const { ItPrev((TypeData *&)AI_IterEasyID); } - void ItPrev(TypeDataC* & APR_CType ) const{--APR_CType ;} - void ItPrev(iteratorC & ARR_CIterator) const{--ARR_CIterator;} - void ItPrev(IterEasyIDc& AI_IterEasyID) const + void ItPrev(TypeDataC* & APR_CType ) const{--APR_CType ;} + void ItPrev(iteratorC & ARR_CIterator) const{--ARR_CIterator;} + void ItPrev(IterEasyIDc & AI_IterEasyID) const { ItPrev((TypeDataC*&)AI_IterEasyID); } TypeData & ItD(TypeData * AP_Type ) {return GetDataInIter(AP_Type );} diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index 2268883..2b3e9fd 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -3134,10 +3134,10 @@ namespace ZNsMain iteratorN cend () const{ return ZCNodePointN::MakeTailPoint(*this); } - IterEasy ItHEasy() {return GetHeadIterEasy (); } - IterEasy ItTEasy() {return GetTailIterEasy (); } - IterEasyID ItHID () {return GetHeadIterEasyID (); } - IterEasyID ItTID () {return GetTailIterEasyID (); } + IterEasy ItHEasy() {return GetHeadIterEasy ();} + IterEasy ItTEasy() {return GetTailIterEasy ();} + IterEasyID ItHID () {return GetHeadIterEasyID ();} + IterEasyID ItTID () {return GetTailIterEasyID ();} IterEasyC ItHEasy() const{return GetHeadIterEasy ();} IterEasyC ItTEasy() const{return GetTailIterEasy ();} diff --git a/ZCppMain/ZtCSimList.H b/ZCppMain/ZtCSimList.H index 54bd1b3..81077ac 100644 --- a/ZCppMain/ZtCSimList.H +++ b/ZCppMain/ZtCSimList.H @@ -2341,22 +2341,22 @@ namespace ZNsMain IterEasyIDc ItTIDc () const{return (IterEasyIDc)mp_TailLink;} - void ItNext(ZCLink* & APR_CLink ) { MoveNextIter(APR_CLink) ; } - void ItNext(IterEasyID & APPI_IterEasyID) { MoveNextIter(APPI_IterEasyID) ; } - void ItNext(iterator & ARR_Iterator ) { ++ARR_Iterator ; } + void ItNext(ZCLink* & APR_CLink ) { MoveNextIter(APR_CLink) ; } + void ItNext(IterEasyID & AH_IterEasyID) { MoveNextIter(AH_IterEasyID); } + void ItNext(iterator & ARR_Iterator ) { ++ARR_Iterator ; } /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ - void ItNext(ZCLinkC* & APR_CLink ) const{ MoveNextIter(APR_CLink) ; } - void ItNext(IterEasyIDc& APPI_IterEasyID) const{ MoveNextIter(APPI_IterEasyID) ; } - void ItNext(iteratorN & ARR_Iterator ) const{ ++ARR_Iterator ; } + void ItNext(ZCLinkC* & APR_CLink ) const{ MoveNextIter(APR_CLink) ; } + void ItNext(IterEasyIDc & AH_IterEasyID) const{ MoveNextIter(AH_IterEasyID); } + void ItNext(iteratorN & ARR_Iterator ) const{ ++ARR_Iterator ; } - TypeData & ItD(ZCLink* AP_CLink ) { return **AP_CLink; } - TypeData & ItD(IterEasyID AH_IterEasyID ) { return ItD((ZCLink *)AH_IterEasyID); } - TypeData & ItD(iterator & ARR_Iterator ) { return *ARR_Iterator; } + TypeData & ItD(ZCLink* AP_CLink ) { return **AP_CLink; } + TypeData & ItD(IterEasyID AH_IterEasyID ) { return **((ZCLink *)AH_IterEasyID); } + TypeData & ItD(iterator & ARR_Iterator ) { return *ARR_Iterator; } /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ - TypeDataC& ItD(ZCLinkC* AP_CLink ) const{ return **AP_CLink; } - TypeDataC& ItD(IterEasyIDc AH_IterEasyID ) const{ return ItD((ZCLinkC*)AH_IterEasyID); } - TypeDataC& ItD(iteratorN & ARR_Iterator ) const{ return *ARR_Iterator; } + TypeDataC& ItD(ZCLinkC* AP_CLink ) const{ return **AP_CLink; } + TypeDataC& ItD(IterEasyIDc AH_IterEasyID ) const{ return **((ZCLinkC*)AH_IterEasyID); } + TypeDataC& ItD(iteratorN& ARR_Iterator ) const{ return *ARR_Iterator; } iterator begin () { return ZCNodePoint (*this); }