From 265b18faa70cb20e5345e8b49f0d1bb57b7690dc Mon Sep 17 00:00:00 2001 From: sauron Date: Thu, 21 Aug 2025 23:51:38 +0900 Subject: [PATCH] commit 2025-08-21 23:51 ZfATOI => ZfAtoI, ZfATOL => ZfAtoL etc in ZMainHead.H and ZtCStringEx.H etc --- ZCppMain/ZMainHead.H | 40 ++++++++++++++++++++-------------------- ZCppMain/ZtCStringEx.H | 16 ++++++++-------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ZCppMain/ZMainHead.H b/ZCppMain/ZMainHead.H index 8688e2d..0bba75a 100644 --- a/ZCppMain/ZMainHead.H +++ b/ZCppMain/ZMainHead.H @@ -2375,68 +2375,68 @@ namespace ZNsMain #ifdef _WIN - inline ZTypLLong ZfATOLL(const char* ApcChar) + inline ZTypLLong ZfAtoLL(const char* ApcChar) { if(ApcChar==0) return 0; return ::_atoi64(ApcChar); }/* - inline ZTypLLong ZfATOLL(const char* ApcChar)*/ + inline ZTypLLong ZfAtoLL(const char* ApcChar)*/ #else // !defined(_WIN) - inline ZTypLLong ZfATOLL(const char* ApcChar) + inline ZTypLLong ZfAtoLL(const char* ApcChar) { if(ApcChar==0) return 0; return ::atoll(ApcChar); }/* - inline ZTypLLong ZfATOLL(const char* ApcChar)*/ + inline ZTypLLong ZfAtoLL(const char* ApcChar)*/ #endif // !defined(_WIN) - inline ZTypLLong ZfATOLL(const char* ApcChar, ZTypIntI AI_Length) + inline ZTypLLong ZfAtoLL(const char* ApcChar, ZTypIntI AI_Length) { return ZfAToInt(ApcChar, AI_Length); }/* - inline ZTypLLong ZfATOL(const char* ApcChar, ZTypIntI AI_Length)*/ + inline ZTypLLong ZfAtoL(const char* ApcChar, ZTypIntI AI_Length)*/ - inline ZTypLong ZfATOL(const char* ApcChar) + inline ZTypLong ZfAtoL(const char* ApcChar) { if(ApcChar==0) return 0; return ::atol(ApcChar); }/* - inline ZTypLong ZfATOL(const char* ApcChar)*/ + inline ZTypLong ZfAtoL(const char* ApcChar)*/ - inline ZTypLong ZfATOL(const char* ApcChar, ZTypIntI AI_Length) + inline ZTypLong ZfAtoL(const char* ApcChar, ZTypIntI AI_Length) { return ZfAToInt(ApcChar, AI_Length); }/* - inline ZTypLong ZfATOL(const char* ApcChar, ZTypIntI AI_Length)*/ + inline ZTypLong ZfAtoL(const char* ApcChar, ZTypIntI AI_Length)*/ - inline ZTypIntI ZfATOI(const char* ApcChar) + inline ZTypIntI ZfAtoI(const char* ApcChar) { if(ApcChar==0) return 0; return ::atoi(ApcChar); }/* - inline ZTypIntI ZfATOI(const char* ApcChar)*/ + inline ZTypIntI ZfAtoI(const char* ApcChar)*/ - inline ZTypIntI ZfATOI(const char* ApcChar, ZTypIntI AI_Length) + inline ZTypIntI ZfAtoI(const char* ApcChar, ZTypIntI AI_Length) { return ZfAToInt(ApcChar, AI_Length); }/* - inline ZTypIntI ZfATOI(const char* ApcChar, ZTypIntI AI_Length)*/ + inline ZTypIntI ZfAtoI(const char* ApcChar, ZTypIntI AI_Length)*/ - inline double ZfATOD(const char* ApcChar) + inline double ZfAtoD(const char* ApcChar) { return ApcChar==0 ? 0 : ::atof(ApcChar) ; }/* - inline double ZfATOD(const char* ApcChar)*/ + inline double ZfAtoD(const char* ApcChar)*/ - inline ZTypLLong AtoLL(const char* ApcChar){return ZfATOLL(ApcChar);} - inline ZTypLong AtoL (const char* ApcChar){return ZfATOL (ApcChar);} - inline ZTypIntI AtoI (const char* ApcChar){return ZfATOI (ApcChar);} - inline double AtoD (const char* ApcChar){return ZfATOD (ApcChar);} + inline ZTypLLong AtoLL(const char* ApcChar){return ZfAtoLL(ApcChar);} + inline ZTypLong AtoL (const char* ApcChar){return ZfAtoL (ApcChar);} + inline ZTypIntI AtoI (const char* ApcChar){return ZfAtoI (ApcChar);} + inline double AtoD (const char* ApcChar){return ZfAtoD (ApcChar);} inline ZTypLLong AtoLL(const char* ApcChar, ZTypIntI AI_Length) { return ZfAToInt(ApcChar, AI_Length); } diff --git a/ZCppMain/ZtCStringEx.H b/ZCppMain/ZtCStringEx.H index 0f2733f..dc11732 100644 --- a/ZCppMain/ZtCStringEx.H +++ b/ZCppMain/ZtCStringEx.H @@ -1484,7 +1484,7 @@ namespace ZNsMain >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ /*######*/ VP_Char[i] =0 ; - TypeLength VB_Return = ZNsMain::ZfATOL(VP_Char); + TypeLength VB_Return = ZNsMain::ZfAtoL(VP_Char); this->DeleteMem(VP_Char); return VB_Return; }/* @@ -1638,15 +1638,15 @@ namespace ZNsMain }/* bool IsEmpty() const*/ - int GetInt () const{return ZNsMain::ZfATOI (mpc_Data);} - ZTypLong GetLong () const{return ZNsMain::ZfATOL (mpc_Data);} - ZTypLLong GetLongLong() const{return ZNsMain::ZfATOLL(mpc_Data);} - ZTypLLong GetLLong () const{return ZNsMain::ZfATOLL(mpc_Data);} - double GetDouble () const{return ZNsMain::ZfATOD (mpc_Data);} + int GetInt () const{return ZNsMain::ZfAtoI (mpc_Data);} + ZTypLong GetLong () const{return ZNsMain::ZfAtoL (mpc_Data);} + ZTypLLong GetLongLong() const{return ZNsMain::ZfAtoLL(mpc_Data);} + ZTypLLong GetLLong () const{return ZNsMain::ZfAtoLL(mpc_Data);} + double GetDouble () const{return ZNsMain::ZfAtoD (mpc_Data);} ZCStringBase& ConvertLLong() { - ZNsMain::ZTypLLong LLongValue=ZNsMain::ZfATOLL(mpc_Data); + ZNsMain::ZTypLLong LLongValue=ZNsMain::ZfAtoLL(mpc_Data); this->Invalidate(); return (*this)(LLongValue); }/* @@ -1654,7 +1654,7 @@ namespace ZNsMain ZCStringBase& ConvertLong() { - ZNsMain::ZTypLLong LongValue=ZNsMain::ZfATOL(mpc_Data); + ZNsMain::ZTypLLong LongValue=ZNsMain::ZfAtoL(mpc_Data); this->Invalidate(); return (*this)(LongValue); }/*