From b325c152fda6e933932805d49b9c37e99fd0f411 Mon Sep 17 00:00:00 2001 From: sauron Date: Tue, 14 Oct 2025 20:16:14 +0900 Subject: [PATCH] commit 2025-10-14 20:16 typedef const IterEasyID IterEasyIDc => typedef const IterEasy* IterEasyIDc : ZCppMain/ZMainHead.H --- ZCppMain/ZMainHead.H | 48 ++++++++++++++++++++++++++------------------ ZCppMain/ZtCArray.H | 42 ++++++++++++++++++++++----------------- ZCppMain/ZtCObjList.H | 54 +++++++++++++++++++++++++------------------------- ZCppMain/ZtCSimList.H | 43 +++++++++++++++++++++------------------- ZCppMain/ZtCTreeData.H | 1 + 5 files changed, 104 insertions(+), 84 deletions(-) diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 022446c..a99184e 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -734,10 +734,14 @@ namespace ZNsMain typedef class ZCIterEasy{} IterEasy, *IterEasyID ; - typedef const IterEasyID IterEasyIDc; + typedef const IterEasy* IterEasyIDc; /*/////////////////////////////////////////////////////////////////////////////// + ■ typedef const IterEasyID IterEasyIDc; + + 라고 하면, IterEasy * const 이지, IterEasy const * 가 아니다! -- 2025-10-14 19:50 + ■ cf) _FOR_ITER_EASY_START0 , _FOR_ITER_EASY_CLOSE0 -- 2025-10-14 16:36 ■ typedef class CIterEasy{} *IterEasyID @@ -767,7 +771,13 @@ namespace ZNsMain 이 IterEasyID 의 name() 값과 같다. -- 2015-11-07 21:34:00 - + + + typedef class ZCIterEasy{} IterEasy, *IterEasyID ; + typedef const IterEasyID IterEasyIDc; + + 라고 하면, IterEasy * const 이지, IterEasy const * 가 아니다. + ///////////////////////////////////////////////////////////////////////////////*/ @@ -5773,7 +5783,7 @@ namespace ZNsMain typedef const TypeIter TypeIterC ; typedef const ZCLink ZCLinkC ; - typedef const IterEasy IterEasyC ; + typedef const ZCLink* IterEasyC ; typedef const ZCLinkOpt ZCLinkOptC ; typedef const ZCDataOpt ZCDataOptC ; @@ -8549,15 +8559,15 @@ namespace ZNsMain - IterEasy GetHeadIterEasy () {return GetHeadLinkPtr();} - IterEasy GetTailIterEasy () {return GetTailLinkPtr();} - IterEasyID GetHeadIterEasyID () {return (IterEasyID)GetHeadLinkPtr();} - IterEasyID GetTailIterEasyID () {return (IterEasyID)GetTailLinkPtr();} + IterEasy GetHeadIterEasy () {return GetHeadLinkPtr();} + IterEasy GetTailIterEasy () {return GetTailLinkPtr();} + IterEasyID GetHeadIterEasyID () {return (IterEasyID) GetHeadLinkPtr();} + IterEasyID GetTailIterEasyID () {return (IterEasyID) GetTailLinkPtr();} - IterEasy GetHeadIterEasy () const{return GetHeadLinkPtr();} - IterEasy GetTailIterEasy () const{return GetTailLinkPtr();} - IterEasyID GetHeadIterEasyID () const{return (IterEasyID)GetHeadLinkPtr();} - IterEasyID GetTailIterEasyID () const{return (IterEasyID)GetTailLinkPtr();} + IterEasy GetHeadIterEasy () const{return GetHeadLinkPtr();} + IterEasy GetTailIterEasy () const{return GetTailLinkPtr();} + IterEasyIDc GetHeadIterEasyID () const{return (IterEasyIDc)GetHeadLinkPtr();} + IterEasyIDc GetTailIterEasyID () const{return (IterEasyIDc)GetTailLinkPtr();} IterEasyIDc GetHeadIterEasyIDc() const{return (IterEasyIDc)GetHeadLinkPtr();} IterEasyIDc GetTailIterEasyIDc() const{return (IterEasyIDc)GetTailLinkPtr();} @@ -8587,13 +8597,13 @@ namespace ZNsMain TypeData & GetDataInIter(ZCLink * AP_CLink ){return **AP_CLink ;} - TypeData & GetDataInIter(IterEasyID & ARRI_IterEasyID ) + TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID ) { return GetDataInIter((ZCLink*)ARRI_IterEasyID ) ;} TypeData & GetDataInIter(iterator & ARR_Iterator ){return *ARR_Iterator;} TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const { return **AP_CLink ;} - TypeDataC& GetDataInIter(IterEasyIDc& ARRI_IterEasyID ) const + TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID ) const { return GetDataInIter((TypeLinkC*)ARRI_IterEasyID) ;} TypeDataC& GetDataInIter(iteratorN & ARR_Iterator ) { return *ARR_Iterator ;} @@ -8601,14 +8611,14 @@ namespace ZNsMain TypeData & GetDataInIter( TypeLink * AP_CLink , TypeSize AI_FarNum) {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } - TypeData & GetDataInIter( IterEasyID & ARRI_IterEasyID, TypeSize AI_FarNum) + TypeData & GetDataInIter( IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum) { return GetDataInIter((ZCLink*)ARRI_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& ARRI_IterEasyID, TypeSize AI_FarNum) const + TypeDataC& GetDataInIter( IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const { return GetDataInIter((ZCLinkC*)ARRI_IterEasyID , AI_FarNum); } TypeDataC& GetDataInIter( iteratorN & ARR_Iterator , TypeSize AI_FarNum) const { return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); } @@ -8653,19 +8663,19 @@ namespace ZNsMain { ItPrev((TypeLinkC*&)(ARRI_IterEasyID)); } TypeData & ItD(IterEasy AP_CLink ) {return GetDataInIter(AP_CLink );} - TypeData & ItD(IterEasyID & AH_IterEasyID ) {return GetDataInIter(AH_IterEasyID );} + 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(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(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);} 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(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);} public : diff --git a/ZCppMain/ZtCArray.H b/ZCppMain/ZtCArray.H index 0072a30..082c118 100644 --- a/ZCppMain/ZtCArray.H +++ b/ZCppMain/ZtCArray.H @@ -31,9 +31,9 @@ namespace ZNsMain typedef const TypeThis TypeThisC ; typedef const TypeData TypeDataC ; - typedef const TypeNode TypeNodeC ; // ZCLinkPoint::GetNode() const 의 반환형. + typedef const TypeData* TypeNodeC ; // ZCLinkPoint::GetNode() const 의 반환형. typedef const TypeIter TypeIterC ; - typedef const IterEasy IterEasyC ; + typedef const TypeData* IterEasyC ; /**********************************************/ typedef const ZCNodePoint ZCNodePointC; @@ -749,15 +749,18 @@ namespace ZNsMain ///////////////////////////////////////////////////////////////////////////*/ - TypeData * GetHeadIterEasy () {return mp_TypeArr ;} - TypeData * GetTailIterEasy () {return mp_TypeArr+ml_UseSize-1 ;} - IterEasyID GetHeadIterEasyID() {return (IterEasyID) mp_TypeArr ;} - IterEasyID GetTailIterEasyID() {return (IterEasyID)(mp_TypeArr+ml_UseSize-1);} + TypeData * GetHeadIterEasy () {return mp_TypeArr ;} + TypeData * GetTailIterEasy () {return mp_TypeArr+ml_UseSize-1 ;} + IterEasyID GetHeadIterEasyID () {return (IterEasyID) mp_TypeArr ;} + IterEasyID GetTailIterEasyID () {return (IterEasyID) (mp_TypeArr+ml_UseSize-1);} - TypeDataC* GetHeadIterEasy () const{return mp_TypeArr ;} - TypeDataC* GetTailIterEasy () const{return mp_TypeArr+ml_UseSize-1 ;} - IterEasyIDc GetHeadIterEasyID() const{return (IterEasyID) mp_TypeArr ;} - IterEasyIDc GetTailIterEasyID() const{return (IterEasyID)(mp_TypeArr+ml_UseSize-1);} + TypeDataC* GetHeadIterEasy () const{return mp_TypeArr ;} + TypeDataC* GetTailIterEasy () const{return mp_TypeArr+ml_UseSize-1 ;} + IterEasyIDc GetHeadIterEasyID () const{return (IterEasyIDc) mp_TypeArr ;} + IterEasyIDc GetTailIterEasyID () const{return (IterEasyIDc)(mp_TypeArr+ml_UseSize-1);} + + IterEasyIDc GetHeadIterEasyIDc() const{return (IterEasyIDc) mp_TypeArr ;} + IterEasyIDc GetTailIterEasyIDc() const{return (IterEasyIDc)(mp_TypeArr+ml_UseSize-1);} void MoveNextIter(TypeData* & APR_CType ) const{++APR_CType ;} void MoveNextIter(iterator & ARR_CIterator) const{++ARR_CIterator;} @@ -780,12 +783,12 @@ namespace ZNsMain TypeData& GetDataInIter(TypeData * AP_CType ) {return *AP_CType ;} TypeData& GetDataInIter(iterator & ARR_CIterator) {return *ARR_CIterator;} - TypeData& GetDataInIter(IterEasyID & AI_IterEasyID) + 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 + TypeDataC& GetDataInIter(IterEasyIDc AI_IterEasyID) const { return *(TypeDataC*)AI_IterEasyID; } @@ -793,14 +796,14 @@ namespace ZNsMain { return *(AP_Type + AI_FarNum) ; } TypeData & GetDataInIter(iterator & ARR_CIterator , TypeSize AI_FarNum) { return *(ARR_CIterator+AI_FarNum) ; } - TypeData & GetDataInIter(IterEasyID & ARRI_IterEasyID , TypeSize AI_FarNum) + TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID , TypeSize AI_FarNum) { return GetDataInIter((TypeData*)ARRI_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& ARRI_IterEasyID , TypeSize AI_FarNum) const + TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID , TypeSize AI_FarNum) const { return GetDataInIter((TypeDataC*)ARRI_IterEasyID, AI_FarNum); } @@ -814,6 +817,9 @@ namespace ZNsMain IterEasyIDc ItHID () const{return (IterEasyID) mp_TypeArr ;} IterEasyIDc ItTID () const{return (IterEasyID)(mp_TypeArr+ml_UseSize-1);} + IterEasyIDc ItHIDc () const{return (IterEasyID) mp_TypeArr ;} + IterEasyIDc ItTIDc () const{return (IterEasyID)(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 @@ -834,17 +840,17 @@ namespace ZNsMain 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(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(IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum) {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& ARRI_IterEasyID ) const{return GetDataInIter(ARRI_IterEasyID );} + 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(IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const{return GetDataInIter(ARRI_IterEasyID, AI_FarNum);} public: };/* diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index d06e38d..a09d397 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -833,7 +833,7 @@ namespace ZNsMain typedef const ZCLink ZCLinkC ; typedef const ZCLinkOpt ZCLinkOptC ; typedef const ZCDataOpt ZCDataOptC ; - typedef const IterEasy IterEasyC ; + typedef const ZCLink* IterEasyC ; typedef ZCNodePointN iteratorN ; @@ -3055,15 +3055,15 @@ namespace ZNsMain - IterEasy GetHeadIterEasy () {return GetHeadLinkPtr();} - IterEasy GetTailIterEasy () {return GetTailLinkPtr();} - IterEasyID GetHeadIterEasyID () {return (IterEasyID)GetHeadLinkPtr();} - IterEasyID GetTailIterEasyID () {return (IterEasyID)GetTailLinkPtr();} + IterEasy GetHeadIterEasy () {return GetHeadLinkPtr();} + IterEasy GetTailIterEasy () {return GetTailLinkPtr();} + IterEasyID GetHeadIterEasyID () {return (IterEasyID) GetHeadLinkPtr();} + IterEasyID GetTailIterEasyID () {return (IterEasyID) GetTailLinkPtr();} - IterEasy GetHeadIterEasy () const{return GetHeadLinkPtr();} - IterEasy GetTailIterEasy () const{return GetTailLinkPtr();} - IterEasyID GetHeadIterEasyID () const{return (IterEasyID)GetHeadLinkPtr();} - IterEasyID GetTailIterEasyID () const{return (IterEasyID)GetTailLinkPtr();} + IterEasy GetHeadIterEasy () const{return GetHeadLinkPtr();} + IterEasy GetTailIterEasy () const{return GetTailLinkPtr();} + IterEasyIDc GetHeadIterEasyID () const{return (IterEasyIDc)GetHeadLinkPtr();} + IterEasyIDc GetTailIterEasyID () const{return (IterEasyIDc)GetTailLinkPtr();} IterEasyIDc GetHeadIterEasyIDc() const{return (IterEasyIDc)GetHeadLinkPtr();} IterEasyIDc GetTailIterEasyIDc() const{return (IterEasyIDc)GetTailLinkPtr();} @@ -3101,25 +3101,25 @@ namespace ZNsMain TypeData & GetDataInIter(ZCLink * AP_CLink ){return **AP_CLink ;} TypeData & GetDataInIter(iterator & AR_Iterator ){return *AR_Iterator;} - TypeData & GetDataInIter(IterEasyID & ARRI_IterEasyID) + TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID) { return GetDataInIter((ZCLink*) ARRI_IterEasyID); } TypeDataC& GetDataInIter(TypeLinkC * AP_CLink ) const{return **AP_CLink ;} TypeDataC& GetDataInIter(iteratorN & AR_Iterator ) const{return *AR_Iterator;} - TypeDataC& GetDataInIter(IterEasyIDc& ARRI_IterEasyID) const + TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID) const { return GetDataInIter((TypeLinkC*)ARRI_IterEasyID); } TypeData & GetDataInIter(TypeLink * AP_CLink , TypeSize AI_FarNum) {return **(AP_CLink->GetNextPrevPtr(AI_FarNum)) ; } - TypeData & GetDataInIter(IterEasyID & ARRI_IterEasyID, TypeSize AI_FarNum) + TypeData & GetDataInIter(IterEasyID ARRI_IterEasyID, TypeSize AI_FarNum) { return GetDataInIter((ZCLink*)ARRI_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& ARRI_IterEasyID, TypeSize AI_FarNum) const + TypeDataC& GetDataInIter(IterEasyIDc ARRI_IterEasyID, TypeSize AI_FarNum) const { return GetDataInIter((ZCLinkC*)ARRI_IterEasyID, AI_FarNum); } TypeDataC& GetDataInIter(iteratorN & ARR_Iterator , TypeSize AI_FarNum) const { return GetDataInIter((ZCLinkC*)ARR_Iterator , AI_FarNum); } @@ -3144,8 +3144,8 @@ namespace ZNsMain IterEasyC ItHEasy() const{return GetHeadIterEasy ();} IterEasyC ItTEasy() const{return GetTailIterEasy ();} - IterEasyIDc ItHID () const{return GetHeadIterEasyID ();} - IterEasyIDc ItTID () const{return GetTailIterEasyID ();} + IterEasyIDc ItHID () const{return GetHeadIterEasyIDc();} + IterEasyIDc ItTID () const{return GetTailIterEasyIDc();} void ItNext(TypeLink* & APR_CLink ) const{ APR_CLink=APR_CLink->GetNextPtr() ;} void ItNext(iterator & ARR_Iterator ) const{++ARR_Iterator;} @@ -3163,22 +3163,22 @@ namespace ZNsMain void ItPrev(IterEasyIDc & ARRI_IterEasyID) const { ItPrev((TypeLinkC*&)(ARRI_IterEasyID)); } - TypeData & ItD(IterEasy AP_CLink ) {return GetDataInIter(AP_CLink );} - TypeData & ItD(IterEasyID & ARRI_IterEasyID) {return GetDataInIter(ARRI_IterEasyID);} - TypeData & ItD(iterator & ARR_Iterator ) {return GetDataInIter(ARR_Iterator );} + 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& ARRI_IterEasyID) const{return GetDataInIter(ARRI_IterEasyID);} - TypeDataC& ItD(iteratorN & ARR_Iterator ) const{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 & ARRI_IterEasyID, TypeSize AI_FarNum) {return GetDataInIter(ARRI_IterEasyID, AI_FarNum);} - TypeData & ItD(iterator & ARR_Iterator , TypeSize AI_FarNum) {return GetDataInIter(ARR_Iterator , AI_FarNum);} + 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);} - TypeDataC& ItD(IterEasyC AP_CLink , TypeSize AI_FarNum) const{return GetDataInIter(AP_CLink , AI_FarNum);} - TypeDataC& ItD(IterEasyIDc& ARRI_IterEasyID, TypeSize AI_FarNum) const{return GetDataInIter(ARRI_IterEasyID, AI_FarNum);} - TypeDataC& ItD(iteratorN& ARR_Iterator , TypeSize AI_FarNum) const{return GetDataInIter(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);} diff --git a/ZCppMain/ZtCSimList.H b/ZCppMain/ZtCSimList.H index fae14bd..c3a42ab 100644 --- a/ZCppMain/ZtCSimList.H +++ b/ZCppMain/ZtCSimList.H @@ -1678,21 +1678,24 @@ namespace ZNsMain TypeDataC& back () const{return mp_TailLink->mo_DataObjt;} - ZCLink * GetHeadLinkPtr () {return mp_HeadLink;} - ZCLink * GetHeadIterEasy () {return mp_HeadLink;} - IterEasyID GetHeadIterEasyID () {return (IterEasyID)mp_HeadLink;} + ZCLink * GetHeadLinkPtr () {return mp_HeadLink;} + ZCLink * GetHeadIterEasy () {return mp_HeadLink;} + IterEasyID GetHeadIterEasyID () {return (IterEasyID )mp_HeadLink;} - ZCLink * GetTailLinkPtr () {return mp_TailLink;} - ZCLink * GetTailIterEasy () {return mp_TailLink;} - IterEasyID GetTailIterEasyID () {return (IterEasyID)mp_TailLink;} + ZCLink * GetTailLinkPtr () {return mp_TailLink;} + ZCLink * GetTailIterEasy () {return mp_TailLink;} + IterEasyID GetTailIterEasyID () {return (IterEasyID )mp_TailLink;} - ZCLinkC* GetHeadLinkPtr () const{return mp_HeadLink;} - ZCLinkC* GetHeadIterEasy () const{return mp_HeadLink;} - IterEasyIDc GetHeadIterEasyID () const{return (IterEasyID)mp_HeadLink;} + ZCLinkC* GetHeadLinkPtr () const{return mp_HeadLink;} + ZCLinkC* GetHeadIterEasy () const{return mp_HeadLink;} + IterEasyIDc GetHeadIterEasyID () const{return (IterEasyIDc)mp_HeadLink;} - ZCLinkC* GetTailLinkPtr () const{return mp_TailLink;} - ZCLinkC* GetTailIterEasy () const{return mp_TailLink;} - IterEasyIDc GetTailIterEasyID () const{return (IterEasyID)mp_TailLink;} + ZCLinkC* GetTailLinkPtr () const{return mp_TailLink;} + ZCLinkC* GetTailIterEasy () const{return mp_TailLink;} + IterEasyIDc GetTailIterEasyID () const{return (IterEasyIDc)mp_TailLink;} + + IterEasyIDc GetHeadIterEasyIDc() const{return (IterEasyIDc)mp_HeadLink;} + IterEasyIDc GetTailIterEasyIDc() const{return (IterEasyIDc)mp_TailLink;} void pop_back (TypeArg AR_Type){ return AddHead(AR_Type); } @@ -2315,13 +2318,13 @@ namespace ZNsMain { MoveNextIter((ZCLinkC*&)APPI_IterEasyID); } - TypeData & GetDataInIter(ZCLink * AP_CLink ){ return **AP_CLink ; } - TypeData & GetDataInIter(IterEasyID & APPI_IterEasyID){ return GetDataInIter((ZCLink*)APPI_IterEasyID) ; } - TypeData & GetDataInIter(iterator & ARR_iterator ){ return *ARR_iterator ; } + TypeData & GetDataInIter(ZCLink * AP_CLink ){ return **AP_CLink ; } + TypeData & GetDataInIter(IterEasyID AH_IterEasyID ){ return GetDataInIter((ZCLink*)AH_IterEasyID) ; } + TypeData & GetDataInIter(iterator & ARR_iterator ){ return *ARR_iterator ; } /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ - TypeDataC& GetDataInIter(ZCLinkC * AP_CLink ) const{ return **AP_CLink ; } - TypeDataC& GetDataInIter(IterEasyIDc& APPI_IterEasyID) const{ return GetDataInIter((ZCLinkC*)APPI_IterEasyID) ; } - TypeDataC& GetDataInIter(iteratorN & ARR_iterator ) const{ return *ARR_iterator ; } + TypeDataC& GetDataInIter(ZCLinkC * AP_CLink ) const{ return **AP_CLink ; } + TypeDataC& GetDataInIter(IterEasyIDc AH_IterEasyID ) const{ return GetDataInIter((ZCLinkC*)AH_IterEasyID); } + TypeDataC& GetDataInIter(iteratorN & ARR_iterator ) const{ return *ARR_iterator ; } ZCLink * ItHEasy() {return mp_HeadLink;} @@ -2347,11 +2350,11 @@ namespace ZNsMain TypeData & ItD(ZCLink* AP_CLink ) { return **AP_CLink; } - TypeData & ItD(IterEasyID & APPI_IterEasyID ) { return ItD((ZCLink*)APPI_IterEasyID); } + TypeData & ItD(IterEasyID APPI_IterEasyID ) { return ItD((ZCLink*)APPI_IterEasyID); } TypeData & ItD(iterator & ARR_Iterator ) { return *ARR_Iterator; } /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ TypeDataC& ItD(ZCLinkC* AP_CLink ) const{ return **AP_CLink; } - TypeDataC& ItD(IterEasyIDc& APPI_IterEasyID ) const{ return ItD((ZCLinkC*)APPI_IterEasyID); } + TypeDataC& ItD(IterEasyIDc APPI_IterEasyID ) const{ return ItD((ZCLinkC*)APPI_IterEasyID); } TypeDataC& ItD(iteratorN & ARR_Iterator ) const{ return *ARR_Iterator; } diff --git a/ZCppMain/ZtCTreeData.H b/ZCppMain/ZtCTreeData.H index d834470..70ee00a 100644 --- a/ZCppMain/ZtCTreeData.H +++ b/ZCppMain/ZtCTreeData.H @@ -470,6 +470,7 @@ namespace ZNsMain ■ class ZtCTreeData 예제 -- 2015-08-14 14:00 #include + #include "ZCppMain/ZtCStringEx.H" #include "ZCppMain/ZtCTreeData.H" using namespace std ;