admin/RepoMain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit 2025-08-21 23:51 ZfATOI => ZfAtoI, ZfATOL => ZfAtoL etc in ZMainHead.H and ZtCStringEx.H etc

Browse Source
This commit is contained in:
sauron
2025-08-21 23:51:38 +09:00
parent b1702c58d4
commit 265b18faa7
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ZCppMain/ZMainHead.H
View File

@ -2375,68 +2375,68 @@ namespace ZNsMain
#ifdef _WIN #ifdef _WIN
inline ZTypLLong ZfATOLL(const char* ApcChar) inline ZTypLLong ZfAtoLL(const char* ApcChar)
{ {
if(ApcChar==0) return 0; return ::_atoi64(ApcChar); if(ApcChar==0) return 0; return ::_atoi64(ApcChar);
}/* }/*
inline ZTypLLong ZfATOLL(const char* ApcChar)*/ inline ZTypLLong ZfAtoLL(const char* ApcChar)*/
#else // !defined(_WIN) #else // !defined(_WIN)
inline ZTypLLong ZfATOLL(const char* ApcChar) inline ZTypLLong ZfAtoLL(const char* ApcChar)
{ {
if(ApcChar==0) return 0; return ::atoll(ApcChar); if(ApcChar==0) return 0; return ::atoll(ApcChar);
}/* }/*
inline ZTypLLong ZfATOLL(const char* ApcChar)*/ inline ZTypLLong ZfAtoLL(const char* ApcChar)*/
#endif // !defined(_WIN) #endif // !defined(_WIN)
inline ZTypLLong ZfATOLL(const char* ApcChar, ZTypIntI AI_Length) inline ZTypLLong ZfAtoLL(const char* ApcChar, ZTypIntI AI_Length)
{ {
return ZfAToInt<ZTypLLong>(ApcChar, AI_Length); return ZfAToInt<ZTypLLong>(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); 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<ZTypLong>(ApcChar, AI_Length); return ZfAToInt<ZTypLong>(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); 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<ZTypIntI>(ApcChar, AI_Length); return ZfAToInt<ZTypIntI>(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) ; 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 ZTypLLong AtoLL(const char* ApcChar){return ZfAtoLL(ApcChar);}
inline ZTypLong AtoL (const char* ApcChar){return ZfATOL (ApcChar);} inline ZTypLong AtoL (const char* ApcChar){return ZfAtoL (ApcChar);}
inline ZTypIntI AtoI (const char* ApcChar){return ZfATOI (ApcChar);} inline ZTypIntI AtoI (const char* ApcChar){return ZfAtoI (ApcChar);}
inline double AtoD (const char* ApcChar){return ZfATOD (ApcChar);} inline double AtoD (const char* ApcChar){return ZfAtoD (ApcChar);}
inline ZTypLLong AtoLL(const char* ApcChar, ZTypIntI AI_Length) inline ZTypLLong AtoLL(const char* ApcChar, ZTypIntI AI_Length)
{ return ZfAToInt<ZTypLLong>(ApcChar, AI_Length); } { return ZfAToInt<ZTypLLong>(ApcChar, AI_Length); }

16
ZCppMain/ZtCStringEx.H
View File

@ -1484,7 +1484,7 @@ namespace ZNsMain
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
/*######*/ VP_Char[i] =0 ; /*######*/ 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; this->DeleteMem(VP_Char); return VB_Return;
}/* }/*
@ -1638,15 +1638,15 @@ namespace ZNsMain
}/* }/*
bool IsEmpty() const*/ bool IsEmpty() const*/
int GetInt () const{return ZNsMain::ZfATOI (mpc_Data);} int GetInt () const{return ZNsMain::ZfAtoI (mpc_Data);}
ZTypLong GetLong () const{return ZNsMain::ZfATOL (mpc_Data);} ZTypLong GetLong () const{return ZNsMain::ZfAtoL (mpc_Data);}
ZTypLLong GetLongLong() const{return ZNsMain::ZfATOLL(mpc_Data);} ZTypLLong GetLongLong() const{return ZNsMain::ZfAtoLL(mpc_Data);}
ZTypLLong GetLLong () const{return ZNsMain::ZfATOLL(mpc_Data);} ZTypLLong GetLLong () const{return ZNsMain::ZfAtoLL(mpc_Data);}
double GetDouble () const{return ZNsMain::ZfATOD (mpc_Data);} double GetDouble () const{return ZNsMain::ZfAtoD (mpc_Data);}
ZCStringBase& ConvertLLong() ZCStringBase& ConvertLLong()
{ {
ZNsMain::ZTypLLong LLongValue=ZNsMain::ZfATOLL(mpc_Data); ZNsMain::ZTypLLong LLongValue=ZNsMain::ZfAtoLL(mpc_Data);
this->Invalidate(); return (*this)(LLongValue); this->Invalidate(); return (*this)(LLongValue);
}/* }/*
@ -1654,7 +1654,7 @@ namespace ZNsMain
ZCStringBase& ConvertLong() ZCStringBase& ConvertLong()
{ {
ZNsMain::ZTypLLong LongValue=ZNsMain::ZfATOL(mpc_Data); ZNsMain::ZTypLLong LongValue=ZNsMain::ZfAtoL(mpc_Data);
this->Invalidate(); return (*this)(LongValue); this->Invalidate(); return (*this)(LongValue);
}/* }/*