From 69bcf4846bf4eb1da0721033b9625908d37297d4 Mon Sep 17 00:00:00 2001 From: sauron Date: Thu, 4 Mar 2021 18:06:15 +0900 Subject: [PATCH] edit ZtCObjList.H --- ZCppMain/ZtCArray.H | 6 ++-- ZCppMain/ZtCObjList.H | 96 +++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/ZCppMain/ZtCArray.H b/ZCppMain/ZtCArray.H index 0729fc6..4678a6c 100644 --- a/ZCppMain/ZtCArray.H +++ b/ZCppMain/ZtCArray.H @@ -423,7 +423,7 @@ namespace ZNsMain __for0(TypeSize, i, ml_UseSize) { - ZNsMain::CTypeData_T:: + ZNsMain::ZtCTypeData:: GetObjRef(AO_Functor)(*VP_TypeArr); ++VP_TypeArr; /* 위 코드로 인해서, AO_Functor 이 함수일 때 뿐이 아니라, @@ -459,7 +459,7 @@ namespace ZNsMain __for0(TypeSize, i, ml_UseSize) { - ZNsMain::CTypeData_T:: + ZNsMain::ZtCTypeData:: GetObjRef(AO_Functor)(*VP_TypeArr, AO_TypeHelp); ++VP_TypeArr; }/* __for0(TypeSize, i, ml_UseSize)*/ @@ -495,7 +495,7 @@ namespace ZNsMain __for0(TypeSize, i, ml_UseSize) { - ZNsMain::CTypeData_T::GetObjRef(AO_Functor) + ZNsMain::ZtCTypeData::GetObjRef(AO_Functor) (*VP_TypeArr, AO_TypeHelp1, AO_TypeHelp2); ++VP_TypeArr; /////////////////////////////////////// diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index 2044dd0..7170470 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -45,7 +45,7 @@ namespace ZNsMain class ZCIterator; class ZCLink ; public: - typedef ZCLink* ZTyIterEasy; // 가장 대표적으로 쓰일 수 있는 반복자. + typedef ZCLink* IterEasy; // 가장 대표적으로 쓰일 수 있는 반복자. typedef ZCIterator iterator; typedef const ZCIterator const_iterator; public: @@ -736,21 +736,21 @@ namespace ZNsMain const ZCLink* GetTailLinkPtr() const*/ - ZTyIterEasy GetHeadIterEasy (){return GetHeadLinkPtr();} - ZTyIterEasy GetTailIterEasy (){return GetTailLinkPtr();} - ZTyIterEasyID GetHeadIterEasyID(){return (ZTyIterEasyID)GetHeadLinkPtr();} - ZTyIterEasyID GetTailIterEasyID(){return (ZTyIterEasyID)GetTailLinkPtr();} + IterEasy GetHeadIterEasy (){return GetHeadLinkPtr();} + IterEasy GetTailIterEasy (){return GetTailLinkPtr();} + IterEasyID GetHeadIterEasyID(){return (IterEasyID)GetHeadLinkPtr();} + IterEasyID GetTailIterEasyID(){return (IterEasyID)GetTailLinkPtr();} - ZTyIterEasy GetHeadIterEasy () const{return GetHeadLinkPtr();} - ZTyIterEasy GetTailIterEasy () const{return GetTailLinkPtr();} - ZTyIterEasyID GetHeadIterEasyID() const{return (ZTyIterEasyID)GetHeadLinkPtr();} - ZTyIterEasyID GetTailIterEasyID() const{return (ZTyIterEasyID)GetTailLinkPtr();} + IterEasy GetHeadIterEasy () const{return GetHeadLinkPtr();} + IterEasy GetTailIterEasy () const{return GetTailLinkPtr();} + IterEasyID GetHeadIterEasyID() const{return (IterEasyID)GetHeadLinkPtr();} + IterEasyID GetTailIterEasyID() const{return (IterEasyID)GetTailLinkPtr();} - ZTyIterEasyID ItHead() {return GetHeadIterEasyID();} - ZTyIterEasyID ItTail() {return GetTailIterEasyID();} + IterEasyID ItHead() {return GetHeadIterEasyID();} + IterEasyID ItTail() {return GetTailIterEasyID();} - ZTyIterEasyID ItHead() const{return GetHeadIterEasyID();} - ZTyIterEasyID ItTail() const{return GetTailIterEasyID();} + IterEasyID ItHead() const{return GetHeadIterEasyID();} + IterEasyID ItTail() const{return GetTailIterEasyID();} Type& operator[](TypSize AL_Index) @@ -1855,11 +1855,11 @@ namespace ZNsMain }/* void MoveNextIter(iterator& ARR_CIterator)*/ - void MoveNextIter(ZTyIterEasyID& ARRI_ZTyIterEasyID) const + void MoveNextIter(IterEasyID& ARRI_IterEasyID) const { - MoveNextIter((ZCLink*&)(ARRI_ZTyIterEasyID)); + MoveNextIter((ZCLink*&)(ARRI_IterEasyID)); }/* - void MoveNextIter(ZTyIterEasyID& ARRI_ZTyIterEasyID) const*/ + void MoveNextIter(IterEasyID& ARRI_IterEasyID) const*/ void MoveNextIter(const ZCLink*& APR_CLink) const { @@ -1873,11 +1873,11 @@ namespace ZNsMain }/* void MoveNextIter(const iterator& ARR_CIterator) const*/ - void MoveNextIter(ZTyIterEasyIDc& ARRI_ZTyIterEasyID) const + void MoveNextIter(IterEasyIDc& ARRI_IterEasyID) const { - MoveNextIter((const ZCLink*&)(ARRI_ZTyIterEasyID)); + MoveNextIter((const ZCLink*&)(ARRI_IterEasyID)); }/* - void MoveNextIter(ZTyIterEasyIDc& ARRI_ZTyIterEasyID) const*/ + void MoveNextIter(IterEasyIDc& ARRI_IterEasyID) const*/ void MovePrevIter(ZCLink*& APR_CLink) @@ -1892,11 +1892,11 @@ namespace ZNsMain }/* void MovePrevIter(iterator& ARR_CIterator)*/ - void MovePrevIter(ZTyIterEasyID& ARRI_ZTyIterEasyID) + void MovePrevIter(IterEasyID& ARRI_IterEasyID) { - MovePrevIter((ZCLink*&)(ARRI_ZTyIterEasyID)); + MovePrevIter((ZCLink*&)(ARRI_IterEasyID)); }/* - void MovePrevIter(ZTyIterEasyID& ARRI_ZTyIterEasyID)*/ + void MovePrevIter(IterEasyID& ARRI_IterEasyID)*/ void MovePrevIter(const ZCLink*& APR_CLink) const { @@ -1910,11 +1910,11 @@ namespace ZNsMain }/* void MovePrevIter(const iterator& ARR_CIterator) const*/ - void MovePrevIter(ZTyIterEasyIDc& ARRI_ZTyIterEasyID) const + void MovePrevIter(IterEasyIDc& ARRI_IterEasyID) const { - MovePrevIter((const ZCLink*&)(ARRI_ZTyIterEasyID)); + MovePrevIter((const ZCLink*&)(ARRI_IterEasyID)); }/* - void MovePrevIter(ZTyIterEasyIDc& ARRI_ZTyIterEasyID) const*/ + void MovePrevIter(IterEasyIDc& ARRI_IterEasyID) const*/ Type& GetDataInIter(ZCLink* AP_CLink) @@ -1929,11 +1929,11 @@ namespace ZNsMain }/* Type& GetDataInIter(iterator& ARR_CIterator)*/ - Type& GetDataInIter(ZTyIterEasyID ARRI_ZTyIterEasyID) + Type& GetDataInIter(IterEasyID ARRI_IterEasyID) { - return GetDataInIter((ZCLink*)ARRI_ZTyIterEasyID); + return GetDataInIter((ZCLink*)ARRI_IterEasyID); }/* - Type& GetDataInIter(ZTyIterEasyID ARRI_ZTyIterEasyID)*/ + Type& GetDataInIter(IterEasyID ARRI_IterEasyID)*/ Type& GetDataInIter(ZCLink* AP_CLink, TypeSize AI_FarNum) @@ -1948,11 +1948,11 @@ namespace ZNsMain }/* Type& GetDataInIter(iterator& ARR_CIterator, TypeSize AI_FarNum)*/ - Type& GetDataInIter(ZTyIterEasyID ARRI_ZTyIterEasyID, TypeSize AI_FarNum) + Type& GetDataInIter(IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum) { - return GetDataInIter((ZCLink*)ARRI_ZTyIterEasyID, AI_FarNum); + return GetDataInIter((ZCLink*)ARRI_IterEasyID, AI_FarNum); }/* - Type& GetDataInIter(ZTyIterEasyID ARRI_ZTyIterEasyID, TypeSize AI_FarNum)*/ + Type& GetDataInIter(IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum)*/ const Type& GetDataInIter(const ZCLink* AP_CLink) const @@ -1967,11 +1967,11 @@ namespace ZNsMain }/* const Type& GetDataInIter(const iterator& ARR_CIterator) const*/ - const Type& GetDataInIter(ZTyIterEasyIDc ARRI_ZTyIterEasyID) const + const Type& GetDataInIter(IterEasyIDc ARRI_IterEasyID) const { - return GetDataInIter((const ZCLink*)ARRI_ZTyIterEasyID); + return GetDataInIter((const ZCLink*)ARRI_IterEasyID); }/* - const Type& GetDataInIter(ZTyIterEasyIDc ARRI_ZTyIterEasyID) const*/ + const Type& GetDataInIter(IterEasyIDc ARRI_IterEasyID) const*/ const Type& GetDataInIter(const ZCLink* AP_CLink, TypeSize AI_FarNum) const @@ -1986,28 +1986,28 @@ namespace ZNsMain }/* const Type& GetDataInIter(const iterator& ARR_CIterator, TypeSize AI_FarNum) const*/ - const Type& GetDataInIter(ZTyIterEasyIDc ARRI_ZTyIterEasyID, TypeSize AI_FarNum) const + const Type& GetDataInIter(IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const { - return GetDataInIter((ZCLink*)ARRI_ZTyIterEasyID, AI_FarNum); + return GetDataInIter((ZCLink*)ARRI_IterEasyID, AI_FarNum); }/* - const Type& GetDataInIter(ZTyIterEasyIDc ARRI_ZTyIterEasyID, TypeSize AI_FarNum) const*/ + const Type& GetDataInIter(IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const*/ // 아래 ItD() 함수는 GetDataInIter() 를 짧게 줄인 것이다. - Type& ItD(ZCLink* AP_CLink ){return GetDataInIter(AP_CLink );} + Type& ItD(ZCLink* AP_CLink ){return GetDataInIter(AP_CLink );} Type& ItD(iterator& ARR_CIterator ){return GetDataInIter(ARR_CIterator );} - Type& ItD(ZTyIterEasyID ARRI_ZTyIterEasyID ){return GetDataInIter(ARRI_ZTyIterEasyID );} - Type& ItD(ZCLink* AP_CLink , TypeSize AI_FarNum){return GetDataInIter(AP_CLink , AI_FarNum);} + Type& ItD(IterEasyID ARRI_IterEasyID ){return GetDataInIter(ARRI_IterEasyID );} + Type& ItD(ZCLink* AP_CLink , TypeSize AI_FarNum){return GetDataInIter(AP_CLink , AI_FarNum);} Type& ItD(iterator& ARR_CIterator , TypeSize AI_FarNum){return GetDataInIter(ARR_CIterator , AI_FarNum);} - Type& ItD(ZTyIterEasyID ARRI_ZTyIterEasyID, TypeSize AI_FarNum){return GetDataInIter(ARRI_ZTyIterEasyID, AI_FarNum);} + Type& ItD(IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum){return GetDataInIter(ARRI_IterEasyID, AI_FarNum);} - const Type& ItD(const ZCLink* AP_CLink ) const{return GetDataInIter(AP_CLink );} - const Type& ItD(const iterator& ARR_CIterator ) const{return GetDataInIter(ARR_CIterator );} - const Type& ItD(ZTyIterEasyIDc ARRI_ZTyIterEasyID ) const{return GetDataInIter(ARRI_ZTyIterEasyID );} - const Type& ItD(const ZCLink* AP_CLink , TypeSize AI_FarNum) const{return GetDataInIter(AP_CLink );} - const Type& ItD(const iterator& ARR_CIterator , TypeSize AI_FarNum) const{return GetDataInIter(ARR_CIterator , AI_FarNum);} - const Type& ItD(ZTyIterEasyIDc ARRI_ZTyIterEasyID, TypeSize AI_FarNum) const{return GetDataInIter(ARRI_ZTyIterEasyID, AI_FarNum);} + const Type& ItD(const ZCLink* AP_CLink ) const{return GetDataInIter(AP_CLink );} + const Type& ItD(const iterator& ARR_CIterator ) const{return GetDataInIter(ARR_CIterator );} + const Type& ItD(IterEasyIDc ARRI_IterEasyID ) const{return GetDataInIter(ARRI_IterEasyID );} + const Type& ItD(const ZCLink* AP_CLink , TypeSize AI_FarNum) const{return GetDataInIter(AP_CLink );} + const Type& ItD(const iterator& ARR_CIterator , TypeSize AI_FarNum) const{return GetDataInIter(ARR_CIterator , AI_FarNum);} + const Type& ItD(IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const{return GetDataInIter(ARRI_IterEasyID, AI_FarNum);} public: };/* @@ -3200,7 +3200,7 @@ namespace ZNsMain void JoinRhsCutHeadOneAtTail(CObjUnitList& rhs)*/ - TypeData& GetDataInIter(TypeData* AP_Object ){return *AP_Object ;} + TypeData& GetDataInIter(TypeData* AP_Object ){return *AP_Object ;} TypeArr & GetDataInIter(ZCLinkUnit* AP_CLinkUnit){return AP_CLinkUnit->mo_TypeArr;} void MoveNextIter(TypeData*& APR_Object){++APR_Object;}