diff options
Diffstat (limited to 'orkbasecxx/StdString.h')
| -rw-r--r-- | orkbasecxx/StdString.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/orkbasecxx/StdString.h b/orkbasecxx/StdString.h index 0f3896c..6271022 100644 --- a/orkbasecxx/StdString.h +++ b/orkbasecxx/StdString.h @@ -647,7 +647,7 @@ inline const Type& SSMAX(const Type& arg1, const Type& arg2) #endif // #ifdef SS_ANSI #ifndef UNUSED - #define UNUSED(x) x + #define UNUSED(x) #endif #endif // #ifndef W32BASE_H @@ -1311,15 +1311,14 @@ inline void ssasn(std::string& sDst, const std::wstring& sSrc) #endif sDst.resize(nDst+1); +#ifdef SS_MBCS PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()), nDst, sSrc.c_str(), static_cast<int>(sSrc.size())); // In MBCS builds, we don't know how long the destination string will be. -#ifdef SS_MBCS sDst.resize(sslen(szCvt)); #else - szCvt; sDst.resize(sSrc.size()); #endif } @@ -1340,16 +1339,15 @@ inline void ssasn(std::string& sDst, PCWSTR pW) #endif sDst.resize(nDst + 1); +#ifdef SS_MBCS PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()), nDst, pW, nSrc); // In MBCS builds, we don't know how long the destination string will be. -#ifdef SS_MBCS sDst.resize(sslen(szCvt)); #else sDst.resize(nDst); - szCvt; #endif } else @@ -1462,14 +1460,13 @@ inline void ssadd(std::string& sDst, const std::wstring& sSrc) #endif sDst.resize(nDst+nAdd+1); +#ifdef SS_MBCS PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()+nDst), nAdd, sSrc.c_str(), nSrc); -#ifdef SS_MBCS sDst.resize(nDst + sslen(szCvt)); #else sDst.resize(nDst + nAdd); - szCvt; #endif } } @@ -1490,14 +1487,13 @@ inline void ssadd(std::string& sDst, PCWSTR pW) #endif sDst.resize(nDst + nAdd + 1); +#ifdef SS_MBCS PCSTR szCvt = StdCodeCvt(const_cast<SS_PTRTYPE>(sDst.data()+nDst), nAdd, pW, nSrc); -#ifdef SS_MBCS sDst.resize(nDst + sslen(szCvt)); #else sDst.resize(nDst + nSrc); - szCvt; #endif } } @@ -1535,14 +1531,13 @@ inline void ssadd(std::wstring& sDst, const std::string& sSrc) int nDst = static_cast<int>(sDst.size()); sDst.resize(nDst + nSrc + 1); +#ifdef SS_MBCS PCWSTR szCvt = StdCodeCvt(const_cast<SW_PTRTYPE>(sDst.data()+nDst), nSrc, sSrc.c_str(), nSrc+1); -#ifdef SS_MBCS sDst.resize(nDst + sslen(szCvt)); #else sDst.resize(nDst + nSrc); - szCvt; #endif } } @@ -1555,14 +1550,13 @@ inline void ssadd(std::wstring& sDst, PCSTR pA) int nDst = static_cast<int>(sDst.size()); sDst.resize(nDst + nSrc + 1); +#ifdef SS_MBCS PCWSTR szCvt = StdCodeCvt(const_cast<SW_PTRTYPE>(sDst.data()+nDst), nSrc, pA, nSrc+1); -#ifdef SS_MBCS sDst.resize(nDst + sslen(szCvt)); #else sDst.resize(nDst + nSrc); - szCvt; #endif } } |