From 5e39246c601279eaebd1d8ae1123bcf99d4da2f6 Mon Sep 17 00:00:00 2001 From: sauron Date: Wed, 24 Sep 2025 13:37:25 +0900 Subject: [PATCH] commit 2025-09-24 13:37 delete _CODE_OLD_ codes in ZCppMain/ZtCObjList.H --- ZCppMain/ZtCObjList.H | 116 ---------------------------------------- ZCppMainTest/ZtCObjList_000.cpp | 11 ++++ 2 files changed, 11 insertions(+), 116 deletions(-) diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index 5230a9b..ebf87b0 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -1013,64 +1013,6 @@ namespace ZNsMain protected: - #if(_CODE_OLD_) - - void OnDelete(ZCLink* AP_CutLink) - { - if(TypeInit::ZEUseFini<1) return; - - TypeInit::OnFini(AP_CutLink->mo_Data, *this) ; - } - /*############################################################*/ - - void OnDelete /*//////////////////////////////////////////////*/ - ( - ZCLink* AP_CutHead, TypeSize AI_CutHeadPos, - ZCLink* AP_CutTail, TypeSize AI_CutTailPos - ) - /*############################################################*/ - { - if(TypeInit::ZEUseFini<1) return; - - TypeSize VL_LoopCnt = AI_CutTailPos-AI_CutHeadPos+1 ; - ZCLink* VP_NowLink = AP_CutHead ; - - __for1(TypeSize, i, VL_LoopCnt) - { - TypeInit::OnFini(VP_NowLink->mo_Data, *this) ; - - VP_NowLink = VP_NowLink->mp_NextLink; - }/* - __for1(TypeSize, i, VL_LoopCnt)*/ - } - /*############################################################*/ - - - void OnInsert /*//////////////////////////////////////////////*/ - ( - TypeSize AI_InsertPos , // 삽입되는 위치 - TypeSize AI_InsertSize, // 삽입되는 링크의 갯수 - ZCLink* AP_HeadInsert // 삽입되는 첫번째 링크의 포인터 - ) - /*############################################################*/ - { - if(TypeInit::ZEUseInit<1) return; - - ZCLink* VP_NowLink = AP_HeadInsert; - - __for1(TypeSize, i, AI_InsertSize) - { - TypeInit::OnInit(VP_NowLink->mo_Data, *this); - - VP_NowLink = VP_NowLink->mp_NextLink; - }/* - __for1(TypeSize, i, AI_InsertSize)*/ - } - /*############################################################*/ - - #endif //_CODE_OLD_ - - void JoinAfter(ZCLink* AP_LinkInsert, ZCLink* AP_LinkStd, TypeSize AL_PosStd) { // AP_LinkInsert 를 AL_PosStd 번째 링크인 AP_LinkStd 뒤에 삽입한다. @@ -1078,10 +1020,6 @@ namespace ZNsMain if(AP_LinkStd==0) { - #if(_CODE_OLD_) - OnInsert(1, 1, AP_LinkInsert); - #endif - if(++ml_Size==1) { mp_HeadLink =AP_LinkInsert ; @@ -1101,10 +1039,6 @@ namespace ZNsMain } else { - #if(_CODE_OLD_) - OnInsert(AL_PosStd+1, 1, AP_LinkInsert); - #endif - ++ml_Size; AP_LinkInsert->mp_NextLink = AP_LinkStd->mp_NextLink ; @@ -1142,21 +1076,6 @@ namespace ZNsMain if(this == &AO_CObjList ) return; if(AO_CObjList.ml_Size<1) return; - #if(_CODE_OLD_) - AO_CObjList.OnDelete //////////////////////// - ( - AO_CObjList.mp_HeadLink , 1 , - AO_CObjList.mp_HeadLink->mp_PrevLink, AO_CObjList.ml_Size - ); - /*/////////////////////////////////////////*/ - - this->OnInsert ////////////////////////////// - ( - this->ml_Size+1, AO_CObjList.ml_Size, AO_CObjList.mp_HeadLink - ); - /*/////////////////////////////////////////*/ - #endif //_CODE_OLD_ - if(AP_LinkStd==0) { if(ml_Size==0) @@ -1196,10 +1115,6 @@ namespace ZNsMain protected: ZCLink* CutLink(ZCLink* AP_CutLink) { - #if(_CODE_OLD_) - OnDelete(AP_CutLink); - #endif - if(AP_CutLink==mp_HeadLink) { if(mp_HeadLink==mp_HeadLink->mp_PrevLink) @@ -1226,10 +1141,6 @@ namespace ZNsMain ZCLink* CutLink(ZCLink* AP_CutLink, TypeSize AL_CutPos) { - #if(_CODE_OLD_) - OnDelete(AP_CutLink, AL_CutPos, AP_CutLink, AL_CutPos); - #endif - if(AL_CutPos==1) // 첫째 링크를 삭제. { if(ml_Size==1) @@ -1283,10 +1194,6 @@ namespace ZNsMain #endif // _DEBUG - #if(_CODE_OLD_) - OnDelete(AP_CutHead, AL_CutHeadPos, AP_CutTail, AL_CutTailPos); - #endif - if(AL_CutHeadPos==1 && AL_CutTailPos==ml_Size) // 모든 링크를 삭제할 때. { mp_HeadLink=0; @@ -1802,29 +1709,6 @@ namespace ZNsMain ( ml_Size, mp_HeadLink, mp_HeadLink->mp_PrevLink ); mp_HeadLink= 0; ml_Size= 0; return *this; - - - #if(_CODE_OLD_) - OnDelete /*============================*/ - ( - mp_HeadLink , 1 , - mp_HeadLink->mp_PrevLink, ml_Size - ); - /*=====================================*/ - - ZCLink* VP_DelLink=0 ; - - do /////////////////// - { - VP_DelLink =mp_HeadLink ; - mp_HeadLink=mp_HeadLink->mp_NextLink ; - - delete VP_DelLink; - } - while(--ml_Size>0); - - mp_HeadLink =0; return *this; - #endif //_CODE_OLD_ }/* ZtCObjList& DeleteAll()*/ diff --git a/ZCppMainTest/ZtCObjList_000.cpp b/ZCppMainTest/ZtCObjList_000.cpp index 7c84253..32a05c8 100644 --- a/ZCppMainTest/ZtCObjList_000.cpp +++ b/ZCppMainTest/ZtCObjList_000.cpp @@ -153,6 +153,17 @@ namespace ZNsMain cout<<"# list10 capacity : " <