diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-20 14:10:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-20 14:12:56 (GMT) |
| commit | 7cf36407be6c8d5206b4c005e099519ce24f1350 (patch) | |
| tree | 3b070fa795e7a7410a9c48383cef20746f1149f8 /Source/kwsys/Glob.cxx | |
| parent | ffc7a59417619ec07728a8dea158e949155aa02b (diff) | |
| parent | c578caa68bf7ee55077a3efa25aba46e9e1f562a (diff) | |
| download | CMake-7cf36407be6c8d5206b4c005e099519ce24f1350.zip CMake-7cf36407be6c8d5206b4c005e099519ce24f1350.tar.gz CMake-7cf36407be6c8d5206b4c005e099519ce24f1350.tar.bz2 | |
Merge topic 'update-kwsys'
c578caa68b Tests: Decouple Plugin test from KWSys
56879273dc Merge branch 'upstream-KWSys' into update-kwsys
3327c0402a KWSys 2019-09-18 (c6bc38c1)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3828
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(); } |