diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2018-01-23 18:07:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-01-24 19:11:06 (GMT) |
| commit | 7a75657084c518a39b192c7ee1568588944677af (patch) | |
| tree | e425d65299f889b6e5d71be8c21bf3d236cdde85 /testEncoding.cxx | |
| parent | 86399e49398cc9e8028e280eee3e89992ab3fd11 (diff) | |
| download | CMake-7a75657084c518a39b192c7ee1568588944677af.zip CMake-7a75657084c518a39b192c7ee1568588944677af.tar.gz CMake-7a75657084c518a39b192c7ee1568588944677af.tar.bz2 | |
KWSys 2018-01-23 (0579db1c)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 0579db1c97715f9936523dd473c0ed7613b68e68 (master).
Upstream Shortlog
-----------------
Ben Boeckel (1):
3e807fd6 cmake: specify source file extensions
Brad King (1):
38855ca1 Set CMP0042 explicitly with CMake 3.0 and above
Chuck Atkins (1):
4ca97fc6 SystemTools: Disable getpwnam for static linux builds
Hans Johnson (1):
7d7f3b2d Configure: Add KWSYS_NULLPTR macro for C++ code
Sankhesh Jhaveri (1):
20c458d0 Set CMP0022 policy to new to provide link interface definitions
Sean McBride (1):
c6829e4d Fixed a few comments, mostly regarding base 2 vs base 10 sizes
luz.paz (1):
4b67f965 Remove superfluous double whitespace in appropriate places
Diffstat (limited to 'testEncoding.cxx')
| -rw-r--r-- | testEncoding.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testEncoding.cxx b/testEncoding.cxx index 2742fe4..6bf273f 100644 --- a/testEncoding.cxx +++ b/testEncoding.cxx @@ -84,7 +84,7 @@ static int testRobustEncoding() // this conversion could fail std::wstring wstr = kwsys::Encoding::ToWide(cstr); - wstr = kwsys::Encoding::ToWide(NULL); + wstr = kwsys::Encoding::ToWide(KWSYS_NULLPTR); if (wstr != L"") { const wchar_t* wcstr = wstr.c_str(); std::cout << "ToWide(NULL) returned"; @@ -112,7 +112,7 @@ static int testRobustEncoding() std::string win_str = kwsys::Encoding::ToNarrow(cwstr); #endif - std::string str = kwsys::Encoding::ToNarrow(NULL); + std::string str = kwsys::Encoding::ToNarrow(KWSYS_NULLPTR); if (str != "") { std::cout << "ToNarrow(NULL) returned " << str << std::endl; ret++; |