diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-18 13:26:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-09-18 13:26:40 (GMT) |
| commit | 56879273dc87a69e1d1491a73e0f74cd4424494c (patch) | |
| tree | cd9c73956f1a4d1d1603267864b6beff34fdf938 /Source/kwsys/testEncoding.cxx | |
| parent | 45b7d5284e11cb34885b756bee8dedeb94fc16cb (diff) | |
| parent | 3327c0402a1ce31615c7ad22c5ff5d5330fb75da (diff) | |
| download | CMake-56879273dc87a69e1d1491a73e0f74cd4424494c.zip CMake-56879273dc87a69e1d1491a73e0f74cd4424494c.tar.gz CMake-56879273dc87a69e1d1491a73e0f74cd4424494c.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-09-18 (c6bc38c1)
Diffstat (limited to 'Source/kwsys/testEncoding.cxx')
| -rw-r--r-- | Source/kwsys/testEncoding.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/testEncoding.cxx b/Source/kwsys/testEncoding.cxx index fdad1cd..988697b 100644 --- a/Source/kwsys/testEncoding.cxx +++ b/Source/kwsys/testEncoding.cxx @@ -84,7 +84,7 @@ static int testRobustEncoding() // this conversion could fail std::wstring wstr = kwsys::Encoding::ToWide(cstr); - wstr = kwsys::Encoding::ToWide(KWSYS_NULLPTR); + wstr = kwsys::Encoding::ToWide(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(KWSYS_NULLPTR); + std::string str = kwsys::Encoding::ToNarrow(nullptr); if (str != "") { std::cout << "ToNarrow(NULL) returned " << str << std::endl; ret++; |