diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-24 19:11:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-01-24 19:11:07 (GMT) |
| commit | f8e89468150ba6a3010324805527dd5e6d9cd8bc (patch) | |
| tree | 68b28833cba33038ab1ad41dd295092c6ee0fc89 /Source/kwsys/testCommandLineArguments.cxx | |
| parent | 05e9cdb81ecddba496f21d0c9e35e9536261337f (diff) | |
| parent | 7a75657084c518a39b192c7ee1568588944677af (diff) | |
| download | CMake-f8e89468150ba6a3010324805527dd5e6d9cd8bc.zip CMake-f8e89468150ba6a3010324805527dd5e6d9cd8bc.tar.gz CMake-f8e89468150ba6a3010324805527dd5e6d9cd8bc.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-01-23 (0579db1c)
Diffstat (limited to 'Source/kwsys/testCommandLineArguments.cxx')
| -rw-r--r-- | Source/kwsys/testCommandLineArguments.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/kwsys/testCommandLineArguments.cxx b/Source/kwsys/testCommandLineArguments.cxx index d2215d6..78baed9 100644 --- a/Source/kwsys/testCommandLineArguments.cxx +++ b/Source/kwsys/testCommandLineArguments.cxx @@ -76,7 +76,7 @@ int testCommandLineArguments(int argc, char* argv[]) int some_int_variable = 10; double some_double_variable = 10.10; - char* some_string_variable = 0; + char* some_string_variable = KWSYS_NULLPTR; std::string some_stl_string_variable = ""; bool some_bool_variable = false; bool some_bool_variable1 = false; @@ -202,7 +202,7 @@ int testCommandLineArguments(int argc, char* argv[]) for (cc = 0; cc < strings_argument.size(); ++cc) { delete[] strings_argument[cc]; - strings_argument[cc] = 0; + strings_argument[cc] = KWSYS_NULLPTR; } return res; } |