diff --git a/ZCppMain/ZtCArray.H b/ZCppMain/ZtCArray.H index 0546d94..ca9d88d 100644 --- a/ZCppMain/ZtCArray.H +++ b/ZCppMain/ZtCArray.H @@ -792,19 +792,19 @@ namespace ZNsMain { 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) - { return GetDataInIter((TypeData*)ARRI_IterEasyID , 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 + 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 - { return GetDataInIter((TypeDataC*)ARRI_IterEasyID, AI_FarNum); } + TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID , TypeSize AI_FarNum) const + { return GetDataInIter((TypeDataC*)AH_IterEasyID, AI_FarNum); } TypeData * ItHEasy() {return mp_TypeArr ;} @@ -832,25 +832,27 @@ namespace ZNsMain 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); } + { 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 { 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 ARRI_IterEasyID ) {return GetDataInIter(ARRI_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 ARRI_IterEasyID, TypeSize AI_FarNum) {return GetDataInIter(ARRI_IterEasyID, AI_FarNum);} + 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 );} - TypeDataC& ItD(TypeDataC * AP_Type ) const{return GetDataInIter(AP_Type );} - TypeDataC& ItD(iteratorC & ARR_CIterator ) const{return GetDataInIter(ARR_CIterator );} - TypeDataC& ItD(IterEasyIDc ARRI_IterEasyID ) const{return GetDataInIter(ARRI_IterEasyID );} - 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 ARRI_IterEasyID, TypeSize AI_FarNum) const{return GetDataInIter(ARRI_IterEasyID, AI_FarNum);} + 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 );} + + 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 );} public: };/*