diff options
author | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-22 21:42:36 (GMT) |
---|---|---|
committer | Daniel Pfeifer <daniel@pfeifer-mail.de> | 2017-08-24 21:39:47 (GMT) |
commit | 5962db438939ef2754509b8578af1f845ec07dc8 (patch) | |
tree | f6b0c0db2acc8dc889d2d5d46fdf75659daa17e7 /Source/CPack/cpack.cxx | |
parent | fe19fda2aa2595622c463fccaa8b36a91e4521c4 (diff) | |
download | CMake-5962db438939ef2754509b8578af1f845ec07dc8.zip CMake-5962db438939ef2754509b8578af1f845ec07dc8.tar.gz CMake-5962db438939ef2754509b8578af1f845ec07dc8.tar.bz2 |
Use C++11 nullptr
Diffstat (limited to 'Source/CPack/cpack.cxx')
-rw-r--r-- | Source/CPack/cpack.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index a44bc3d..cfa5c26 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -29,13 +29,13 @@ #include "cmake.h" static const char* cmDocumentationName[][2] = { - { CM_NULLPTR, " cpack - Packaging driver provided by CMake." }, - { CM_NULLPTR, CM_NULLPTR } + { nullptr, " cpack - Packaging driver provided by CMake." }, + { nullptr, nullptr } }; static const char* cmDocumentationUsage[][2] = { - { CM_NULLPTR, " cpack -G <generator> [options]" }, - { CM_NULLPTR, CM_NULLPTR } + { nullptr, " cpack -G <generator> [options]" }, + { nullptr, nullptr } }; static const char* cmDocumentationOptions[][2] = { @@ -49,7 +49,7 @@ static const char* cmDocumentationOptions[][2] = { { "-R <package version>", "override/define CPACK_PACKAGE_VERSION" }, { "-B <package directory>", "override/define CPACK_PACKAGE_DIRECTORY" }, { "--vendor <vendor name>", "override/define CPACK_PACKAGE_VENDOR" }, - { CM_NULLPTR, CM_NULLPTR } + { nullptr, nullptr } }; int cpackUnknownArgument(const char* /*unused*/, void* /*unused*/) @@ -208,7 +208,7 @@ int main(int argc, char const* const* argv) cmCPackGeneratorFactory generators; generators.SetLogger(&log); - cmCPackGenerator* cpackGenerator = CM_NULLPTR; + cmCPackGenerator* cpackGenerator = nullptr; cmDocumentation doc; doc.addCPackStandardDocSections(); |