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/testCommandLineArguments1.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/testCommandLineArguments1.cxx')
| -rw-r--r-- | Source/kwsys/testCommandLineArguments1.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/kwsys/testCommandLineArguments1.cxx b/Source/kwsys/testCommandLineArguments1.cxx index 5a03401..5dfa5e3 100644 --- a/Source/kwsys/testCommandLineArguments1.cxx +++ b/Source/kwsys/testCommandLineArguments1.cxx @@ -21,7 +21,7 @@ int testCommandLineArguments1(int argc, char* argv[]) arg.Initialize(argc, argv); int n = 0; - char* m = 0; + char* m = KWSYS_NULLPTR; std::string p; int res = 0; @@ -55,11 +55,11 @@ int testCommandLineArguments1(int argc, char* argv[]) delete[] m; } - char** newArgv = 0; + char** newArgv = KWSYS_NULLPTR; int newArgc = 0; arg.GetUnusedArguments(&newArgc, &newArgv); int cc; - const char* valid_unused_args[9] = { 0, + const char* valid_unused_args[9] = { KWSYS_NULLPTR, "--ignored", "--second-ignored", "third-ignored", |