diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index f4bf4d6..e8ce1e9 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -1340,33 +1340,34 @@ namespace ZNsMain else if(ml_Size<=rhs.ml_Size) { AddDefault(rhs.ml_Size-ml_Size, ml_Size+1); - - ZCLink* pRhsLink = rhs.mp_HeadLink; - ZCLink* pLhsLink = mp_HeadLink; - - __for1(TypeSize, i, ml_Size) - { - **pLhsLink = ** pRhsLink ; - - pLhsLink = pLhsLink->mp_NextLink; - pRhsLink = pRhsLink->mp_NextLink; - }/* - __for1(TypeSize, i, ml_Size)*/ } - else + else // ml_Size > rhs.ml_Size { ZtCObjList VO_StoreList; CutLink /////////////////////////////////////// ( - GetLinkPtr(rhs.ml_Size+1),rhs.ml_Size+1, - GetLinkPtr( ml_Size ), ml_Size , + GetLinkPtr(rhs.ml_Size+1), rhs.ml_Size+1, + GetLinkPtr( ml_Size ), ml_Size , RR(VO_StoreList) ). DeleteAll(); //////////////////////////////////////////////// }/* else*/ + + ZCLink* pRhsLink = rhs.mp_HeadLink; + ZCLink* pLhsLink = mp_HeadLink; + + __for1(TypeSize, i, ml_Size) + { + **pLhsLink = ** pRhsLink ; + + pLhsLink = pLhsLink->mp_NextLink; + pRhsLink = pRhsLink->mp_NextLink; + }/* + __for1(TypeSize, i, ml_Size)*/ + return *this; }/* ZtCObjList& operator=(const ZtCObjList& rhs)*/