diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index 6a4f19f..53b6fa6 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -2171,38 +2171,28 @@ namespace ZNsMain ###############################################################################*/ - void SendOutAfter(ZCLink* AP_CutLink, ZtCObjList& rhs, ZCLink* AP_StdLink) + void SendOutAfter (ZCLink& AR_CutLink, ZtCObjList& rhs, ZCLink& AR_StdLink) { - // AP_CutLink 를 잘라서 rhs 의 AP_StdLink 뒤에 연결한다. - // AP_StdLink==0 이면, rhs 의 앞에 삽입한다. + // AR_CutLink 를 잘라서 rhs 의 AR_StdLink 뒤에 연결한다. - CutLink(AP_CutLink); rhs.JoinAfter(AP_CutLink, AP_StdLink); + CutLink(&AR_CutLink); rhs.JoinAfter(&AR_CutLink, &AR_StdLink); }/* - void SendOutAfter(ZCLink* AP_CutLink, ZtCObjList& rhs, ZCLink* AP_StdLink)*/ + void SendOutAfter (ZCLink& AR_CutLink, ZtCObjList& rhs, ZCLink& AR_StdLink)*/ - void SendOutBefore(ZCLink* AP_CutLink, ZtCObjList& rhs, ZCLink* AP_StdLink) + void SendOutBefore(ZCLink& AR_CutLink, ZtCObjList& rhs, ZCLink& AR_StdLink) { - // AP_CutLink 를 잘라서 rhs 의 AP_StdLink 앞에 연결한다. - // AP_StdLink==0 이면, rhs 의 뒤에 삽입한다. + // AR_CutLink 를 잘라서 rhs 의 AR_StdLink 앞에 연결한다. - CutLink(AP_CutLink); rhs.JoinBefore(AP_CutLink, AP_StdLink); + CutLink(&AR_CutLink); rhs.JoinBefore(&AR_CutLink, &AR_StdLink); }/* - void SendOutBefore(ZCLink* AP_CutLink, ZtCObjList& rhs, ZCLink* AP_StdLink)*/ + void SendOutBefore(ZCLink& AR_CutLink, ZtCObjList& rhs, ZCLink& AR_StdLink)*/ - void SendOutHead(ZCLink* AP_CutLink, ZtCObjList& rhs) - { - // AP_CutLink 를 잘라서 rhs 의 앞에 연결한다. + void SendOutHead(ZCLink& AR_CutLink, ZtCObjList& rhs) + { CutLink(&AR_CutLink); rhs.JoinAfter (&AR_CutLink, 0); } - SendOutAfter (AP_CutLink, rhs, 0); - } - void SendOutTail(ZCLink* AP_CutLink, ZtCObjList& rhs) - { - // AP_CutLink 를 잘라서 rhs 의 뒤에 연결한다. - - SendOutBefore(AP_CutLink, rhs, 0); - }/* - void SendOutTail(ZCLink* AP_CutLink, ZtCObjList& rhs)*/ + void SendOutTail(ZCLink& AR_CutLink, ZtCObjList& rhs) + { CutLink(&AR_CutLink); rhs.JoinBefore(&AR_CutLink, 0); } operator Type&() @@ -2214,43 +2204,12 @@ namespace ZNsMain Type& GetData(TypeSize AI_Index) { - #ifdef _DEBUG - - if(AI_Index<1 || AI_Index>ml_LinkSize) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<ml_LinkSize)*/ - - #endif //_DEBUG - return GetLinkPtr(AI_Index)->GetData(); }/* Type& GetData(TypeSize AI_Index)*/ - const Type& GetData(TypeSize AI_Index) const { - #ifdef _DEBUG - - if(AI_Index<1 || AI_Index>ml_LinkSize) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<ml_LinkSize)*/ - - #endif //_DEBUG - return GetLinkPtr(AI_Index)->GetData(); }/* const Type& GetData(TypeSize AI_Index) const*/ @@ -2258,85 +2217,24 @@ namespace ZNsMain Type& GetHeadData() { - #ifdef _DEBUG - - if(mp_HeadLink==0) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<GetData(); }/* Type& GetHeadData()*/ - const Type& GetHeadData() const - { - #ifdef _DEBUG - - if(mp_HeadLink==0) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<GetData(); - }/* - const Type& GetHeadData() const*/ - - Type& GetTailData() { - #ifdef _DEBUG - - if(mp_HeadLink==0) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<mp_PrevLink->GetData(); }/* Type& GetTailData()*/ + const Type& GetHeadData() const + { + return mp_HeadLink->GetData(); + }/* + const Type& GetHeadData() const*/ + const Type& GetTailData() const { - #ifdef _DEBUG - - if(mp_HeadLink==0) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<mp_PrevLink->GetData(); }/* const Type& GetTailData() const*/ diff --git a/ZCppMainTest/ZtCObjList_000.cpp b/ZCppMainTest/ZtCObjList_000.cpp index 8da9d29..e55381f 100644 --- a/ZCppMainTest/ZtCObjList_000.cpp +++ b/ZCppMainTest/ZtCObjList_000.cpp @@ -81,6 +81,23 @@ namespace ZNsMain static void ShowNode2(ZCLink2& AR_CLink, int& ARRI_CallCnt)*/ + static void ShowNode1_3(ZCLink1& AR_CLink, int& ARRI_CallCnt) + { + ++ARRI_CallCnt; + + cout<