diff options
| author | Matthias Maennich <matthias@maennich.net> | 2017-09-18 21:57:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-19 15:44:21 (GMT) |
| commit | a5279ae553caba7ab875ee06d2ce2d079907145d (patch) | |
| tree | 06b58455c6c0e385fb5986b5aed447b7db173d90 /Source/CPack/cmCPackDragNDropGenerator.cxx | |
| parent | a1cdf537ffb33db3a368dc4c2c3662fa27568400 (diff) | |
| download | CMake-a5279ae553caba7ab875ee06d2ce2d079907145d.zip CMake-a5279ae553caba7ab875ee06d2ce2d079907145d.tar.gz CMake-a5279ae553caba7ab875ee06d2ce2d079907145d.tar.bz2 | |
Use C++11 nullptr (cont.)
Fix remaining occurrences of the issue addressed in commit 5962db4389
(Use C++11 nullptr, 2017-08-22) that are only showing up on macOS.
Signed-off-by: Matthias Maennich <matthias@maennich.net>
Diffstat (limited to 'Source/CPack/cmCPackDragNDropGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackDragNDropGenerator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index 8758d32..88204c8 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -242,9 +242,9 @@ bool cmCPackDragNDropGenerator::RunCommand(std::ostringstream& command, { int exit_code = 1; - bool result = - cmSystemTools::RunSingleCommand(command.str().c_str(), output, output, - &exit_code, 0, this->GeneratorVerbose, 0); + bool result = cmSystemTools::RunSingleCommand(command.str().c_str(), output, + output, &exit_code, nullptr, + this->GeneratorVerbose, 0); if (!result || exit_code) { cmCPackLogger(cmCPackLog::LOG_ERROR, "Error executing: " << command.str() @@ -553,10 +553,10 @@ int cmCPackDragNDropGenerator::CreateDMG(const std::string& src_dir, header_data.push_back(languages.size()); for (size_t i = 0; i < languages.size(); ++i) { CFStringRef language_cfstring = CFStringCreateWithCString( - NULL, languages[i].c_str(), kCFStringEncodingUTF8); + nullptr, languages[i].c_str(), kCFStringEncodingUTF8); CFStringRef iso_language = CFLocaleCreateCanonicalLanguageIdentifierFromString( - NULL, language_cfstring); + nullptr, language_cfstring); if (!iso_language) { cmCPackLogger(cmCPackLog::LOG_ERROR, languages[i] << " is not a recognized language" << std::endl); |