diff options
author | KWSys Upstream <kwrobot@kitware.com> | 2019-09-18 12:13:53 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-09-18 13:26:35 (GMT) |
commit | 3327c0402a1ce31615c7ad22c5ff5d5330fb75da (patch) | |
tree | fb4faa49f9546d9c9b97b12807994b5c3bcb328d /testCommandLineArguments1.cxx | |
parent | f9a3f13415bb6d6f1750cfe5a45ce4aa9e329907 (diff) | |
download | CMake-3327c0402a1ce31615c7ad22c5ff5d5330fb75da.zip CMake-3327c0402a1ce31615c7ad22c5ff5d5330fb75da.tar.gz CMake-3327c0402a1ce31615c7ad22c5ff5d5330fb75da.tar.bz2 |
KWSys 2019-09-18 (c6bc38c1)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit c6bc38c11a3a11e393f0608486b08dadc8dbacc3 (master).
Upstream Shortlog
-----------------
Sean McBride (5):
4de1241f Fixed -Wextra-semi-stmt warning
30de8e17 Fixed -Wsign-conversion warnings by adding casts
750da75a Fixed 64 to 32 bit truncation warning by casting
419aaa35 Fixed -Wunused-macros warnings
46c55893 Replaced several 0, NULL, and KWSYS_NULLPTR with nullptr
Diffstat (limited to 'testCommandLineArguments1.cxx')
-rw-r--r-- | testCommandLineArguments1.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testCommandLineArguments1.cxx b/testCommandLineArguments1.cxx index 9895008..64561b1 100644 --- a/testCommandLineArguments1.cxx +++ b/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", |