From 9459bfa70721a06c0a8432d105039a275ca5927c Mon Sep 17 00:00:00 2001 From: sauron Date: Tue, 7 Oct 2025 23:32:26 +0900 Subject: [PATCH] commit 2025-10-07 23:32 add 'const' after SendFreeOut() ZCppMain/ZtCLinkList.H --- ZCppMain/ZMainHead.H | 24 ++++++++--------- ZCppMain/ZtCLinkList.H | 56 ++++++++++++++++++++-------------------- ZCppMain/ZtCObjList.H | 31 ++++++++++------------ ZCppMainTest/ZtCBaseList_000.cpp | 10 +++---- 4 files changed, 59 insertions(+), 62 deletions(-) diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 9334d50..cef7fdb 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -5455,24 +5455,24 @@ namespace ZNsMain protected: - ZCLink* NewLink() + ZCLink* NewLink() const { return new ZCLink; }/* - ZCLink* NewLink()*/ + ZCLink* NewLink() const*/ - ZCLink* NewLink(TypeArg AO_ArgData) + ZCLink* NewLink(TypeArg AO_ArgData) const { return new ZCLink(AO_ArgData); }/* - ZCLink* NewLink(TypeArg AO_ArgData)*/ + ZCLink* NewLink(TypeArg AO_ArgData) const*/ void NewLink //////////////////////////////////////// ( TypeSize AL_NeedCnt , ZCLink*& APR_HeadLink , ZCLink*& APR_TailLink - ) + ) const ///////////////////////////////////////////////////// { APR_HeadLink = new ZCLink; @@ -5499,7 +5499,7 @@ namespace ZNsMain TypeSize AL_NeedCnt , ZCLink*& APR_HeadLink , ZCLink*& APR_TailLink - ) + ) const ///////////////////////////////////////////////////*/ @@ -5571,25 +5571,25 @@ namespace ZNsMain /*protected:*/ private : - _VT_ ZCLink* SendFreeOut() + _VT_ ZCLink* SendFreeOut() const { if(TTypeCRTP::ZEUseCRTP<1) return NewLink(); return GetChildObj().SendFreeOut(); }/* - _VT_ ZCLink* SendFreeOut()*/ + _VT_ ZCLink* SendFreeOut() const*/ - _VT_ ZCLink* SendFreeOut(TypeArg AO_ArgData) + _VT_ ZCLink* SendFreeOut(TypeArg AO_ArgData) const { if(TTypeCRTP::ZEUseCRTP<1) { return NewLink(AO_ArgData); } return GetChildObj().SendFreeOut(AO_ArgData); }/* - _VT_ ZCLink* SendFreeOut(TypeArg AO_ArgData)*/ + _VT_ ZCLink* SendFreeOut(TypeArg AO_ArgData) const*/ _VT_ void SendFreeOut - (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) + (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) const { if(TTypeCRTP::ZEUseCRTP<1) { @@ -5601,7 +5601,7 @@ namespace ZNsMain (AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink)); }/* _VT_ void SendFreeOut - (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) + (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) const */ _VT_ void SendFreeOutCopy /*///////////////////////*/ diff --git a/ZCppMain/ZtCLinkList.H b/ZCppMain/ZtCLinkList.H index 6d7a332..8ea312b 100644 --- a/ZCppMain/ZtCLinkList.H +++ b/ZCppMain/ZtCLinkList.H @@ -1014,16 +1014,16 @@ namespace ZNsMain private: - ZCLink* NewLink() + ZCLink* NewLink() const { return new TypeMain; }/* - ZCLink* NewLink()*/ + ZCLink* NewLink() const*/ - ZCLink* NewLink( ZCLink& AR_ArgData) + ZCLink* NewLink( ZCLink& AR_ArgData) const { return new TypeMain(AR_ArgData); } - ZCLink* NewLink(const ZCLink& AR_ArgData) + ZCLink* NewLink(const ZCLink& AR_ArgData) const { return new TypeMain(AR_ArgData); } void NewLink //////////////////////////////////////// @@ -1031,7 +1031,7 @@ namespace ZNsMain TypeSize AL_NeedCnt , ZCLink*& APR_HeadLink , ZCLink*& APR_TailLink - ) + ) const ///////////////////////////////////////////////////// { APR_HeadLink = new TypeMain; @@ -1058,7 +1058,7 @@ namespace ZNsMain TypeSize AL_NeedCnt , ZCLink*& APR_HeadLink , ZCLink*& APR_TailLink - ) + ) const ///////////////////////////////////////////////////*/ @@ -1130,34 +1130,34 @@ namespace ZNsMain /*private:*/ private: - _VT_ ZCLink* SendFreeOut() + _VT_ ZCLink* SendFreeOut() const { if(TTypeCRTP::ZEUseCRTP<1) return NewLink(); return GetChildObj().SendFreeOut(); }/* - _VT_ ZCLink* SendFreeOut()*/ + _VT_ ZCLink* SendFreeOut() const*/ - _VT_ ZCLink* SendFreeOut(ZCLink& AR_ArgData) + _VT_ ZCLink* SendFreeOut(ZCLink& AR_ArgData) const { if(TTypeCRTP::ZEUseCRTP<1) { return NewLink(AR_ArgData); } return GetChildObj().SendFreeOut(AR_ArgData); }/* - _VT_ ZCLink* SendFreeOut(ZCLink& AR_ArgData)*/ + _VT_ ZCLink* SendFreeOut(ZCLink& AR_ArgData) const*/ - _VT_ ZCLink* SendFreeOut(const ZCLink& AR_ArgData) + _VT_ ZCLink* SendFreeOut(const ZCLink& AR_ArgData) const { if(TTypeCRTP::ZEUseCRTP<1) { return NewLink(AR_ArgData); } return GetChildObj().SendFreeOut(AR_ArgData); }/* - _VT_ ZCLink* SendFreeOut(const ZCLink& AR_ArgData)*/ + _VT_ ZCLink* SendFreeOut(const ZCLink& AR_ArgData) const*/ _VT_ void SendFreeOut - (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) + (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) const { if(TTypeCRTP::ZEUseCRTP<1) { @@ -1169,7 +1169,7 @@ namespace ZNsMain (AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink)); }/* _VT_ void SendFreeOut - (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) + (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) const */ _VT_ void SendFreeOutCopy /*///////////////////////*/ @@ -2089,16 +2089,16 @@ namespace ZNsMain private: - ZCLink* NewLink() + ZCLink* NewLink() const { return new ZCLink; }/* - ZCLink* NewLink()*/ + ZCLink* NewLink() const*/ - ZCLink* NewLink( ZCLink& AR_ArgData) + ZCLink* NewLink( ZCLink& AR_ArgData) const { return new TypeMain(AR_ArgData); } - ZCLink* NewLink(const ZCLink& AR_ArgData) + ZCLink* NewLink(const ZCLink& AR_ArgData) const { return new TypeMain(AR_ArgData); } void NewLink //////////////////////////////////////// @@ -2106,7 +2106,7 @@ namespace ZNsMain TypeSize AL_NeedCnt , ZCLink*& APR_HeadLink , ZCLink*& APR_TailLink - ) + ) const ///////////////////////////////////////////////////// { APR_HeadLink = new TypeMain; @@ -2133,7 +2133,7 @@ namespace ZNsMain TypeSize AL_NeedCnt , ZCLink*& APR_HeadLink , ZCLink*& APR_TailLink - ) + ) const ///////////////////////////////////////////////////*/ @@ -2205,34 +2205,34 @@ namespace ZNsMain /*private:*/ private: - _VT_ ZCLink* SendFreeOut() + _VT_ ZCLink* SendFreeOut() const { if(TTypeCRTP::ZEUseCRTP<1) return NewLink(); return GetChildObj().SendFreeOut(); }/* - _VT_ ZCLink* SendFreeOut()*/ + _VT_ ZCLink* SendFreeOut() const*/ - _VT_ ZCLink* SendFreeOut(ZCLink& AR_ArgData) + _VT_ ZCLink* SendFreeOut(ZCLink& AR_ArgData) const { if(TTypeCRTP::ZEUseCRTP<1) { return NewLink(AR_ArgData); } return GetChildObj().SendFreeOut(AR_ArgData); }/* - _VT_ ZCLink* SendFreeOut(ZCLink& AR_ArgData)*/ + _VT_ ZCLink* SendFreeOut(ZCLink& AR_ArgData) const*/ - _VT_ ZCLink* SendFreeOut(const ZCLink& AR_ArgData) + _VT_ ZCLink* SendFreeOut(const ZCLink& AR_ArgData) const { if(TTypeCRTP::ZEUseCRTP<1) { return NewLink(AR_ArgData); } return GetChildObj().SendFreeOut(AR_ArgData); }/* - _VT_ ZCLink* SendFreeOut(const ZCLink& AR_ArgData)*/ + _VT_ ZCLink* SendFreeOut(const ZCLink& AR_ArgData) const*/ _VT_ void SendFreeOut - (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) + (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) const { if(TTypeCRTP::ZEUseCRTP<1) { @@ -2244,7 +2244,7 @@ namespace ZNsMain (AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink)); }/* _VT_ void SendFreeOut - (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) + (TypeSize AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) const */ _VT_ void SendFreeOutCopy /*///////////////////////*/ diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index 58efa80..3cbf420 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -90,10 +90,6 @@ namespace ZNsMain ) /*######################################################################*/ { - #ifdef _DEBUG - ZNsMain::ZCCheckAlloc::ZCAllowAlloc CAllowAllocObj; - #endif //_DEBUG - if(mp_NoUseHead==0) { MakeLink(AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink)); @@ -279,16 +275,16 @@ namespace ZNsMain TypeSize AL_MakeSize , ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink - ) + ) const ///////////////////////////////////////////////////*/ { APR_HeadLink = new ZCLink; if(APR_HeadLink==0) { - //add codes for memory over + // add codes for memory over - DeleteHeap(); return; + return; }/* if(APR_HeadLink==0)*/ @@ -366,7 +362,7 @@ namespace ZNsMain TypeSize AL_MakeSize , ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink - ) + ) const ///////////////////////////////////////////////////*/ @@ -374,7 +370,7 @@ namespace ZNsMain ( ZCLink* AP_LinkOrgin, TypeSize AL_FarNum , ZCLink*& APR_HeadCopy, ZCLink*& APR_TailCopy - ) + ) const ///////////////////////////////////////////////////*/ { // AP_LinkOrgin 링크부터, @@ -449,7 +445,7 @@ namespace ZNsMain ( ZCLink* AP_LinkOrgin, TypeSize AL_FarNum, ZCLink*& APR_HeadCopy, ZCLink*& APR_TailCopy - ) + ) const ///////////////////////////////////////////////////*/ @@ -1475,13 +1471,6 @@ namespace ZNsMain ###############################################################################*/ - ZtCObjList& CopyThis(ZtCObjList& ARR_Rhs) const - { - return CopyLink(mp_HeadLink, ml_LinkSize-1, RR(ARR_Rhs)); - }/* - ZtCObjList& CopyThis(ZtCObjList& ARR_Rhs) const*/ - - ZtCObjList& MakeDefault (TypeSize AL_DefaultSize, ZtCObjList& ARR_Rhs) const { @@ -2256,6 +2245,14 @@ namespace ZNsMain /*#####################################################################*/ + ZtCObjList& CopyThis(ZtCObjList& ARR_Rhs) const + { + return CopyLink(mp_HeadLink, ml_LinkSize-1, RR(ARR_Rhs)); + }/* + ZtCObjList& CopyThis(ZtCObjList& ARR_Rhs) const*/ + + + operator Type&() { return AddDefault(1, ml_LinkSize+1)->GetData(); diff --git a/ZCppMainTest/ZtCBaseList_000.cpp b/ZCppMainTest/ZtCBaseList_000.cpp index e2f71c9..60e8076 100644 --- a/ZCppMainTest/ZtCBaseList_000.cpp +++ b/ZCppMainTest/ZtCBaseList_000.cpp @@ -129,24 +129,24 @@ namespace ZNsMain private: - _VT_ ZCLink* SendFreeOut() + _VT_ ZCLink* SendFreeOut() const { cout<<"** ZCBaseListEx10 : SendFreeOut()"<ZCBaseList::NewLink(); }/* - _VT_ ZCLink* SendFreeOut()*/ + _VT_ ZCLink* SendFreeOut() const*/ - _VT_ ZCLink* SendFreeOut(CStringBase& AO_ArgData) + _VT_ ZCLink* SendFreeOut(CStringBase& AO_ArgData) const { cout<<"** ZCBaseListEx10 : SendFreeOut(TypeArg)"<ZCBaseList::NewLink(AO_ArgData); }/* - _VT_ ZCLink* SendFreeOut(CStringBase& AO_ArgData)*/ + _VT_ ZCLink* SendFreeOut(CStringBase& AO_ArgData) const*/ _VT_ void SendFreeOut - (ZTypLong AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) + (ZTypLong AL_NeedCnt, ZCLink*& APR_HeadLink, ZCLink*& APR_TailLink) const { cout<<"** ZCBaseListEx10 : SendFreeOut("<