admin/RepoMain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit 2025-10-07 23:32 add 'const' after SendFreeOut() ZCppMain/ZtCLinkList.H

Browse Source
This commit is contained in:
sauron
2025-10-07 23:32:26 +09:00
parent 12a482c098
commit 9459bfa707
4 changed files with 59 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ZCppMain/ZMainHead.H
View File

@ -5455,24 +5455,24 @@ namespace ZNsMain
protected: protected:
ZCLink* NewLink() ZCLink* NewLink() const
{ {
return new ZCLink; return new ZCLink;
}/* }/*
ZCLink* NewLink()*/ ZCLink* NewLink() const*/
ZCLink* NewLink(TypeArg AO_ArgData) ZCLink* NewLink(TypeArg AO_ArgData) const
{ {
return new ZCLink(AO_ArgData); return new ZCLink(AO_ArgData);
}/* }/*
ZCLink* NewLink(TypeArg AO_ArgData)*/ ZCLink* NewLink(TypeArg AO_ArgData) const*/
void NewLink //////////////////////////////////////// void NewLink ////////////////////////////////////////
( (
TypeSize AL_NeedCnt , TypeSize AL_NeedCnt ,
ZCLink*& APR_HeadLink , ZCLink*& APR_HeadLink ,
ZCLink*& APR_TailLink ZCLink*& APR_TailLink
) ) const
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
{ {
APR_HeadLink = new ZCLink; APR_HeadLink = new ZCLink;
@ -5499,7 +5499,7 @@ namespace ZNsMain
TypeSize AL_NeedCnt , TypeSize AL_NeedCnt ,
ZCLink*& APR_HeadLink , ZCLink*& APR_HeadLink ,
ZCLink*& APR_TailLink ZCLink*& APR_TailLink
) ) const
///////////////////////////////////////////////////*/ ///////////////////////////////////////////////////*/
@ -5571,25 +5571,25 @@ namespace ZNsMain
/*protected:*/ /*protected:*/
private : private :
_VT_ ZCLink* SendFreeOut() _VT_ ZCLink* SendFreeOut() const
{ {
if(TTypeCRTP::ZEUseCRTP<1) return NewLink(); if(TTypeCRTP::ZEUseCRTP<1) return NewLink();
return GetChildObj().SendFreeOut(); 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) if(TTypeCRTP::ZEUseCRTP<1)
{ return NewLink(AO_ArgData); } { return NewLink(AO_ArgData); }
return GetChildObj().SendFreeOut(AO_ArgData); return GetChildObj().SendFreeOut(AO_ArgData);
}/* }/*
_VT_ ZCLink* SendFreeOut(TypeArg AO_ArgData)*/ _VT_ ZCLink* SendFreeOut(TypeArg AO_ArgData) const*/
_VT_ void SendFreeOut _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) if(TTypeCRTP::ZEUseCRTP<1)
{ {
@ -5601,7 +5601,7 @@ namespace ZNsMain
(AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink)); (AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink));
}/* }/*
_VT_ void SendFreeOut _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 /*///////////////////////*/ _VT_ void SendFreeOutCopy /*///////////////////////*/

56
ZCppMain/ZtCLinkList.H
View File

@ -1014,16 +1014,16 @@ namespace ZNsMain
private: private:
ZCLink* NewLink() ZCLink* NewLink() const
{ {
return new TypeMain; return new TypeMain;
}/* }/*
ZCLink* NewLink()*/ ZCLink* NewLink() const*/
ZCLink* NewLink( ZCLink& AR_ArgData) ZCLink* NewLink( ZCLink& AR_ArgData) const
{ return new TypeMain(AR_ArgData); } { return new TypeMain(AR_ArgData); }
ZCLink* NewLink(const ZCLink& AR_ArgData) ZCLink* NewLink(const ZCLink& AR_ArgData) const
{ return new TypeMain(AR_ArgData); } { return new TypeMain(AR_ArgData); }
void NewLink //////////////////////////////////////// void NewLink ////////////////////////////////////////
@ -1031,7 +1031,7 @@ namespace ZNsMain
TypeSize AL_NeedCnt , TypeSize AL_NeedCnt ,
ZCLink*& APR_HeadLink , ZCLink*& APR_HeadLink ,
ZCLink*& APR_TailLink ZCLink*& APR_TailLink
) ) const
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
{ {
APR_HeadLink = new TypeMain; APR_HeadLink = new TypeMain;
@ -1058,7 +1058,7 @@ namespace ZNsMain
TypeSize AL_NeedCnt , TypeSize AL_NeedCnt ,
ZCLink*& APR_HeadLink , ZCLink*& APR_HeadLink ,
ZCLink*& APR_TailLink ZCLink*& APR_TailLink
) ) const
///////////////////////////////////////////////////*/ ///////////////////////////////////////////////////*/
@ -1130,34 +1130,34 @@ namespace ZNsMain
/*private:*/ /*private:*/
private: private:
_VT_ ZCLink* SendFreeOut() _VT_ ZCLink* SendFreeOut() const
{ {
if(TTypeCRTP::ZEUseCRTP<1) return NewLink(); if(TTypeCRTP::ZEUseCRTP<1) return NewLink();
return GetChildObj().SendFreeOut(); 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) if(TTypeCRTP::ZEUseCRTP<1)
{ return NewLink(AR_ArgData); } { return NewLink(AR_ArgData); }
return GetChildObj().SendFreeOut(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) if(TTypeCRTP::ZEUseCRTP<1)
{ return NewLink(AR_ArgData); } { return NewLink(AR_ArgData); }
return GetChildObj().SendFreeOut(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 _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) if(TTypeCRTP::ZEUseCRTP<1)
{ {
@ -1169,7 +1169,7 @@ namespace ZNsMain
(AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink)); (AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink));
}/* }/*
_VT_ void SendFreeOut _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 /*///////////////////////*/ _VT_ void SendFreeOutCopy /*///////////////////////*/
@ -2089,16 +2089,16 @@ namespace ZNsMain
private: private:
ZCLink* NewLink() ZCLink* NewLink() const
{ {
return new ZCLink; return new ZCLink;
}/* }/*
ZCLink* NewLink()*/ ZCLink* NewLink() const*/
ZCLink* NewLink( ZCLink& AR_ArgData) ZCLink* NewLink( ZCLink& AR_ArgData) const
{ return new TypeMain(AR_ArgData); } { return new TypeMain(AR_ArgData); }
ZCLink* NewLink(const ZCLink& AR_ArgData) ZCLink* NewLink(const ZCLink& AR_ArgData) const
{ return new TypeMain(AR_ArgData); } { return new TypeMain(AR_ArgData); }
void NewLink //////////////////////////////////////// void NewLink ////////////////////////////////////////
@ -2106,7 +2106,7 @@ namespace ZNsMain
TypeSize AL_NeedCnt , TypeSize AL_NeedCnt ,
ZCLink*& APR_HeadLink , ZCLink*& APR_HeadLink ,
ZCLink*& APR_TailLink ZCLink*& APR_TailLink
) ) const
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
{ {
APR_HeadLink = new TypeMain; APR_HeadLink = new TypeMain;
@ -2133,7 +2133,7 @@ namespace ZNsMain
TypeSize AL_NeedCnt , TypeSize AL_NeedCnt ,
ZCLink*& APR_HeadLink , ZCLink*& APR_HeadLink ,
ZCLink*& APR_TailLink ZCLink*& APR_TailLink
) ) const
///////////////////////////////////////////////////*/ ///////////////////////////////////////////////////*/
@ -2205,34 +2205,34 @@ namespace ZNsMain
/*private:*/ /*private:*/
private: private:
_VT_ ZCLink* SendFreeOut() _VT_ ZCLink* SendFreeOut() const
{ {
if(TTypeCRTP::ZEUseCRTP<1) return NewLink(); if(TTypeCRTP::ZEUseCRTP<1) return NewLink();
return GetChildObj().SendFreeOut(); 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) if(TTypeCRTP::ZEUseCRTP<1)
{ return NewLink(AR_ArgData); } { return NewLink(AR_ArgData); }
return GetChildObj().SendFreeOut(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) if(TTypeCRTP::ZEUseCRTP<1)
{ return NewLink(AR_ArgData); } { return NewLink(AR_ArgData); }
return GetChildObj().SendFreeOut(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 _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) if(TTypeCRTP::ZEUseCRTP<1)
{ {
@ -2244,7 +2244,7 @@ namespace ZNsMain
(AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink)); (AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink));
}/* }/*
_VT_ void SendFreeOut _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 /*///////////////////////*/ _VT_ void SendFreeOutCopy /*///////////////////////*/

