diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 26367a7..755f750 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -6421,6 +6421,9 @@ namespace ZNsMain return GetChildObj().size_free(); } + bool IsEmpty() const{return ml_LinkSize<1;} + bool empty () const{return ml_LinkSize<1;} + void push_front(TypeArg AO_ArgData){AddHead(AO_ArgData);} void push_back (TypeArg AO_ArgData){AddTail(AO_ArgData);} diff --git a/ZCppMain/ZtCLinkList.H b/ZCppMain/ZtCLinkList.H index 16809ed..5e58e59 100644 --- a/ZCppMain/ZtCLinkList.H +++ b/ZCppMain/ZtCLinkList.H @@ -1557,6 +1557,7 @@ namespace ZNsMain TypeSize size () const{return ml_LinkSize ;} bool IsEmpty() const{return ml_LinkSize<1;} + bool empty () const{return ml_LinkSize<1;} void DeleteAll() @@ -2352,6 +2353,7 @@ namespace ZNsMain TypeSize size () const{return ml_LinkSize ;} bool IsEmpty() const{return ml_LinkSize<1;} + bool empty () const{return ml_LinkSize<1;} void DeleteAll() diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index fcc842c..77e2def 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -1552,11 +1552,8 @@ namespace ZNsMain ZtCObjList& operator=(const ZtCObjList& rhs)*/ - bool IsEmpty() const - { - return mp_HeadLink==0 ; - }/* - bool IsEmpty() const*/ + bool IsEmpty() const{ return mp_HeadLink==0 ; } + bool empty () const{ return mp_HeadLink==0 ; } TypeSize GetSize () const{return ml_LinkSize;} diff --git a/ZCppMain/ZtCSimList.H b/ZCppMain/ZtCSimList.H index 9394c5a..c4ae174 100644 --- a/ZCppMain/ZtCSimList.H +++ b/ZCppMain/ZtCSimList.H @@ -1228,17 +1228,10 @@ namespace ZNsMain { DeleteAll(); } if(rhs.ml_LinkSize== 0 ){return *this;} - #if(_CODE_NEW_) - CopyLink(rhs.mp_HeadLink, rhs.ml_LinkSize-1, *this); return *this; - #else - ZtCSimList VO_StoreList; + CopyLink + (rhs.mp_HeadLink, rhs.ml_LinkSize-1, *this); - JoinHead /////////////////////////// - ( - CopyLink(rhs.mp_HeadLink, rhs.ml_LinkSize-1, VO_StoreList) - ); - return *this; ////////////////////// - #endif + return *this; }/* ZtCSimList& operator=(const ZtCSimList& rhs)*/ @@ -1257,46 +1250,15 @@ namespace ZNsMain TType& operator[](TTypSize AL_Index) { - #ifdef _DEBUG - - if(AL_Index<1 || AL_Index>ml_LinkSize) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<ml_LinkSize)*/ - - #endif //_DEBUG - return GetLinkPtr(AL_Index)->mo_DataObjt; }/* TType& operator[](TTypSize AL_Index)*/ const TType& operator[](TTypSize AL_Index) const { - #ifdef _DEBUG - - if(AL_Index<1 || AL_Index>ml_LinkSize) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<ml_LinkSize)*/ - - #endif //_DEBUG - return GetLinkPtr(AL_Index)->mo_DataObjt; - } - //const TType& operator[](TTypSize AL_Index) const + }/* + const TType& operator[](TTypSize AL_Index) const*/ operator TType&(){return AddTailDef()->mo_DataObjt;} @@ -1313,14 +1275,11 @@ namespace ZNsMain { ZCLink* VP_AddLink = GetCFreeHeap().SendFreeOut() ; - #if(_CODE_NEW_) if(TypeMoveObj::ZEUseMoveObj>0) //////////////////// { TypeMoveObj::Exec(VP_AddLink->mo_DataObjt, AR_Type); } - else /////////////////////////////////////////////// - #endif - VP_AddLink->mo_DataObjt= AR_Type ; + /*::::::::::::::::::::::::::::::::::::::::::::::::*/ if(++ml_LinkSize==1) // ml_LinkSize==0 { @@ -1339,43 +1298,43 @@ namespace ZNsMain }/* void AddHead(TypeArg AR_Type)*/ - ZCLink* AddHeadDef() + ZCLink& AddHeadDef() { ZCLink* VP_AddLink=GetCFreeHeap().SendFreeOut(); if(++ml_LinkSize==1) // ml_LinkSize==0 { - mp_HeadLink = - mp_TailLink = VP_AddLink ; + mp_HeadLink = mp_TailLink = VP_AddLink ; } else { - ZCLink::JoinLink(VP_AddLink, mp_HeadLink); + ZCLink::JoinLink + (VP_AddLink, mp_HeadLink); mp_HeadLink = VP_AddLink ; } - ZCLink::MakeRing(mp_HeadLink, mp_TailLink); + + ZCLink::MakeRing + (mp_HeadLink, mp_TailLink); + + return *VP_AddLink; }/* - ZCLink* AddHeadDef()*/ + ZCLink& AddHeadDef()*/ void AddTail(TypeArg AR_Type) { ZCLink* VP_AddLink = GetCFreeHeap().SendFreeOut(); - #if(_CODE_NEW_) - if(TypeMoveObj::ZEUseMoveObj>0) //////////////////// + if(TypeMoveObj::ZEUseMoveObj>0) //:::::::::::::::: { TypeMoveObj::Exec(VP_AddLink->mo_DataObjt, AR_Type); } - else /////////////////////////////////////////////// - #endif - VP_AddLink->mo_DataObjt= AR_Type ; + /*::::::::::::::::::::::::::::::::::::::::::::::*/ if(++ml_LinkSize==1) // ml_LinkSize==0 { - mp_HeadLink = - mp_TailLink = VP_AddLink ; + mp_HeadLink = mp_TailLink = VP_AddLink ; } else { @@ -1395,16 +1354,20 @@ namespace ZNsMain if(++ml_LinkSize==1) // ml_LinkSize==0 { - mp_HeadLink = - mp_TailLink = VP_AddLink ; + mp_HeadLink = mp_TailLink = VP_AddLink ; } else { - ZCLink::JoinLink(mp_TailLink, VP_AddLink); + ZCLink::JoinLink + (mp_TailLink, VP_AddLink); mp_TailLink = VP_AddLink ; } - ZCLink::MakeRing(mp_HeadLink, mp_TailLink); + + ZCLink::MakeRing + (mp_HeadLink, mp_TailLink); + + return *VP_AddLink; }/* ZCLink* AddTailDef()*/ @@ -1473,42 +1436,12 @@ namespace ZNsMain TType& GetHeadData() { - #ifdef _DEBUG - - if(mp_HeadLink==0) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<mo_DataObjt; }/* TType& GetHeadData()*/ const TType& GetHeadData() const { - #ifdef _DEBUG - - if(mp_HeadLink==0) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<mo_DataObjt; }/* const TType& GetHeadData() const*/ @@ -1516,42 +1449,12 @@ namespace ZNsMain TType& GetTailData() { - #ifdef _DEBUG - - if(mp_TailLink==0) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<mo_DataObjt ; }/* TType& GetTailData()*/ const TType& GetTailData() const { - #ifdef _DEBUG - - if(mp_TailLink==0) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<mo_DataObjt ; }/* const TType& GetTailData() const*/ @@ -1559,42 +1462,12 @@ namespace ZNsMain TType& GetData(TTypSize AL_Index) { - #ifdef _DEBUG - - if(AL_Index<1 || AL_Index>ml_LinkSize) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<ml_LinkSize)*/ - - #endif //_DEBUG - return GetLinkPtr(AL_Index)->mo_DataObjt; }/* TType& GetData(TTypSize AL_Index)*/ TType GetData(TTypSize AL_Index) const { - #ifdef _DEBUG - - if(AL_Index<1 || AL_Index>ml_LinkSize) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<ml_LinkSize)*/ - - #endif //_DEBUG - return GetLinkPtr(AL_Index)->mo_DataObjt; }/* TType GetData(TTypSize AL_Index) const*/ @@ -1602,27 +1475,6 @@ namespace ZNsMain void JoinHead(ZCLink* AP_Link) { - #ifdef _DEBUG - - if(AP_Link==0) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout< GetNextPtr( AL_DelSize ); - GetCFreeHeap().RecvFreeIn - (AL_DelSize, mp_HeadLink, VP_NewHead->mp_PrevLink); + GetCFreeHeap().RecvFreeIn //////////// + ( + AL_DelSize , + mp_HeadLink , + VP_NewHead->mp_PrevLink + ); + ////////////////////////////////////// - mp_HeadLink = VP_NewHead ; - ml_LinkSize -= AL_DelSize ; + mp_HeadLink = VP_NewHead ; + ml_LinkSize -= AL_DelSize ; ZCLink::MakeRing(mp_HeadLink, mp_TailLink); }/* @@ -1816,20 +1651,6 @@ namespace ZNsMain void Delete(ZCLink* AP_PrevLink, ZCLink* AP_CutLink) { - #ifdef _DEBUG - if ( Find(AP_CutLink)==0 || - Find(AP_CutLink)!=Find(AP_PrevLink)+1 - ) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<AL_CutTailPos || - Find(AP_CutHead)!=AL_CutHeadPos || - Find(AP_CutTail)!=AL_CutTailPos || - (AL_CutHeadPos!=1 && AP_CutHeadPrev->mp_NextLink!=AP_CutHead) - ) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<ml_LinkSize) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<ml_LinkSize)*/ - - #endif //_DEBUG - return mp_HeadLink->GetNextPtr(AL_Index-1); }/* ZCLink* GetLinkPtr(TTypSize AL_Index)*/ @@ -2029,21 +1800,6 @@ namespace ZNsMain const ZCLink* GetLinkPtr(TTypSize AL_Index) const { - #ifdef _DEBUG - - if(AL_Index<1 || AL_Index>ml_LinkSize) - { - std::fstream fileout("DEBUG.txt",std::ios::out | std::ios::app); - fileout<ml_LinkSize)*/ - - #endif //_DEBUG - return mp_HeadLink->GetNextPtr(AL_Index-1); }/* const ZCLink* GetLinkPtr(TTypSize AL_Index) const*/ @@ -2070,11 +1826,8 @@ namespace ZNsMain { return mo_FreeObjt.size(); } - inline bool IsEmpty() const - { - return mp_HeadLink==0; - }/* - inline bool IsEmpty() const*/ + inline bool IsEmpty() const{ return mp_HeadLink==0; } + inline bool empty () const{ return mp_HeadLink==0; }