diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 2221adb..6263130 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -5709,6 +5709,7 @@ namespace ZNsMain typedef TTypSize TypeSize ; typedef TMoveObj TypeMoveObj ; typedef ZCLink TypeLink ; + typedef ZCLink TypeNode ; // ZCLinkPoint::GetNode() 의 반환형. typedef ZCLinkPoint TypeLinkPoint ; typedef ZCLinkPoint TypeIter ; @@ -5721,6 +5722,7 @@ namespace ZNsMain typedef const TypeThis TypeThisC ; typedef const TypeList TypeListC ; typedef const TypeData TypeDataC ; + typedef const TypeNode TypeNodeC ; // ZCLinkPoint::GetNode() const 의 반환형. typedef const ZCLink TypeLinkC ; typedef const ZCLink ZCLinkC ; @@ -5903,10 +5905,10 @@ namespace ZNsMain public : TypeThis & GetMain() {return mr_CurrList;} - TypeLink & GetNode() {return *mp_CurrLink;} + TypeNode & GetNode() {return *mp_CurrLink;} TypeThisC& GetMain() const{return mr_CurrList;} - TypeLinkC& GetNode() const{return *mp_CurrLink;} + TypeNodeC& GetNode() const{return *mp_CurrLink;} /***************************************************/ TypeSize GetPos () const{return ml_CurrPos ;} /***************************************************/ diff --git a/ZCppMain/ZtCArray.H b/ZCppMain/ZtCArray.H index 9d2a7af..4209356 100644 --- a/ZCppMain/ZtCArray.H +++ b/ZCppMain/ZtCArray.H @@ -24,12 +24,14 @@ namespace ZNsMain public: class ZCDataPoint; class ZCDataPointC ; public: - typedef Type* IterEasy ; + typedef TypeData* IterEasy ; + typedef TypeData* TypeNode ; // ZCLinkPoint::GetNode() 의 반환형. typedef ZCDataPoint TypeIter ; typedef ZtCArray TypeThis ; typedef const TypeThis TypeThisC ; typedef const TypeData TypeDataC ; + typedef const TypeNode TypeNodeC ; // ZCLinkPoint::GetNode() const 의 반환형. typedef const IterEasy IterEasyC ; typedef ZCDataPointC iteratorC ; @@ -73,10 +75,10 @@ namespace ZNsMain TypeThis & GetMain() {return mr_CArray ;} - TypeData * GetNode() {return mp_Data ;} + TypeNode GetNode() {return mp_Data ;} TypeThisC& GetMain() const{return mr_CArray ;} - TypeDataC* GetNode() const{return mp_Data ;} + TypeNodeC GetNode() const{return mp_Data ;} TypeSize GetPos () const{return ml_ElePos ;} TypeSize size () const{return mr_CArray.size();} diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index aa45e75..12c5e58 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -813,6 +813,7 @@ namespace ZNsMain typedef ZtCObjList TypeThis ; typedef ZCLink TypeLink ; + typedef ZCLink TypeNode ; // ZCLinkPoint::GetNode() 의 반환형. typedef TypeThis TypeList ; typedef ZCLink* IterEasy ; // 가장 간단하게 쓰일 수 있는 반복자. @@ -827,6 +828,7 @@ namespace ZNsMain typedef const TypeList TypeListC ; typedef const TypeData TypeDataC ; typedef const TypeLink TypeLinkC ; + typedef const TypeNode TypeNodeC ; // ZCLinkPoint::GetNode() const 의 반환형. typedef const IterEasy IterEasyC ; typedef const ZCLink ZCLinkC ; @@ -1090,10 +1092,10 @@ namespace ZNsMain public : TypeThis & GetMain() {return mr_CurrList;} - TypeLink & GetNode() {return *mp_CurrLink;} + TypeNode & GetNode() {return *mp_CurrLink;} TypeThisC& GetMain() const{return mr_CurrList;} - TypeLinkC& GetNode() const{return *mp_CurrLink;} + TypeNodeC& GetNode() const{return *mp_CurrLink;} /***************************************************/ TypeSize GetPos () const{return ml_CurrPos ;} /***************************************************/ diff --git a/ZCppMainTest/ZtCObjList_000.cpp b/ZCppMainTest/ZtCObjList_000.cpp index 67cc0f8..23d5225 100644 --- a/ZCppMainTest/ZtCObjList_000.cpp +++ b/ZCppMainTest/ZtCObjList_000.cpp @@ -368,13 +368,12 @@ namespace ZNsMain typedef CStringList1::iterator iterator1 ; - typedef CStringList1::ZCLinkPointEx iteratorEx1; + //typedef CStringList1::ZCLinkPointEx iteratorEx1; typedef CStringList1::ZCLinkPointC iteratorC1 ; iterator1 VO_Iter1 = VO_ListOfStr11.end(); - iteratorEx1 VO_IterEx1 = VO_ListOfStr11.end(); + //iteratorEx1 VO_IterEx1 = VO_ListOfStr11.end(); iteratorC1 VO_IterC1(VO_Iter1); - int VI_LoopCnt = 0; __for_i (CStringList1, VO_ListOfStr11, VO_NowIter) {