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/Glob.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/Glob.cxx')
| -rw-r--r-- | Source/kwsys/Glob.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/kwsys/Glob.cxx b/Source/kwsys/Glob.cxx index 829c138..34bb0d0 100644 --- a/Source/kwsys/Glob.cxx +++ b/Source/kwsys/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(); } |