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/testCommandLineArguments1.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/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 9895008..64561b1 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 = KWSYS_NULLPTR; + char* m = nullptr; std::string p; int res = 0; @@ -55,11 +55,11 @@ int testCommandLineArguments1(int argc, char* argv[]) delete[] m; } - char** newArgv = KWSYS_NULLPTR; + char** newArgv = nullptr; int newArgc = 0; arg.GetUnusedArguments(&newArgc, &newArgv); int cc; - const char* valid_unused_args[9] = { KWSYS_NULLPTR, + const char* valid_unused_args[9] = { nullptr, "--ignored", "--second-ignored", "third-ignored", |