commit 2025-10-14 00:11 edit a bit ZCppMain/ZMainHead.H

This commit is contained in:
2025-10-14 00:11:29 +09:00
parent 5166bbe7cf
commit 15f24be62d
3 changed files with 81 additions and 106 deletions

View File

@ -918,7 +918,7 @@ namespace ZNsMain
ZCLink* GetNextPtr(TypeSize AL_FarNum)*/
const ZCLink* const GetNextPtr(TypeSize AL_FarNum) const // or ZCLink const * const GetNextPtr(TypeSize AL_FarNum) const
ZCLinkC* const GetNextPtr(TypeSize AL_FarNum) const // or ZCLink const * const GetNextPtr(TypeSize AL_FarNum) const
{
// TypeSize 가 object 일 경우 AL_FarNum 의 값이 이 함수에서 변하고 있으므로
// TypeSize 을 참조로 받으면 안된다.
@ -935,20 +935,11 @@ namespace ZNsMain
return VP_TmpLink;
}/*
const ZCLink* const GetNextPtr(TypeSize AL_FarNum) const*/
ZCLinkC* const GetNextPtr(TypeSize AL_FarNum) const*/
inline ZCLink* GetNextPtr()
{
return mp_NextLink;
}/*
inline ZCLink* GetNextPtr()*/
inline const ZCLink* const GetNextPtr() const
{
return mp_NextLink;
}/*
inline const ZCLink* const GetNextPtr() const*/
inline ZCLink * GetNextPtr() { return mp_NextLink; }
inline ZCLinkC* const GetNextPtr() const{ return mp_NextLink; }
ZCLink& operator=(TypeArg AR_Type)
{
@ -1261,9 +1252,9 @@ namespace ZNsMain
ZtCSimList& CopyLink /*######################################*/
(
const ZCLink* const AP_CopyLink ,
TypeSize AL_FarNum ,
ZtCSimList& ARR_Rhs
ZCLinkC* const AP_CopyLink ,
TypeSize AL_FarNum ,
ZtCSimList& ARR_Rhs
) const
/*###########################################################*/
{
@ -1294,9 +1285,9 @@ namespace ZNsMain
}/*
ZtCSimList& CopyLink ##########################################
(
const ZCLink* const AP_CopyLink ,
TypeSize AL_FarNum ,
ZtCSimList& ARR_Rhs
ZCLinkC* const AP_CopyLink ,
TypeSize AL_FarNum ,
ZtCSimList& ARR_Rhs
) const
#############################################################*/
@ -1679,29 +1670,29 @@ namespace ZNsMain
void AddTailDef(TypeSize AL_DefaultSize)*/
ZCLink* GetHeadLinkPtr (){return mp_HeadLink;}
ZCLink* GetHeadIterEasy (){return mp_HeadLink;}
IterEasyID GetHeadIterEasyID (){return (IterEasyID)mp_HeadLink;}
TypeData & front() {return mp_HeadLink->mo_DataObjt;}
TypeData & back () {return mp_TailLink->mo_DataObjt;}
ZCLink* GetTailLinkPtr (){return mp_TailLink;}
ZCLink* GetTailIterEasy (){return mp_TailLink;}
IterEasyID GetTailIterEasyID (){return (IterEasyID)mp_TailLink;}
TypeDataC& front() const{return mp_HeadLink->mo_DataObjt;}
TypeDataC& back () const{return mp_TailLink->mo_DataObjt;}
TypeData& front(){return mp_HeadLink->mo_DataObjt;}
TypeData& back (){return mp_TailLink->mo_DataObjt;}
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;}
ZCLinkC* GetHeadLinkPtr () const{return mp_HeadLink;}
ZCLinkC* GetHeadIterEasy () const{return mp_HeadLink;}
IterEasyIDc GetHeadIterEasyID() const{return (IterEasyID)mp_HeadLink;}
IterEasyIDc GetHeadIterEasyID () const{return (IterEasyID)mp_HeadLink;}
ZCLinkC* GetTailLinkPtr () const{return mp_TailLink;}
ZCLinkC* GetTailIterEasy () const{return mp_TailLink;}
IterEasyIDc GetTailIterEasyID () const{return (IterEasyID)mp_TailLink;}
TypeDataC& front() const{return mp_HeadLink->mo_DataObjt;}
TypeDataC& back () const{return mp_TailLink->mo_DataObjt;}
void pop_back (TypeArg AR_Type){ return AddHead(AR_Type); }
void push_back(TypeArg AR_Type){ return AddTail(AR_Type); }
@ -1957,7 +1948,7 @@ namespace ZNsMain
void clear(){DeleteAll();}
TypeSize Find(const ZCLink* AP_pSearchLink, TypeSize AL_FirstFindIndex=1) const
TypeSize Find(ZCLinkC* AP_pSearchLink, TypeSize AL_FirstFindIndex=1) const
{
const bool CB_DoStop = //////////////////////
(
@ -2034,25 +2025,14 @@ namespace ZNsMain
TypeSize FindData(TypeArg AR_TypeArg, TypeSize AL_FirstFindIndex=1) const*/
ZCLink* GetLinkPtr(TypeSize AL_Index)
{
return mp_HeadLink->GetNextPtr(AL_Index-1);
}/*
ZCLink* GetLinkPtr(TypeSize AL_Index)*/
ZCLink * GetLinkPtr(TypeSize AL_Index)
{ return mp_HeadLink->GetNextPtr(AL_Index-1); }
ZCLinkC* GetLinkPtr(TypeSize AL_Index) const
{ return mp_HeadLink->GetNextPtr(AL_Index-1); }
const ZCLink* GetLinkPtr(TypeSize AL_Index) const
{
return mp_HeadLink->GetNextPtr(AL_Index-1);
}/*
const ZCLink* GetLinkPtr(TypeSize AL_Index) const*/
ZCFreeHeap& GetCFreeHeap() const
{
return mo_FreeObjt;
}/*
ZCFreeHeap& GetCFreeHeap() const*/
ZCFreeHeap& GetCFreeHeap() const{return mo_FreeObjt;}
inline TypeSize GetSize() const
@ -2329,11 +2309,11 @@ namespace ZNsMain
void MoveNextIter(IterEasyID& APPI_IterEasyID)
{ MoveNextIter((ZCLink*&)APPI_IterEasyID) ; }
void MoveNextIter(const ZCLink*& APR_CLink) const
void MoveNextIter(ZCLinkC*& APR_CLink) const
{ APR_CLink=APR_CLink->GetNextPtr() ; }
void MoveNextIter(IterEasyIDc& APPI_IterEasyID) const
{ MoveNextIter((const ZCLink*&)APPI_IterEasyID) ; }
{ MoveNextIter((ZCLinkC*&)APPI_IterEasyID) ; }
void MoveNextIter(iterator & ARR_iterator)
{ ++ARR_iterator ; }
@ -2351,20 +2331,20 @@ namespace ZNsMain
TypeData & GetDataInIter(iterator & ARR_iterator)
{ return *ARR_iterator ; }
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
TypeDataC& GetDataInIter(const ZCLink* AP_CLink) const
TypeDataC& GetDataInIter(ZCLinkC* AP_CLink) const
{ return **AP_CLink ; }
TypeDataC& GetDataInIter(IterEasyIDc APPI_IterEasyID) const
{ return GetDataInIter((const ZCLink*)APPI_IterEasyID) ; }
{ return GetDataInIter((ZCLinkC*)APPI_IterEasyID) ; }
TypeDataC& GetDataInIter(iteratorC& ARR_iterator) const
{ return *ARR_iterator ; }
ZCLink* ItHEasy() {return mp_HeadLink;}
ZCLink * ItHEasy() {return mp_HeadLink;}
IterEasyID ItHID () {return (IterEasyID)mp_HeadLink;}
ZCLink* ItTEasy() {return mp_TailLink;}
ZCLink * ItTEasy() {return mp_TailLink;}
IterEasyID ItTID () {return (IterEasyID)mp_TailLink;}
/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
ZCLinkC* ItHEasy() const{return mp_HeadLink;}
@ -2412,10 +2392,10 @@ namespace ZNsMain
{ return *ARR_Iterator; }
iterator begin () { return ZCNodePoint (*this); }
iteratorC begin () const{ return ZNodekPointC(*this); }
iterator end () { return ZCNodePoint ::MakeTailPoint(*this); }
iteratorC end () const{ return ZNodekPointC::MakeTailPoint(*this); }
iterator begin () { return ZCNodePoint (*this); }
iteratorC begin () const{ return ZNodekPointC(*this); }
iterator end () { return ZCNodePoint ::MakeTailPoint(*this); }
iteratorC end () const{ return ZNodekPointC::MakeTailPoint(*this); }
ZCLink * HeadPtr() {return mp_HeadLink;}