diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index ccb73ca..ceed24f 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -3774,38 +3774,47 @@ namespace ZNsMain { public: - template - - class ZtIMain + + template< typename TDblList > class ZtCDblList { public: - void RecvFreeIn(TTypeLink* AP_CutLink){} - void RecvFreeIn //////////////////////// + typedef typename TDblList::ZCLink ZCLink ; + typedef typename TDblList::TypeSize TypeSize; + public: + + void RecvFreeIn(ZCLink* AP_CutLink){} + void RecvFreeIn ///////////////////// ( - TTypeLink* AP_CutHead , - TTypeLink* AP_CutTail , - TTypSize AL_CutCnt + TypeSize AL_CutCnt , + ZCLink* AP_CutHead, + ZCLink* AP_CutTail ) - { } //////////////////////////////////// + { } ///////////////////////////////// - TTypeLink* SendFreeOut(){} - void SendFreeOut ///////////////// + ZCLink* SendFreeOut(){} + void SendFreeOut ///////////////// ( - TTypeLink*& APR_NewHead , - TTypeLink*& APR_NewTail , - TTypSize AL_NeedCnt + TypeSize AL_NeedCnt , + ZCLink*& APR_NewHead, + ZCLink*& APR_NewTail ) - { } //////////////////////////////////// + { } ///////////////////////////////// + + + void SendFreeOutCopy /*////////////////////////////*/ + ( + ZCLink* AP_LinkOrgin, TypeSize AL_FarNum , + ZCLink*& APR_HeadCopy, ZCLink*& APR_TailCopy + ) + { } /*///////////////////////////////////////////////*/ void DeleteHeap(){} - public: };/* - template - - class ZtIMain */ + template< typename TDblList > class ZtCDblList*/ + public: };/* diff --git a/ZCppMain/ZtCObjList.H b/ZCppMain/ZtCObjList.H index 103c145..e9c70c3 100644 --- a/ZCppMain/ZtCObjList.H +++ b/ZCppMain/ZtCObjList.H @@ -29,15 +29,15 @@ namespace ZNsMain template class ZtCSortObjList; - template< typename TType , ///////////////////////////// - typename TTypArgu = const TType& , - typename TTypCAlloc = ZCAllocator , - typename TTypeInit = ZtCInit, - typename TTypSize = ZTypLong , - typename TMoveObj = ZNsMain:: - ZtCMoveObj + template< typename TType /////////////////////////////////////////////////// + , typename TTypArgu = const TType& + , typename TTypCAlloc = ZCAllocator + , typename TTypeInit = ZtCInit + , typename TTypSize = ZTypLong + , typename TMoveObj = ZtCMoveObj + , typename TFeeeHeap = ZNsIFace::ZIFreeHeap > - class ZtCObjList ////////////////////////////////////////////////////////////*/ + class ZtCObjList ////////////////////////////////////////////////////////////// { public: template friend class ZtCSortObjList; @@ -57,6 +57,9 @@ namespace ZNsMain typedef ZCIterator iterator; typedef const ZCIterator const_iterator; public: + typedef typename TFeeeHeap:: + template ZtCDblList ZCFreeHeap; + public: class ZCLink : public TypeAlloc @@ -2214,13 +2217,13 @@ namespace ZNsMain public: };/* - template< typename TType , - typename TTypArgu = const TType& , - typename TTypCAlloc = ZCAllocator , - typename TTypeInit = ZtCInit, - typename TTypSize = ZTypLong , - typename TMoveObj = ZNsMain:: - ZtCMoveObj + template< typename TType /////////////////////////////////////////////////// + , typename TTypArgu = const TType& + , typename TTypCAlloc = ZCAllocator + , typename TTypeInit = ZtCInit + , typename TTypSize = ZTypLong + , typename TMoveObj = ZtCMoveObj + , typename TFeeeHeap = ZNsIFace::ZIFreeHeap > class ZtCObjList ////////////////////////////////////////////////////////////*/ diff --git a/ZCppMain/ZtCSimList.H b/ZCppMain/ZtCSimList.H index 8aea306..ba7c4a3 100644 --- a/ZCppMain/ZtCSimList.H +++ b/ZCppMain/ZtCSimList.H @@ -756,7 +756,7 @@ namespace ZNsMain mp_NoUseTailLink->mp_NextLink=0; ml_UseSize += AL_Count ; } - //void ReceiveLink(ZCLink* AP_HeadLink,ZCLink* AP_TailLink, TTypSize AL_Count) + //void ReceiveLink(ZCLink* AP_HeadLink, ZCLink* AP_TailLink, TTypSize AL_Count) //private: