summaryrefslogtreecommitdiffstats
path: root/Glob.cxx
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2019-09-18 12:13:53 (GMT)
committerBrad King <brad.king@kitware.com>2019-09-18 13:26:35 (GMT)
commit3327c0402a1ce31615c7ad22c5ff5d5330fb75da (patch)
treefb4faa49f9546d9c9b97b12807994b5c3bcb328d /Glob.cxx
parentf9a3f13415bb6d6f1750cfe5a45ce4aa9e329907 (diff)
downloadCMake-3327c0402a1ce31615c7ad22c5ff5d5330fb75da.zip
CMake-3327c0402a1ce31615c7ad22c5ff5d5330fb75da.tar.gz
CMake-3327c0402a1ce31615c7ad22c5ff5d5330fb75da.tar.bz2
KWSys 2019-09-18 (c6bc38c1)
Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit c6bc38c11a3a11e393f0608486b08dadc8dbacc3 (master). Upstream Shortlog ----------------- Sean McBride (5): 4de1241f Fixed -Wextra-semi-stmt warning 30de8e17 Fixed -Wsign-conversion warnings by adding casts 750da75a Fixed 64 to 32 bit truncation warning by casting 419aaa35 Fixed -Wunused-macros warnings 46c55893 Replaced several 0, NULL, and KWSYS_NULLPTR with nullptr
Diffstat (limited to 'Glob.cxx')
-rw-r--r--Glob.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Glob.cxx b/Glob.cxx
index 829c138..34bb0d0 100644
--- a/Glob.cxx
+++ b/Glob.cxx
@@ -431,7 +431,7 @@ void Glob::SetRelative(const char* dir)
const char* Glob::GetRelative()
{
if (this->Relative.empty()) {
- return KWSYS_NULLPTR;
+ return nullptr;
}
return this->Relative.c_str();
}