From 8924a85c851af6b28602941b7179c911c36c6cce Mon Sep 17 00:00:00 2001 From: sauron Date: Fri, 10 Oct 2025 14:46:10 +0900 Subject: [PATCH] commit 2025-10-10 14:45 edit a bit : ZCppMain/ZMainHead.H --- ZCppMain/ZMainHead.H | 16 +++++++++------- ZCppMain/ZtCLinkList.H | 31 +++++++++++++++++++++++++------ ZCppMain/ZtCObjList.H | 16 +++++++++------- ZCppMain/ZtCSimList.H | 14 ++++---------- ZCppMainTest/ZtCLinkMoveList_000.cpp | 5 ++++- 5 files changed, 51 insertions(+), 31 deletions(-) diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 72507af..9ba7dfb 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -5768,14 +5768,16 @@ namespace ZNsMain const ZCLink* GetNextPrevPtr(TypeSize AL_FarNum) const*/ - operator TypeData& (){return mo_DataObjt;} - operator TypeData (){return mo_DataObjt;} - TypeData& GetData (){return mo_DataObjt;} - TypeData& operator*(){return mo_DataObjt;} + operator TypeData& (){return mo_DataObjt;} + operator TypeData (){return mo_DataObjt;} + TypeData& GetData (){return mo_DataObjt;} + TypeData& operator* (){return mo_DataObjt;} + TypeData& operator()(){return mo_DataObjt;} - operator const TypeData& () const{return mo_DataObjt;} - const TypeData& GetData () const{return mo_DataObjt;} - const TypeData& operator*() const{return mo_DataObjt;} + operator const TypeData& () const{return mo_DataObjt;} + const TypeData& GetData () const{return mo_DataObjt;} + const TypeData& operator* () const{return mo_DataObjt;} + const TypeData& operator()() const{return mo_DataObjt;} ZCLink& operator+(TypeSize AL_Distance) diff --git a/ZCppMain/ZtCLinkList.H b/ZCppMain/ZtCLinkList.H index 4ca559c..047f8ff 100644 --- a/ZCppMain/ZtCLinkList.H +++ b/ZCppMain/ZtCLinkList.H @@ -198,8 +198,13 @@ namespace ZNsMain ZtCLink& operator=(TypeBase& AR_CBase)*/ - /***/ TypeData& operator()() { return *static_cast< TypeData*>(this); } - const TypeData& operator()() const{ return *static_cast(this); } + TypeData& operator* () { return *static_cast(this); } + TypeData& operator()() { return *static_cast(this); } + + const TypeData& operator* () const + { return *static_cast(this); } + const TypeData& operator()() const + { return *static_cast(this); } ZtCLink* GetNextPtr(){return mp_NextLink;} @@ -409,8 +414,13 @@ namespace ZNsMain TypeThis& operator=(TypeBase& AR_CBase)*/ - /***/ TypeBase& operator()() { return *static_cast< TypeBase*>(this); } - const TypeBase& operator()() const{ return *static_cast(this); } + TypeBase& operator* (){ return *static_cast(this); } + TypeBase& operator()(){ return *static_cast(this); } + + const TypeBase& operator* () const + { return *static_cast(this); } + const TypeBase& operator()() const + { return *static_cast(this); } ZtCLink* GetNextPtr(){return mp_NextLink;} @@ -645,9 +655,13 @@ namespace ZNsMain TypeThis& operator=(const TypeThis& rhs)*/ - /***/ TypeData& operator()() { return GetChildObj(); } + TypeData& operator* () { return GetChildObj(); } + TypeData& operator()() { return GetChildObj(); } + + const TypeData& operator* () const{ return GetChildObj(); } const TypeData& operator()() const{ return GetChildObj(); } + ZtCLink* GetNextPtr(){return mp_NextLink;} ZtCLink* GetPrevPtr(){return mp_PrevLink;} @@ -838,7 +852,10 @@ namespace ZNsMain TypeThis& operator=(const TypeThis& rhs)*/ - /***/ TypeThis& operator()() { return *this; } + TypeThis& operator* (){ return *this; } + TypeThis& operator()(){ return *this; } + + const TypeThis& operator* () const{ return *this; } const TypeThis& operator()() const{ return *this; } @@ -991,6 +1008,7 @@ namespace ZNsMain public : typedef TCLink ZCLink ; typedef TCLink TypeData; + typedef TCLink TypeLink; typedef TTypSize TypeSize; public : typedef typename TCLink::TypeMain TypeMain; @@ -2063,6 +2081,7 @@ namespace ZNsMain public : typedef TCLink ZCLink ; typedef TCLink TypeData; + typedef TCLink TypeLink; typedef TTypSize TypeSize; public : typedef typename TCLink::TypeMain TypeMain; diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index ed3c7a6..8b88e3a 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -881,14 +881,16 @@ namespace ZNsMain ZCLink& operator=(const ZCLink& rhs)*/ - operator Type& (){return mo_DataObjt;} - operator Type (){return mo_DataObjt;} - Type& GetData (){return mo_DataObjt;} - Type& operator*(){return mo_DataObjt;} + operator Type& (){return mo_DataObjt;} + operator Type (){return mo_DataObjt;} + Type& GetData (){return mo_DataObjt;} + Type& operator* (){return mo_DataObjt;} + Type& operator()(){return mo_DataObjt;} - operator const Type& () const{return mo_DataObjt;} - const Type& GetData () const{return mo_DataObjt;} - const Type& operator*() const{return mo_DataObjt;} + operator const Type& () const{return mo_DataObjt;} + const Type& GetData () const{return mo_DataObjt;} + const Type& operator* () const{return mo_DataObjt;} + const Type& operator()() const{return mo_DataObjt;} ZCLink* GetNextPrevPtr(TypeSize AL_FarNum) // AL_FarNum 은 0 이거나 음수일 수 있다. diff --git a/ZCppMain/ZtCSimList.H b/ZCppMain/ZtCSimList.H index ba98ea3..4304634 100644 --- a/ZCppMain/ZtCSimList.H +++ b/ZCppMain/ZtCSimList.H @@ -872,17 +872,11 @@ namespace ZNsMain const TType& GetData(TTypSize AL_FarNum) const*/ - TType& operator*() - { - return mo_DataObjt; - }/* - TType& operator*()*/ + TType& operator* (){return mo_DataObjt;} + TType& operator()(){return mo_DataObjt;} - const TType& operator*() const - { - return mo_DataObjt; - }/* - const TType& operator*() const*/ + const TType& operator* () const{return mo_DataObjt;} + const TType& operator()() const{return mo_DataObjt;} ZCLink* GetNextPtr(TTypSize AL_FarNum) // must AL_FarNum > 0 diff --git a/ZCppMainTest/ZtCLinkMoveList_000.cpp b/ZCppMainTest/ZtCLinkMoveList_000.cpp index 9aa3926..5e9b109 100644 --- a/ZCppMainTest/ZtCLinkMoveList_000.cpp +++ b/ZCppMainTest/ZtCLinkMoveList_000.cpp @@ -72,7 +72,10 @@ namespace ZNsMain cout<<"# VO_StrLinkOpt.GetObjOpt(1) : bool ()="<