diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-01 18:07:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-01 18:07:35 (GMT) |
| commit | 594a9fcf6fa1ad9bcfe91abe7d94df2e92f3d11b (patch) | |
| tree | 1e39e0513a6af72bf692be1a467eaa0f673a4cff /Source/kwsys/EncodingCXX.cxx | |
| parent | 6a42b9609f1d0a047394a8d63fb8ddb803abce34 (diff) | |
| parent | 74ef363dd7e46fc883b9822f3516002d9345293e (diff) | |
| download | CMake-594a9fcf6fa1ad9bcfe91abe7d94df2e92f3d11b.zip CMake-594a9fcf6fa1ad9bcfe91abe7d94df2e92f3d11b.tar.gz CMake-594a9fcf6fa1ad9bcfe91abe7d94df2e92f3d11b.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-06-01 (8243fefa)
Diffstat (limited to 'Source/kwsys/EncodingCXX.cxx')
| -rw-r--r-- | Source/kwsys/EncodingCXX.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/kwsys/EncodingCXX.cxx b/Source/kwsys/EncodingCXX.cxx index 641c0e6..b1e54c9 100644 --- a/Source/kwsys/EncodingCXX.cxx +++ b/Source/kwsys/EncodingCXX.cxx @@ -147,11 +147,11 @@ std::wstring Encoding::ToWide(const std::string& str) wstr += ToWide(str.c_str() + pos); } nullPos = str.find('\0', pos); - if (nullPos != str.npos) { + if (nullPos != std::string::npos) { pos = nullPos + 1; wstr += wchar_t('\0'); } - } while (nullPos != str.npos); + } while (nullPos != std::string::npos); #endif return wstr; } @@ -181,11 +181,11 @@ std::string Encoding::ToNarrow(const std::wstring& str) nstr += ToNarrow(str.c_str() + pos); } nullPos = str.find(wchar_t('\0'), pos); - if (nullPos != str.npos) { + if (nullPos != std::string::npos) { pos = nullPos + 1; nstr += '\0'; } - } while (nullPos != str.npos); + } while (nullPos != std::string::npos); #endif return nstr; } |