diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 76290f7..2c2a16d 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -8630,32 +8630,6 @@ namespace ZNsMain void MovePrevIter(iteratorN & ARR_Iterator ) const{--ARR_Iterator;} - TypeData & GetDataInIter(ZCLink * AP_CLink ){return **AP_CLink ;} - TypeData & GetDataInIter(iterator & ARR_Iterator ){return *ARR_Iterator;} - TypeData & GetDataInIter(IterEasyID AH_IterEasyID ) - { return GetDataInIter((TypeLink* )AH_IterEasyID);} - - TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const{ return **AP_CLink ;} - TypeDataC& GetDataInIter(iteratorN & ARR_Iterator ) const{ return *ARR_Iterator ;} - TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID ) const - { return GetDataInIter((TypeLinkC*)AH_IterEasyID);} - - - TypeData & GetDataInIter( TypeLink * AP_CLink , TypeSize AI_FarNum) - {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } - TypeData & GetDataInIter( IterEasyID AH_IterEasyID, TypeSize AI_FarNum) - { return GetDataInIter((ZCLink*)AH_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 - {return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; } - TypeDataC& GetDataInIter( IterEasyIDc AH_IterEasyID, TypeSize AI_FarNum) const - { return GetDataInIter((ZCLinkC*)AH_IterEasyID , AI_FarNum); } - TypeDataC& GetDataInIter( iteratorN & ARR_Iterator , TypeSize AI_FarNum) const - { return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); } - - iterator begin () { return ZCNodePoint (*this); } iteratorN begin () const{ return ZCNodePointN(*this); } iterator end () { return ZCNodePoint ::MakeTailPoint(*this); } @@ -8694,21 +8668,31 @@ namespace ZNsMain void ItPrev(IterEasyIDc & ARRI_IterEasyID) const { ItPrev((TypeLinkC*&) (ARRI_IterEasyID)); } - TypeData & ItD(IterEasy AP_CLink ) {return GetDataInIter(AP_CLink );} - TypeData & ItD(IterEasyID AH_IterEasyID ) {return GetDataInIter(AH_IterEasyID );} - TypeData & ItD(iterator & ARR_Iterator ) {return GetDataInIter(ARR_Iterator );} - TypeDataC& ItD(IterEasyC AP_CLink ) const {return GetDataInIter(AP_CLink );} - TypeDataC& ItD(IterEasyIDc AH_IterEasyID ) const {return GetDataInIter(AH_IterEasyID );} - TypeDataC& ItD(iteratorN & ARR_Iterator ) const {return GetDataInIter(ARR_Iterator );} - /********************************************************************************************************************************/ - TypeData & ItD(IterEasy AP_CLink , TypeSize AI_FarNum) {return GetDataInIter(AP_CLink , AI_FarNum);} - TypeData & ItD(IterEasyID AH_IterEasyID, TypeSize AI_FarNum) {return GetDataInIter(AH_IterEasyID, AI_FarNum);} - TypeData & ItD(iterator & ARR_Iterator , TypeSize AI_FarNum) {return GetDataInIter(ARR_Iterator , AI_FarNum);} + TypeData & ItD(ZCLink * AP_CLink ){return **AP_CLink ;} + TypeData & ItD(iterator & ARR_Iterator ){return *ARR_Iterator;} + TypeData & ItD(IterEasyID AH_IterEasyID ) + { return ItD((TypeLink* )AH_IterEasyID);} - TypeDataC& ItD(IterEasyC AP_CLink , TypeSize AI_FarNum) const {return GetDataInIter(AP_CLink , AI_FarNum);} - TypeDataC& ItD(IterEasyIDc AH_IterEasyID, TypeSize AI_FarNum) const {return GetDataInIter(AH_IterEasyID, AI_FarNum);} - TypeDataC& ItD(iteratorN & ARR_Iterator , TypeSize AI_FarNum) const {return GetDataInIter(ARR_Iterator , AI_FarNum);} + TypeDataC& ItD(TypeLinkC * AP_CLink ) const{ return **AP_CLink ;} + TypeDataC& ItD(iteratorN & ARR_Iterator ) const{ return *ARR_Iterator ;} + TypeDataC& ItD(IterEasyIDc AH_IterEasyID ) const + { return ItD((TypeLinkC*)AH_IterEasyID);} + + + TypeData & ItD( TypeLink * AP_CLink , TypeSize AI_FarNum) + {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } + TypeData & ItD( IterEasyID AH_IterEasyID, TypeSize AI_FarNum) + { return ItD((ZCLink*)AH_IterEasyID , AI_FarNum); } + TypeData & ItD( iterator & ARR_Iterator , TypeSize AI_FarNum) + { return ItD((ZCLink*)ARR_Iterator , AI_FarNum); } + + TypeDataC& ItD( TypeLinkC * AP_CLink , TypeSize AI_FarNum) const + {return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; } + TypeDataC& ItD( IterEasyIDc AH_IterEasyID, TypeSize AI_FarNum) const + { return ItD((ZCLinkC*)AH_IterEasyID , AI_FarNum); } + TypeDataC& ItD( iteratorN & ARR_Iterator , TypeSize AI_FarNum) const + { return ItD((ZCLinkC*)ARR_Iterator , AI_FarNum); } public : };/* diff --git a/ZCppMain/ZtCArray.H b/ZCppMain/ZtCArray.H index c5f2d54..193b244 100644 --- a/ZCppMain/ZtCArray.H +++ b/ZCppMain/ZtCArray.H @@ -781,32 +781,6 @@ 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) - { 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 - { return *(TypeDataC*)AI_IterEasyID; } - - - TypeData & GetDataInIter(TypeData * AP_Type , TypeSize AI_FarNum) - { return *(AP_Type + AI_FarNum) ; } - TypeData & GetDataInIter(iterator & ARR_CIterator , TypeSize AI_FarNum) - { return *(ARR_CIterator+AI_FarNum) ; } - TypeData & GetDataInIter(IterEasyID AH_IterEasyID , TypeSize AI_FarNum) - { return GetDataInIter((TypeData*)AH_IterEasyID , AI_FarNum); } - - TypeDataC& GetDataInIter(TypeDataC * AP_Type , TypeSize AI_FarNum) const - { return *(AP_Type + AI_FarNum); } - TypeDataC& GetDataInIter(iterator & ARR_CIterator , TypeSize AI_FarNum) const - { return *(ARR_CIterator+AI_FarNum); } - TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID , TypeSize AI_FarNum) const - { return GetDataInIter((TypeDataC*)AH_IterEasyID, AI_FarNum); } - - TypeData * ItHEasy() {return mp_TypeArr ;} TypeData * ItTEasy() {return mp_TypeArr+ml_UseSize-1 ;} IterEasyID ItHID () {return (IterEasyID ) mp_TypeArr ;} @@ -838,21 +812,30 @@ namespace ZNsMain void ItPrev(IterEasyIDc & AI_IterEasyID) const { ItPrev((TypeDataC*&)AI_IterEasyID); } - TypeData & ItD(TypeData * AP_Type ) {return GetDataInIter(AP_Type );} - TypeData & ItD(iterator & ARR_CIterator) {return GetDataInIter(ARR_CIterator );} - TypeData & ItD(IterEasyID AH_IterEasyID) {return GetDataInIter(AH_IterEasyID );} + TypeData& ItD(TypeData * AP_CType ) {return *AP_CType ;} + TypeData& ItD(iterator & ARR_CIterator) {return *ARR_CIterator;} + TypeData& ItD(IterEasyID AI_IterEasyID) + { return *(TypeData *)AI_IterEasyID; } - TypeDataC& ItD(TypeDataC * AP_Type ) const{return GetDataInIter(AP_Type );} - TypeDataC& ItD(iteratorC & ARR_CIterator) const{return GetDataInIter(ARR_CIterator );} - TypeDataC& ItD(IterEasyIDc AH_IterEasyID) const{return GetDataInIter(AH_IterEasyID );} + TypeDataC& ItD(TypeDataC * AP_CType ) const{return *AP_CType;} + TypeDataC& ItD(iteratorC & ARR_CIterator) const{return *ARR_CIterator;} + TypeDataC& ItD(IterEasyIDc AI_IterEasyID) const + { return *(TypeDataC*)AI_IterEasyID; } - TypeData & ItD(TypeData * AP_Type , TypeSize AI_FarNum) {return GetDataInIter(AP_Type , AI_FarNum );} - TypeData & ItD(iterator & ARR_CIterator, TypeSize AI_FarNum) {return GetDataInIter(ARR_CIterator , AI_FarNum );} - TypeData & ItD(IterEasyID AH_IterEasyID, TypeSize AI_FarNum) {return GetDataInIter(AH_IterEasyID , AI_FarNum );} - TypeDataC& ItD(TypeDataC * AP_Type , TypeSize AI_FarNum) const{return GetDataInIter(AP_Type );} - TypeDataC& ItD(iteratorC & ARR_CIterator, TypeSize AI_FarNum) const{return GetDataInIter(ARR_CIterator , AI_FarNum );} - TypeDataC& ItD(IterEasyIDc AH_IterEasyID, TypeSize AI_FarNum) const{return GetDataInIter(AH_IterEasyID , AI_FarNum );} + TypeData & ItD(TypeData * AP_Type , TypeSize AI_FarNum) + { return *(AP_Type + AI_FarNum) ; } + TypeData & ItD(iterator & ARR_CIterator , TypeSize AI_FarNum) + { return *(ARR_CIterator+AI_FarNum) ; } + TypeData & ItD(IterEasyID AH_IterEasyID , TypeSize AI_FarNum) + { return ItD((TypeData*)AH_IterEasyID , AI_FarNum); } + + TypeDataC& ItD(TypeDataC * AP_Type , TypeSize AI_FarNum) const + { return *(AP_Type + AI_FarNum); } + TypeDataC& ItD(iterator & ARR_CIterator , TypeSize AI_FarNum) const + { return *(ARR_CIterator+AI_FarNum); } + TypeDataC& ItD(IterEasyIDc AH_IterEasyID , TypeSize AI_FarNum) const + { return ItD((TypeDataC*)AH_IterEasyID, AI_FarNum); } public: };/* diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index c4e5a37..429c5a9 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -3100,32 +3100,6 @@ 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 AH_IterEasyID) - { return GetDataInIter((TypeLink *)AH_IterEasyID); } - - TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const{return **AP_CLink ;} - TypeDataC& GetDataInIter(iteratorN & AR_Iterator ) const{return *AR_Iterator;} - TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID ) const - { return GetDataInIter((TypeLinkC*)AH_IterEasyID); } - - - TypeData & GetDataInIter(TypeLink * AP_CLink , TypeSize AI_FarNum) - {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } - TypeData & GetDataInIter(IterEasyID AH_IterEasyID, TypeSize AI_FarNum) - { return GetDataInIter((ZCLink*)AH_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 - {return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; } - TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID, TypeSize AI_FarNum) const - { return GetDataInIter((ZCLinkC*)AH_IterEasyID , AI_FarNum); } - TypeDataC& GetDataInIter(iteratorN & ARR_Iterator , TypeSize AI_FarNum) const - { return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); } - - iterator begin () { return ZCNodePoint (*this); } iteratorN begin () const{ return ZCNodePointN(*this); } iterator end () { return ZCNodePoint ::MakeTailPoint(*this); } @@ -3164,22 +3138,31 @@ namespace ZNsMain void ItPrev(IterEasyIDc & ARRI_IterEasyID) const { ItPrev((TypeLinkC*&)(ARRI_IterEasyID)); } - TypeData & ItD(IterEasy AP_CLink ) {return GetDataInIter(AP_CLink );} - TypeData & ItD(IterEasyID AH_IterEasyID ) {return GetDataInIter(AH_IterEasyID);} - TypeData & ItD(iterator & ARR_Iterator ) {return GetDataInIter(ARR_Iterator );} - TypeDataC& ItD(IterEasyC AP_CLink ) const{return GetDataInIter(AP_CLink );} - TypeDataC& ItD(IterEasyIDc AH_IterEasyID ) const{return GetDataInIter(AH_IterEasyID);} - TypeDataC& ItD(iteratorN & ARR_Iterator ) const{return GetDataInIter(ARR_Iterator );} + TypeData & ItD(TypeLink * AP_CLink ){return **AP_CLink ;} + TypeData & ItD(iterator & AR_Iterator ){return *AR_Iterator;} + TypeData & ItD(IterEasyID AH_IterEasyID) + { return ItD((TypeLink *)AH_IterEasyID); } + + TypeDataC& ItD(TypeLinkC * AP_CLink ) const{return **AP_CLink ;} + TypeDataC& ItD(iteratorN & AR_Iterator ) const{return *AR_Iterator;} + TypeDataC& ItD(IterEasyIDc AH_IterEasyID ) const + { return ItD((TypeLinkC*)AH_IterEasyID); } - TypeData & ItD(IterEasy AP_CLink , TypeSize AI_FarNum) {return GetDataInIter(AP_CLink , AI_FarNum);} - TypeData & ItD(IterEasyID AH_IterEasyID, TypeSize AI_FarNum) {return GetDataInIter(AH_IterEasyID , AI_FarNum);} - TypeData & ItD(iterator & ARR_Iterator , TypeSize AI_FarNum) {return GetDataInIter(ARR_Iterator , AI_FarNum);} + TypeData & ItD(TypeLink * AP_CLink , TypeSize AI_FarNum) + {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } + TypeData & ItD(IterEasyID AH_IterEasyID, TypeSize AI_FarNum) + { return ItD((ZCLink*)AH_IterEasyID , AI_FarNum); } + TypeData & ItD(iterator & ARR_Iterator , TypeSize AI_FarNum) + { return ItD((ZCLink* )ARR_Iterator , AI_FarNum); } - TypeDataC& ItD(IterEasyC AP_CLink , TypeSize AI_FarNum) const{return GetDataInIter(AP_CLink , AI_FarNum);} - TypeDataC& ItD(IterEasyIDc AH_IterEasyID, TypeSize AI_FarNum) const{return GetDataInIter(AH_IterEasyID , AI_FarNum);} - TypeDataC& ItD(iteratorN & ARR_Iterator , TypeSize AI_FarNum) const{return GetDataInIter(ARR_Iterator , AI_FarNum);} + TypeDataC& ItD(TypeLinkC * AP_CLink , TypeSize AI_FarNum) const + {return **(AP_CLink->GetNextPrePtr(AI_FarNum)) ; } + TypeDataC& ItD(IterEasyIDc AH_IterEasyID, TypeSize AI_FarNum) const + { return ItD((ZCLinkC*)AH_IterEasyID , AI_FarNum); } + TypeDataC& ItD(iteratorN & ARR_Iterator , TypeSize AI_FarNum) const + { return ItD((ZCLinkC*)ARR_Iterator , AI_FarNum); }