commit 2025-10-03 19:35 rename mo_Data to mo_DataObjt : ZCppMain/ZMainHead.H

This commit is contained in:
2025-10-03 19:36:03 +09:00
parent 6d623437ff
commit 0b9828c06a

View File

@ -5316,7 +5316,7 @@ namespace ZNsMain
public : public :
friend class ZtCBaseList; friend class ZtCBaseList;
private: private:
TypeData mo_Data ; TypeData mo_DataObjt ;
ZCLink* mp_NextLink ; ZCLink* mp_NextLink ;
ZCLink* mp_PrevLink ; ZCLink* mp_PrevLink ;
private: private:
@ -5352,15 +5352,15 @@ namespace ZNsMain
ZCLink(const ZCLink& rhs) ZCLink(const ZCLink& rhs)
{ {
mo_Data = rhs.mo_Data ; mo_DataObjt = rhs.mo_DataObjt ;
mp_NextLink = 0 ; mp_NextLink = 0 ;
mp_PrevLink = 0 ; mp_PrevLink = 0 ;
}/* }/*
ZCLink(const ZCLink& rhs)*/ ZCLink(const ZCLink& rhs)*/
ZCLink(TypeArg AR_Data) ZCLink(TypeArg AR_Data)
{ {
mo_Data = AR_Data ; mo_DataObjt = AR_Data ;
mp_NextLink = 0 ; mp_NextLink = 0 ;
mp_PrevLink = 0 ; mp_PrevLink = 0 ;
}/* }/*
@ -5368,7 +5368,7 @@ namespace ZNsMain
ZCLink& operator=(const ZCLink& rhs) ZCLink& operator=(const ZCLink& rhs)
{ {
mo_Data = rhs.mo_Data; return *this; mo_DataObjt = rhs.mo_DataObjt; return *this;
}/* }/*
ZCLink& operator=(const ZCLink& rhs)*/ ZCLink& operator=(const ZCLink& rhs)*/
@ -5398,14 +5398,14 @@ namespace ZNsMain
const ZCLink* GetNextPrevPtr(TypeSize AL_FarNum) const*/ const ZCLink* GetNextPrevPtr(TypeSize AL_FarNum) const*/
operator TypeData& (){return mo_Data;} operator TypeData& (){return mo_DataObjt;}
operator TypeData (){return mo_Data;} operator TypeData (){return mo_DataObjt;}
TypeData& GetData (){return mo_Data;} TypeData& GetData (){return mo_DataObjt;}
TypeData& operator*(){return mo_Data;} TypeData& operator*(){return mo_DataObjt;}
operator const TypeData& () const{return mo_Data;} operator const TypeData& () const{return mo_DataObjt;}
const TypeData& GetData () const{return mo_Data;} const TypeData& GetData () const{return mo_DataObjt;}
const TypeData& operator*() const{return mo_Data;} const TypeData& operator*() const{return mo_DataObjt;}
};/* };/*
class ZCLink*/ class ZCLink*/
@ -5800,9 +5800,9 @@ namespace ZNsMain
TypeData& AddHead() TypeData& AddHead()
{ return AddHeadLink(SendFreeOut())->mo_Data; } { return AddHeadLink(SendFreeOut())->mo_DataObjt; }
TypeData& AddTail() TypeData& AddTail()
{ return AddTailLink(SendFreeOut())->mo_Data; } { return AddTailLink(SendFreeOut())->mo_DataObjt; }
TypeData& AddHead(TypeArg AO_ArgData) /*########################*/ TypeData& AddHead(TypeArg AO_ArgData) /*########################*/
@ -5812,13 +5812,13 @@ namespace ZNsMain
{ {
ZCLink* VP_NewNode = SendFreeOut(AO_ArgData); ZCLink* VP_NewNode = SendFreeOut(AO_ArgData);
TypeMoveObj::Exec(VP_NewNode->mo_Data, AO_ArgData); TypeMoveObj::Exec(**VP_NewNode, AO_ArgData);
return AddHeadLink(VP_NewNode)->mo_Data; return AddHeadLink(VP_NewNode)->mo_DataObjt;
} }
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
#endif #endif
return AddHeadLink(new ZCLink(AO_ArgData))->mo_Data; return AddHeadLink(new ZCLink(AO_ArgData))->mo_DataObjt;
}/* }/*
TypeData& AddHead(TypeArg AO_ArgData) ##########################*/ TypeData& AddHead(TypeArg AO_ArgData) ##########################*/
@ -5829,13 +5829,13 @@ namespace ZNsMain
{ {
ZCLink* VP_NewNode = SendFreeOut(AO_ArgData); ZCLink* VP_NewNode = SendFreeOut(AO_ArgData);
TypeMoveObj::Exec(VP_NewNode->mo_Data, AO_ArgData); TypeMoveObj::Exec(*VP_NewNode, AO_ArgData);
return AddTailLink(VP_NewNode)->mo_Data; return AddTailLink(VP_NewNode)->mo_DataObjt;
} }
//////////////////////////////////////////////////// ////////////////////////////////////////////////////
#endif #endif
return AddTailLink(new ZCLink(AO_ArgData))->mo_Data; return AddTailLink(new ZCLink(AO_ArgData))->mo_DataObjt;
}/* }/*
TypeData& AddTail(TypeArg AO_ArgData) ##########################*/ TypeData& AddTail(TypeArg AO_ArgData) ##########################*/
@ -6075,11 +6075,11 @@ namespace ZNsMain
{ if(this==&rhs) return *this; return JoinBefore(rhs, 0); } { if(this==&rhs) return *this; return JoinBefore(rhs, 0); }
TypeData& GetHeadData(){return mp_HeadLink->mo_Data;} TypeData& GetHeadData(){return mp_HeadLink->mo_DataObjt;}
TypeData& GetTailData(){return mp_TailLink->mo_Data;} TypeData& GetTailData(){return mp_TailLink->mo_DataObjt;}
const TypeData& GetHeadData() const{return mp_HeadLink->mo_Data;} const TypeData& GetHeadData() const{return mp_HeadLink->mo_DataObjt;}
const TypeData& GetTailData() const{return mp_TailLink->mo_Data;} const TypeData& GetTailData() const{return mp_TailLink->mo_DataObjt;}
operator TypeData&() { return AddTail() ; } operator TypeData&() { return AddTail() ; }
@ -6109,7 +6109,7 @@ namespace ZNsMain
__for0(TypeSize, i, ml_LinkSize) __for0(TypeSize, i, ml_LinkSize)
{ {
ZtCTypeData<TFunctor>:: ZtCTypeData<TFunctor>::
GetObjRef(AO_Functor)(VP_LoopLink->mo_Data); GetObjRef(AO_Functor)(VP_LoopLink->mo_DataObjt);
/* 위 코드로 인해서, AO_Functor 이 함수일 때 뿐이 아니라, /* 위 코드로 인해서, AO_Functor 이 함수일 때 뿐이 아니라,
operator() 연산자를 가진 object 포인터일 때도 사용할 수 operator() 연산자를 가진 object 포인터일 때도 사용할 수
@ -6157,7 +6157,7 @@ namespace ZNsMain
{ {
ZtCTypeData<TFunctor>::GetObjRef(AO_Functor) ZtCTypeData<TFunctor>::GetObjRef(AO_Functor)
( (
VP_LoopLink->mo_Data, ZCCheckRef::PassData(AO_TypeHelp) **VP_LoopLink, ZCCheckRef::PassData(AO_TypeHelp)
); );
//////////////////////////////////////////// ////////////////////////////////////////////
@ -6190,7 +6190,7 @@ namespace ZNsMain
{ {
ZtCTypeData<TFunctor>::GetObjRef(AO_Functor) ZtCTypeData<TFunctor>::GetObjRef(AO_Functor)
( (
VP_LoopLink->mo_Data VP_LoopLink->mo_DataObjt
, ZCCheckRef1::PassData(AO_TypeHelp1) , ZCCheckRef1::PassData(AO_TypeHelp1)
, ZCCheckRef2::PassData(AO_TypeHelp2) , ZCCheckRef2::PassData(AO_TypeHelp2)
); );
@ -6214,7 +6214,7 @@ namespace ZNsMain
__for0(TypeSize, i, ml_LinkSize) __for0(TypeSize, i, ml_LinkSize)
{ {
ZtCTypeData<TFunctor>:: ZtCTypeData<TFunctor>::
GetObjRef(AO_Functor)(VP_LoopLink->mo_Data); GetObjRef(AO_Functor)(**VP_LoopLink);
VP_LoopLink = VP_LoopLink->mp_PrevLink ; VP_LoopLink = VP_LoopLink->mp_PrevLink ;
}/* }/*
@ -6234,7 +6234,7 @@ namespace ZNsMain
{ {
ZtCTypeData<TFunctor>::GetObjRef(AO_Functor) ZtCTypeData<TFunctor>::GetObjRef(AO_Functor)
( (
VP_LoopLink->mo_Data, ZCCheckRef::PassData(AO_TypeHelp) **VP_LoopLink, ZCCheckRef::PassData(AO_TypeHelp)
); );
VP_LoopLink = VP_LoopLink->mp_PrevLink ; VP_LoopLink = VP_LoopLink->mp_PrevLink ;
}/* }/*
@ -6259,7 +6259,7 @@ namespace ZNsMain
{ {
ZtCTypeData<TFunctor>::GetObjRef(AO_Functor) ZtCTypeData<TFunctor>::GetObjRef(AO_Functor)
( (
VP_LoopLink->mo_Data VP_LoopLink->mo_DataObjt
, ZCCheckRef1::PassData(AO_TypeHelp1) , ZCCheckRef1::PassData(AO_TypeHelp1)
, ZCCheckRef2::PassData(AO_TypeHelp2) , ZCCheckRef2::PassData(AO_TypeHelp2)
); );