diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index ad95a05..2e1802e 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -1651,59 +1651,87 @@ namespace ZNsMain typedef void (*ZfpNone)(void*); void ZfNone(void* AP_Void=0){}; template class ZtCTypeData - { public: typedef TType TypeData; - static TType& GetObjRef(TType& AR_Type){return AR_Type;}}; + { public: + typedef TType TypeData; typedef TType TypeBody; + static TType& GetObjRef(TType& AR_Type){return AR_Type;} + }; template class ZtCTypeData - { public: typedef TType TypeData; - static TType& GetObjRef(TType* AP_Type){return *AP_Type;}}; + { public: + typedef TType TypeData; typedef TType* TypeBody; + static TType& GetObjRef(TType* AP_Type){return *AP_Type;} + }; template class ZtCTypeData - { public: typedef TType TypeData; - static TType& GetObjRef(TType& AR_Type){return AR_Type;}}; + { public: + typedef TType TypeData; typedef TType& TypeBody; + static TType& GetObjRef(TType& AR_Type){return AR_Type;} + }; + /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ template< /*########*/ > class ZtCTypeData - { public: typedef ZfpNone TypeData; - static ZfpNone GetObjRef(void* AP_Void){return ZfNone ;}}; - + { public: + typedef ZfpNone TypeData; typedef ZfpNone TypeBody; + static ZfpNone GetObjRef(void* AP_Void){return ZfNone ;} + }; + template< /*########*/ > class ZtCTypeData + { public: + typedef ZfpNone TypeData; typedef ZfpNone TypeBody; + static ZfpNone GetObjRef(void* AP_Void){return ZfNone ;} + }; + /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ template class ZtCTypeData< ZtCRef > - { public: typedef TType TypeData; static TType& - GetObjRef(ZtCRef& AR_CRef) + { public: + typedef TType TypeData; typedef TType& TypeBody; + static TType& GetObjRef(ZtCRef& AR_CRef) {return AR_CRef.GetData() /*//////////////*/ ;} + static TType& GetObjRef(TType& AR_Data) + {return AR_Data /*//////////////*/ ;} }; template class ZtCTypeData< ZtCRef* > - { public: typedef TType TypeData; static TType& - GetObjRef(ZtCRef* AP_CRef) + { public: + typedef TType TypeData; typedef TType* TypeBody; + static TType& GetObjRef(ZtCRef* AP_CRef) {return *reinterpret_cast(AP_CRef);} + static TType& GetObjRef( TType * AP_Data) + {return *AP_Data /*//////////////*/ ;} }; template class ZtCTD - { public: typedef TType TypeData; + { public: typedef TType TypeData; typedef TType TypeBody; static TType& GetObjRef(TType& AR_Type){return AR_Type ;} static TType& GOR (TType& AR_Type){return AR_Type ;}}; template class ZtCTD - { public: typedef TType TypeData; + { public: typedef TType TypeData; typedef TType* TypeBody; static TType& GetObjRef(TType* AP_Type){return *AP_Type;} static TType& GOR (TType* AP_Type){return *AP_Type;}}; template class ZtCTD - { public: typedef TType TypeData; + { public: typedef TType TypeData; typedef TType& TypeBody; static TType& GetObjRef(TType& AR_Type){return AR_Type ;} static TType& GOR (TType& AR_Type){return AR_Type ;}}; template< /*########*/ > class ZtCTD - { public: typedef ZfpNone TypeData; + { public: typedef ZfpNone TypeData; typedef ZfpNone TypeBody; + static ZfpNone GetObjRef(void* AP_Void){return ZfNone ;} + static ZfpNone GOR (void* AP_Void){return ZfNone ;}}; + template< /*########*/ > class ZtCTD + { public: typedef ZfpNone TypeData; typedef ZfpNone TypeBody; static ZfpNone GetObjRef(void* AP_Void){return ZfNone ;} static ZfpNone GOR (void* AP_Void){return ZfNone ;}}; template class ZtCTD< ZtCRef > - { public: typedef TType TypeData; + { public: typedef TType TypeData; typedef TType& TypeBody; static TType& GetObjRef(ZtCRef& AR_CRef){return AR_CRef.GetData() ;} static TType& GOR (ZtCRef& AR_CRef){return AR_CRef.GetData() ;} + static TType& GetObjRef( TType & AR_Data){return AR_Data ;} + static TType& GOR ( TType & AR_Data){return AR_Data ;} }; template class ZtCTD< ZtCRef* > - { public: typedef TType TypeData; + { public: typedef TType TypeData; typedef TType* TypeBody; static TType& GetObjRef(ZtCRef* AP_CRef) {return *reinterpret_cast(AP_CRef);} static TType& GOR (ZtCRef* AP_CRef) {return *reinterpret_cast(AP_CRef);} + static TType& GetObjRef( TType * AP_Data){return AP_Data;} + static TType& GOR ( TType * AP_Data){return *AP_Data;} }; @@ -5070,6 +5098,7 @@ namespace ZNsMain + /*/////////////////////////////////////////////////////////////////// ■ class ZtCMiniValChain<>