diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 29c3337..a797b50 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -7437,15 +7437,14 @@ namespace ZNsMain public: typedef typename TTypString:: traits_type::char_type /*++*/ TypeChar; - typedef TTypString /*+++++++++*/ TypeCStr; - public: + typedef TTypString /*++*/ TypeCStr; typedef typename - ZtCCharInt::TypeInt TypeInt ; + ZtCCharInt::TypeInt TypeInt ; public: static const int CI_ByteSize = sizeof(TypeChar); public: - typedef TypeChar char_type ; // for stl - typedef TypeInt int_type ; // for stl + typedef TypeChar char_type ; // for stl string/wstring + typedef TypeInt int_type ; // for stl string/wstring public: };/* template class ZtCCharType*/ @@ -7454,15 +7453,14 @@ namespace ZNsMain { public: typedef std::string /*+++++++*/ TypeCStr; - typedef char /*+++++++++++++++*/ TypeChar; - public: + typedef char /*+++++++*/ TypeChar; typedef typename ZtCCharInt::TypeInt TypeInt ; public: static const int CI_ByteSize = sizeof(TypeChar); public: - typedef TypeChar char_type ; // for stl - typedef TypeInt int_type ; // for stl + typedef TypeChar char_type ; // for stl string/wstring + typedef TypeInt int_type ; // for stl string/wstring public: };/* template<> class ZtCCharType*/ @@ -7471,15 +7469,14 @@ namespace ZNsMain { public: typedef std::wstring /*+++++++*/ TypeCStr; - typedef wchar_t /*+++++++++++*/ TypeChar; - public: + typedef wchar_t /*+++++++*/ TypeChar; typedef typename ZtCCharInt::TypeInt TypeInt ; public: static const int CI_ByteSize = sizeof(TypeChar); public: - typedef TypeChar char_type ; // for stl - typedef TypeInt int_type ; // for stl + typedef TypeChar char_type ; // for stl string/wstring + typedef TypeInt int_type ; // for stl string/wstring public: };/* template<> class ZtCCharType*/ diff --git a/ZCppMain/ZtCStringEx.H b/ZCppMain/ZtCStringEx.H index 5844189..cdca35d 100644 --- a/ZCppMain/ZtCStringEx.H +++ b/ZCppMain/ZtCStringEx.H @@ -149,9 +149,7 @@ namespace ZNsMain TTypCh, TAlloc, TAllocSize, TTypeString > /*/////////////////////////////////*/ TypeCStr ; - public: typedef TTypCh /*//////////////////*/ TypeChar ; - public: static const int CI_ByteSize = sizeof(TypeChar) ; public: typedef typename