31
ZCppMain/ZtCObjList.H
View File

@ -90,10 +90,6 @@ namespace ZNsMain
) )
/*######################################################################*/ /*######################################################################*/
{ {
#ifdef _DEBUG
ZNsMain::ZCCheckAlloc::ZCAllowAlloc CAllowAllocObj;
#endif //_DEBUG
if(mp_NoUseHead==0) if(mp_NoUseHead==0)
{ {
MakeLink(AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink)); MakeLink(AL_NeedCnt, RR(APR_HeadLink), RR(APR_TailLink));
@ -279,16 +275,16 @@ namespace ZNsMain
TypeSize AL_MakeSize , TypeSize AL_MakeSize ,
ZCLink*& APR_HeadLink, ZCLink*& APR_HeadLink,
ZCLink*& APR_TailLink ZCLink*& APR_TailLink
) ) const
///////////////////////////////////////////////////*/ ///////////////////////////////////////////////////*/
{ {
APR_HeadLink = new ZCLink; APR_HeadLink = new ZCLink;
if(APR_HeadLink==0) if(APR_HeadLink==0)
{ {
//add codes for memory over // add codes for memory over
DeleteHeap(); return; return;
}/* }/*
if(APR_HeadLink==0)*/ if(APR_HeadLink==0)*/
@ -366,7 +362,7 @@ namespace ZNsMain
TypeSize AL_MakeSize , TypeSize AL_MakeSize ,
ZCLink*& APR_HeadLink, ZCLink*& APR_HeadLink,
ZCLink*& APR_TailLink ZCLink*& APR_TailLink
) ) const
///////////////////////////////////////////////////*/ ///////////////////////////////////////////////////*/
@ -374,7 +370,7 @@ namespace ZNsMain
( (
ZCLink* AP_LinkOrgin, TypeSize AL_FarNum , ZCLink* AP_LinkOrgin, TypeSize AL_FarNum ,
ZCLink*& APR_HeadCopy, ZCLink*& APR_TailCopy ZCLink*& APR_HeadCopy, ZCLink*& APR_TailCopy
) ) const
///////////////////////////////////////////////////*/ ///////////////////////////////////////////////////*/
{ {
// AP_LinkOrgin 링크부터, // AP_LinkOrgin 링크부터,
@ -449,7 +445,7 @@ namespace ZNsMain
( (
ZCLink* AP_LinkOrgin, TypeSize AL_FarNum, ZCLink* AP_LinkOrgin, TypeSize AL_FarNum,
ZCLink*& APR_HeadCopy, ZCLink*& APR_TailCopy 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 ZtCObjList& MakeDefault
(TypeSize AL_DefaultSize, ZtCObjList& ARR_Rhs) const (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&() operator Type&()
{ {
return AddDefault(1, ml_LinkSize+1)->GetData(); return AddDefault(1, ml_LinkSize+1)->GetData();

10
ZCppMainTest/ZtCBaseList_000.cpp
View File

@ -129,24 +129,24 @@ namespace ZNsMain
private: private:
_VT_ ZCLink* SendFreeOut() _VT_ ZCLink* SendFreeOut() const
{ {
cout<<"** ZCBaseListEx10 : SendFreeOut()"<<endl; cout<<"** ZCBaseListEx10 : SendFreeOut()"<<endl;
return this->ZCBaseList::NewLink(); return this->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)"<<endl; cout<<"** ZCBaseListEx10 : SendFreeOut(TypeArg)"<<endl;
return this->ZCBaseList::NewLink(AO_ArgData); return this->ZCBaseList::NewLink(AO_ArgData);
}/* }/*
_VT_ ZCLink* SendFreeOut(CStringBase& AO_ArgData)*/ _VT_ ZCLink* SendFreeOut(CStringBase& AO_ArgData) const*/
_VT_ void SendFreeOut _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("<<AL_NeedCnt<<", ZCLink*&, ZCLink*&)"<<endl; cout<<"** ZCBaseListEx10 : SendFreeOut("<<AL_NeedCnt<<", ZCLink*&, ZCLink*&)"<<endl;