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