This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 6a1c76184210f5dc289293bb27d5d322c0a5f67d (commit) via e1418249313f35511a3162242d626785e4f51144 (commit) from a1cca83f3823109ad2728c3664b8895b5b528244 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a1c76184210f5dc289293bb27d5d322c0a5f67d commit 6a1c76184210f5dc289293bb27d5d322c0a5f67d Merge: a1cca83 e141824 Author: Daniel Pfeifer <dan...@pfeifer-mail.de> AuthorDate: Wed Mar 1 17:25:41 2017 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Mar 1 17:25:41 2017 -0500 Merge topic 'modernize-deprecated-headers' into next e1418249 Modernize deprecated headers https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1418249313f35511a3162242d626785e4f51144 commit e1418249313f35511a3162242d626785e4f51144 Author: Daniel Pfeifer <dan...@pfeifer-mail.de> AuthorDate: Wed Mar 1 23:23:09 2017 +0100 Commit: Daniel Pfeifer <dan...@pfeifer-mail.de> CommitDate: Wed Mar 1 23:23:09 2017 +0100 Modernize deprecated headers Replace C standard library headers in C++ code with their C++ alternatives. diff --git a/Source/CPack/IFW/cmCPackIFWInstaller.cxx b/Source/CPack/IFW/cmCPackIFWInstaller.cxx index d8bafee..71814bb 100644 --- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx +++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx @@ -3,8 +3,8 @@ #include "cmCPackIFWInstaller.h" #include <cmConfigure.h> +#include <cstddef> #include <sstream> -#include <stddef.h> #include <utility> #include "CPack/cmCPackGenerator.h" diff --git a/Source/CPack/IFW/cmCPackIFWPackage.cxx b/Source/CPack/IFW/cmCPackIFWPackage.cxx index e23b1b9..7bf34ce 100644 --- a/Source/CPack/IFW/cmCPackIFWPackage.cxx +++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx @@ -13,9 +13,9 @@ #include "cmXMLWriter.h" #include <cmConfigure.h> +#include <cstddef> #include <map> #include <sstream> -#include <stddef.h> //----------------------------------------------------------------- Logger --- #ifdef cmCPackLogger diff --git a/Source/CPack/IFW/cmCPackIFWRepository.cxx b/Source/CPack/IFW/cmCPackIFWRepository.cxx index cc204e8..ed4cb4e 100644 --- a/Source/CPack/IFW/cmCPackIFWRepository.cxx +++ b/Source/CPack/IFW/cmCPackIFWRepository.cxx @@ -10,7 +10,7 @@ #include "cmXMLWriter.h" #include <cmConfigure.h> -#include <stddef.h> +#include <cstddef> #ifdef cmCPackLogger #undef cmCPackLogger diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx index b159e64..689633a 100644 --- a/Source/CPack/OSXScriptLauncher.cxx +++ b/Source/CPack/OSXScriptLauncher.cxx @@ -3,8 +3,8 @@ #include <cmsys/FStream.hxx> #include <cmsys/Process.h> #include <cmsys/SystemTools.hxx> +#include <cstddef> #include <iostream> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 5c50da8..28b5a78 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -9,13 +9,13 @@ #include "cmGeneratedFileStream.h" #include "cmSystemTools.h" +#include <climits> #include <cmsys/Glob.hxx> -#include <limits.h> +#include <cstdio> +#include <cstring> #include <map> #include <ostream> #include <set> -#include <stdio.h> -#include <string.h> #include <sys/stat.h> #include <utility> diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx b/Source/CPack/cmCPackDragNDropGenerator.cxx index ec5fc88..df6ee22 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.cxx +++ b/Source/CPack/cmCPackDragNDropGenerator.cxx @@ -9,9 +9,9 @@ #include <cmsys/FStream.hxx> #include <cmsys/RegularExpression.hxx> +#include <cstdlib> #include <iomanip> #include <map> -#include <stdlib.h> #include <CoreFoundation/CoreFoundation.h> diff --git a/Source/CPack/cmCPackDragNDropGenerator.h b/Source/CPack/cmCPackDragNDropGenerator.h index 876eab7..0e7b9f4 100644 --- a/Source/CPack/cmCPackDragNDropGenerator.h +++ b/Source/CPack/cmCPackDragNDropGenerator.h @@ -4,8 +4,8 @@ #define cmCPackDragNDropGenerator_h #include <cmConfigure.h> +#include <cstddef> #include <sstream> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h index a988ccc..d699f05 100644 --- a/Source/CPack/cmCPackLog.h +++ b/Source/CPack/cmCPackLog.h @@ -5,8 +5,8 @@ #include <cmConfigure.h> // IWYU pragma: keep +#include <cstring> #include <ostream> -#include <string.h> #include <string> #define cmCPack_Log(ctSelf, logType, msg) \ diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx index 1940953..690f6f3 100644 --- a/Source/CPack/cmCPackNSISGenerator.cxx +++ b/Source/CPack/cmCPackNSISGenerator.cxx @@ -11,10 +11,10 @@ #include <algorithm> #include <cmsys/Directory.hxx> #include <cmsys/RegularExpression.hxx> +#include <cstdlib> +#include <cstring> #include <map> #include <sstream> -#include <stdlib.h> -#include <string.h> #include <utility> /* NSIS uses different command line syntax on Windows and others */ diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index 8000d6e..719f7b2 100644 --- a/Source/CPack/cmCPackPackageMakerGenerator.cxx +++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx @@ -2,13 +2,13 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackPackageMakerGenerator.h" -#include <assert.h> +#include <cassert> #include <cmsys/FStream.hxx> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <cstdlib> #include <map> #include <sstream> -#include <stdio.h> -#include <stdlib.h> #include <string> #include "cmCPackComponentGroup.h" diff --git a/Source/CPack/cmCPackProductBuildGenerator.cxx b/Source/CPack/cmCPackProductBuildGenerator.cxx index 1389eaa..93fbc83 100644 --- a/Source/CPack/cmCPackProductBuildGenerator.cxx +++ b/Source/CPack/cmCPackProductBuildGenerator.cxx @@ -2,9 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCPackProductBuildGenerator.h" +#include <cstddef> #include <map> #include <sstream> -#include <stddef.h> #include "cmCPackComponentGroup.h" #include "cmCPackLog.h" diff --git a/Source/CPack/cmCPackRPMGenerator.cxx b/Source/CPack/cmCPackRPMGenerator.cxx index 8ec03c2..c4b5d19 100644 --- a/Source/CPack/cmCPackRPMGenerator.cxx +++ b/Source/CPack/cmCPackRPMGenerator.cxx @@ -3,7 +3,7 @@ #include "cmCPackRPMGenerator.h" #include <algorithm> -#include <ctype.h> +#include <cctype> #include <map> #include <ostream> #include <utility> diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx b/Source/CPack/cmCPackSTGZGenerator.cxx index 682394e..536bf85 100644 --- a/Source/CPack/cmCPackSTGZGenerator.cxx +++ b/Source/CPack/cmCPackSTGZGenerator.cxx @@ -3,8 +3,8 @@ #include "cmCPackSTGZGenerator.h" #include <cmsys/FStream.hxx> +#include <cstdio> #include <sstream> -#include <stdio.h> #include <string> #include <vector> diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index af80cbf..1896592 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -4,10 +4,10 @@ #include <cmsys/CommandLineArguments.hxx> #include <cmsys/Encoding.hxx> +#include <cstddef> #include <iostream> #include <map> #include <sstream> -#include <stddef.h> #include <string> #include <utility> #include <vector> diff --git a/Source/CTest/cmCTestBZR.cxx b/Source/CTest/cmCTestBZR.cxx index 6769ee5..c25a38b 100644 --- a/Source/CTest/cmCTestBZR.cxx +++ b/Source/CTest/cmCTestBZR.cxx @@ -10,10 +10,10 @@ #include <cm_expat.h> #include <cmsys/RegularExpression.hxx> +#include <cstdlib> #include <list> #include <map> #include <ostream> -#include <stdlib.h> #include <vector> extern "C" int cmBZRXMLParserUnknownEncodingHandler(void* /*unused*/, diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx index 6780a0e..cc46fc0 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.cxx +++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx @@ -9,7 +9,7 @@ #include "cmake.h" #include <cmsys/Process.h> -#include <stdlib.h> +#include <cstdlib> cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler() { diff --git a/Source/CTest/cmCTestBuildAndTestHandler.h b/Source/CTest/cmCTestBuildAndTestHandler.h index 5885738..8d7c90d 100644 --- a/Source/CTest/cmCTestBuildAndTestHandler.h +++ b/Source/CTest/cmCTestBuildAndTestHandler.h @@ -7,8 +7,8 @@ #include "cmCTestGenericHandler.h" +#include <cstddef> #include <sstream> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx index 4c82760..3cf888a 100644 --- a/Source/CTest/cmCTestBuildCommand.cxx +++ b/Source/CTest/cmCTestBuildCommand.cxx @@ -10,8 +10,8 @@ #include "cmSystemTools.h" #include "cmake.h" +#include <cstring> #include <sstream> -#include <string.h> class cmExecutionStatus; diff --git a/Source/CTest/cmCTestBuildHandler.cxx b/Source/CTest/cmCTestBuildHandler.cxx index 1868a1ee..146af63 100644 --- a/Source/CTest/cmCTestBuildHandler.cxx +++ b/Source/CTest/cmCTestBuildHandler.cxx @@ -14,9 +14,9 @@ #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> #include <cmsys/Process.h> +#include <cstdlib> +#include <cstring> #include <set> -#include <stdlib.h> -#include <string.h> static const char* cmCTestErrorMatches[] = { "^[Bb]us [Ee]rror", diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index a2f6112..b450611 100644 --- a/Source/CTest/cmCTestBuildHandler.h +++ b/Source/CTest/cmCTestBuildHandler.h @@ -9,9 +9,9 @@ #include <cmProcessOutput.h> #include <cmsys/RegularExpression.hxx> +#include <cstddef> #include <deque> #include <iosfwd> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx index 73e893d..ce25821 100644 --- a/Source/CTest/cmCTestConfigureCommand.cxx +++ b/Source/CTest/cmCTestConfigureCommand.cxx @@ -9,8 +9,8 @@ #include "cmSystemTools.h" #include "cmake.h" +#include <cstring> #include <sstream> -#include <string.h> #include <vector> cmCTestConfigureCommand::cmCTestConfigureCommand() diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 989c096..6c76c56 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -20,11 +20,11 @@ #include <cmsys/Glob.hxx> #include <cmsys/Process.h> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <cstdlib> #include <iomanip> #include <iterator> #include <sstream> -#include <stdio.h> -#include <stdlib.h> #include <utility> class cmMakefile; diff --git a/Source/CTest/cmCTestCurl.cxx b/Source/CTest/cmCTestCurl.cxx index ab1412d..9a3958a 100644 --- a/Source/CTest/cmCTestCurl.cxx +++ b/Source/CTest/cmCTestCurl.cxx @@ -6,8 +6,8 @@ #include "cmSystemTools.h" #include <cmConfigure.h> +#include <cstdio> #include <ostream> -#include <stdio.h> cmCTestCurl::cmCTestCurl(cmCTest* ctest) { diff --git a/Source/CTest/cmCTestGIT.cxx b/Source/CTest/cmCTestGIT.cxx index 9c53aa1..9ff604c 100644 --- a/Source/CTest/cmCTestGIT.cxx +++ b/Source/CTest/cmCTestGIT.cxx @@ -2,12 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTestGIT.h" +#include <cctype> #include <cmsys/FStream.hxx> #include <cmsys/Process.h> -#include <ctype.h> -#include <stdio.h> -#include <stdlib.h> -#include <time.h> +#include <cstdio> +#include <cstdlib> +#include <ctime> #include <vector> #include "cmAlgorithms.h" diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h index 2ebbe70..e4f6783 100644 --- a/Source/CTest/cmCTestGenericHandler.h +++ b/Source/CTest/cmCTestGenericHandler.h @@ -5,8 +5,8 @@ #include <cmConfigure.h> // IWYU pragma: keep +#include <cstddef> #include <map> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx index 2a67d47..0bfbc4e 100644 --- a/Source/CTest/cmCTestHandlerCommand.cxx +++ b/Source/CTest/cmCTestHandlerCommand.cxx @@ -8,8 +8,8 @@ #include "cmSystemTools.h" #include "cmake.h" +#include <cstdlib> #include <sstream> -#include <stdlib.h> class cmExecutionStatus; diff --git a/Source/CTest/cmCTestHandlerCommand.h b/Source/CTest/cmCTestHandlerCommand.h index c86841f..9e283fe 100644 --- a/Source/CTest/cmCTestHandlerCommand.h +++ b/Source/CTest/cmCTestHandlerCommand.h @@ -7,7 +7,7 @@ #include "cmCTestCommand.h" -#include <stddef.h> +#include <cstddef> #include <string> #include <vector> diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx index 03e0319..679c2a8 100644 --- a/Source/CTest/cmCTestLaunch.cxx +++ b/Source/CTest/cmCTestLaunch.cxx @@ -7,9 +7,9 @@ #include <cmsys/FStream.hxx> #include <cmsys/Process.h> #include <cmsys/RegularExpression.hxx> +#include <cstdlib> +#include <cstring> #include <iostream> -#include <stdlib.h> -#include <string.h> #include "cmCryptoHash.h" #include "cmGeneratedFileStream.h" @@ -23,9 +23,9 @@ #include "cmake.h" #ifdef _WIN32 +#include <cstdio> // for std{out,err} and fileno #include <fcntl.h> // for _O_BINARY #include <io.h> // for _setmode -#include <stdio.h> // for std{out,err} and fileno #endif cmCTestLaunch::cmCTestLaunch(int argc, const char* const* argv) diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index 620e237..717cfe8 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -10,9 +10,9 @@ #include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> +#include <cstring> #include <iostream> #include <sstream> -#include <string.h> struct CatToErrorType { diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx b/Source/CTest/cmCTestMultiProcessHandler.cxx index c1724ab..a1f5fe8 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.cxx +++ b/Source/CTest/cmCTestMultiProcessHandler.cxx @@ -9,15 +9,15 @@ #include "cmSystemTools.h" #include <algorithm> +#include <cmath> #include <cmsys/FStream.hxx> #include <cmsys/String.hxx> #include <cmsys/SystemInformation.hxx> +#include <cstdlib> #include <iomanip> #include <list> -#include <math.h> #include <sstream> #include <stack> -#include <stdlib.h> #include <utility> class TestComparator diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h index fe32e15..91431be 100644 --- a/Source/CTest/cmCTestMultiProcessHandler.h +++ b/Source/CTest/cmCTestMultiProcessHandler.h @@ -6,9 +6,9 @@ #include <cmConfigure.h> // IWYU pragma: keep #include <cmCTestTestHandler.h> +#include <cstddef> #include <map> #include <set> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/CTest/cmCTestP4.cxx b/Source/CTest/cmCTestP4.cxx index 4f78876..b88cc00 100644 --- a/Source/CTest/cmCTestP4.cxx +++ b/Source/CTest/cmCTestP4.cxx @@ -9,8 +9,8 @@ #include <algorithm> #include <cmsys/RegularExpression.hxx> +#include <ctime> #include <ostream> -#include <time.h> #include <utility> cmCTestP4::cmCTestP4(cmCTest* ct, std::ostream& log) diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx index ac1644f..8ad80ae 100644 --- a/Source/CTest/cmCTestRunTest.cxx +++ b/Source/CTest/cmCTestRunTest.cxx @@ -14,10 +14,10 @@ #include <cmsys/Base64.h> #include <cmsys/Process.h> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <ctime> #include <iomanip> #include <sstream> -#include <stdio.h> -#include <time.h> #include <utility> cmCTestRunTest::cmCTestRunTest(cmCTestTestHandler* handler) diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h index ee4630a..a08e5d8 100644 --- a/Source/CTest/cmCTestRunTest.h +++ b/Source/CTest/cmCTestRunTest.h @@ -5,8 +5,8 @@ #include <cmConfigure.h> // IWYU pragma: keep +#include <cstddef> #include <set> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx index ce395cd..26980e3 100644 --- a/Source/CTest/cmCTestSVN.cxx +++ b/Source/CTest/cmCTestSVN.cxx @@ -10,10 +10,10 @@ #include "cmXMLWriter.h" #include <cmsys/RegularExpression.hxx> +#include <cstdlib> +#include <cstring> #include <map> #include <ostream> -#include <stdlib.h> -#include <string.h> struct cmCTestSVN::Revision : public cmCTestVC::Revision { diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index b537242..08af4e5 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -4,11 +4,11 @@ #include <cmsys/Directory.hxx> #include <cmsys/Process.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <map> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <utility> #include "cmCTest.h" diff --git a/Source/CTest/cmCTestSleepCommand.cxx b/Source/CTest/cmCTestSleepCommand.cxx index 2752cd3..bc4470c 100644 --- a/Source/CTest/cmCTestSleepCommand.cxx +++ b/Source/CTest/cmCTestSleepCommand.cxx @@ -4,7 +4,7 @@ #include "cmCTestScriptHandler.h" -#include <stdlib.h> +#include <cstdlib> class cmExecutionStatus; diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 01a874b..664cb9d 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -8,8 +8,8 @@ #include "cmMakefile.h" #include "cmSystemTools.h" +#include <cstddef> #include <sstream> -#include <stddef.h> class cmExecutionStatus; diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 5e5119d..d05cdc1 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -6,9 +6,9 @@ #include <cm_jsoncpp_reader.h> #include <cm_jsoncpp_value.h> #include <cmsys/Process.h> +#include <cstdio> +#include <cstdlib> #include <sstream> -#include <stdio.h> -#include <stdlib.h> #include "cmCTest.h" #include "cmCTestCurl.h" diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx index a756188..77b8882 100644 --- a/Source/CTest/cmCTestTestCommand.cxx +++ b/Source/CTest/cmCTestTestCommand.cxx @@ -7,8 +7,8 @@ #include "cmMakefile.h" #include "cmSystemTools.h" +#include <cstdlib> #include <sstream> -#include <stdlib.h> #include <vector> cmCTestTestCommand::cmCTestTestCommand() diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 6175e50..4d3f26e 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -7,15 +7,15 @@ #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> #include <functional> #include <iomanip> #include <iterator> #include <set> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> #include "cmCTest.h" #include "cmCTestBatchTestHandler.h" diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h index 5b07e98..07f698b 100644 --- a/Source/CTest/cmCTestTestHandler.h +++ b/Source/CTest/cmCTestTestHandler.h @@ -8,10 +8,10 @@ #include "cmCTestGenericHandler.h" #include <cmsys/RegularExpression.hxx> +#include <cstddef> #include <iosfwd> #include <map> #include <set> -#include <stddef.h> #include <string> #include <utility> #include <vector> diff --git a/Source/CTest/cmCTestVC.cxx b/Source/CTest/cmCTestVC.cxx index 26c9bb5..a2e3741 100644 --- a/Source/CTest/cmCTestVC.cxx +++ b/Source/CTest/cmCTestVC.cxx @@ -7,9 +7,9 @@ #include "cmXMLWriter.h" #include <cmsys/Process.h> +#include <cstdio> +#include <ctime> #include <sstream> -#include <stdio.h> -#include <time.h> #include <vector> cmCTestVC::cmCTestVC(cmCTest* ct, std::ostream& log) diff --git a/Source/CTest/cmParseBlanketJSCoverage.cxx b/Source/CTest/cmParseBlanketJSCoverage.cxx index 6fa982e..dcb4701 100644 --- a/Source/CTest/cmParseBlanketJSCoverage.cxx +++ b/Source/CTest/cmParseBlanketJSCoverage.cxx @@ -7,8 +7,8 @@ #include "cmSystemTools.h" #include <cmsys/FStream.hxx> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> class cmParseBlanketJSCoverage::JSONParser { diff --git a/Source/CTest/cmParseCacheCoverage.cxx b/Source/CTest/cmParseCacheCoverage.cxx index 23176b5..b5a15e4 100644 --- a/Source/CTest/cmParseCacheCoverage.cxx +++ b/Source/CTest/cmParseCacheCoverage.cxx @@ -6,9 +6,9 @@ #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> +#include <cstdio> +#include <cstdlib> #include <map> -#include <stdio.h> -#include <stdlib.h> #include <utility> cmParseCacheCoverage::cmParseCacheCoverage( diff --git a/Source/CTest/cmParseCoberturaCoverage.cxx b/Source/CTest/cmParseCoberturaCoverage.cxx index db17748..9c2fbab 100644 --- a/Source/CTest/cmParseCoberturaCoverage.cxx +++ b/Source/CTest/cmParseCoberturaCoverage.cxx @@ -7,8 +7,8 @@ #include <cmConfigure.h> #include <cmsys/FStream.hxx> -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> class cmParseCoberturaCoverage::XMLParser : public cmXMLParser { diff --git a/Source/CTest/cmParseDelphiCoverage.cxx b/Source/CTest/cmParseDelphiCoverage.cxx index 7fe91f4..da6c56c 100644 --- a/Source/CTest/cmParseDelphiCoverage.cxx +++ b/Source/CTest/cmParseDelphiCoverage.cxx @@ -6,8 +6,8 @@ #include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> class cmParseDelphiCoverage::HTMLParser { diff --git a/Source/CTest/cmParseGTMCoverage.cxx b/Source/CTest/cmParseGTMCoverage.cxx index 214ce5a..8914cc4 100644 --- a/Source/CTest/cmParseGTMCoverage.cxx +++ b/Source/CTest/cmParseGTMCoverage.cxx @@ -6,9 +6,9 @@ #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> +#include <cstdio> +#include <cstdlib> #include <map> -#include <stdio.h> -#include <stdlib.h> #include <vector> cmParseGTMCoverage::cmParseGTMCoverage(cmCTestCoverageHandlerContainer& cont, diff --git a/Source/CTest/cmParseJacocoCoverage.cxx b/Source/CTest/cmParseJacocoCoverage.cxx index 0e36c01..a335ad5 100644 --- a/Source/CTest/cmParseJacocoCoverage.cxx +++ b/Source/CTest/cmParseJacocoCoverage.cxx @@ -10,8 +10,8 @@ #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> class cmParseJacocoCoverage::XMLParser : public cmXMLParser { diff --git a/Source/CTest/cmParsePHPCoverage.cxx b/Source/CTest/cmParsePHPCoverage.cxx index d8bb31b..c023b27 100644 --- a/Source/CTest/cmParsePHPCoverage.cxx +++ b/Source/CTest/cmParsePHPCoverage.cxx @@ -6,8 +6,8 @@ #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> /* To setup coverage for php. diff --git a/Source/CursesDialog/ccmake.cxx b/Source/CursesDialog/ccmake.cxx index ff8e010..bdbf051 100644 --- a/Source/CursesDialog/ccmake.cxx +++ b/Source/CursesDialog/ccmake.cxx @@ -11,9 +11,9 @@ #include "cmake.h" #include <cmsys/Encoding.hxx> +#include <csignal> +#include <cstring> #include <iostream> -#include <signal.h> -#include <string.h> #include <string> #include <vector> diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx index 5539fbe..9601811 100644 --- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx +++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx @@ -14,7 +14,7 @@ #include "cmSystemTools.h" #include "cmake.h" -#include <assert.h> +#include <cassert> #include <cmConfigure.h> #include <vector> diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx index d299547..b8c4729 100644 --- a/Source/CursesDialog/cmCursesLongMessageForm.cxx +++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx @@ -7,8 +7,8 @@ #include "cmCursesStandardIncludes.h" #include "cmVersion.h" -#include <stdio.h> -#include <string.h> +#include <cstdio> +#include <cstring> inline int ctrl(int z) { diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx index 939c736..261c609 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/Source/CursesDialog/cmCursesMainForm.cxx @@ -17,8 +17,8 @@ #include "cmVersion.h" #include "cmake.h" -#include <stdio.h> -#include <string.h> +#include <cstdio> +#include <cstring> inline int ctrl(int z) { diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h index d891ea0..dc859fa 100644 --- a/Source/CursesDialog/cmCursesMainForm.h +++ b/Source/CursesDialog/cmCursesMainForm.h @@ -9,7 +9,7 @@ #include "cmCursesStandardIncludes.h" #include "cmStateTypes.h" -#include <stddef.h> +#include <cstddef> #include <string> #include <vector> diff --git a/Source/CursesDialog/cmCursesStringWidget.cxx b/Source/CursesDialog/cmCursesStringWidget.cxx index ff189f0..775c148 100644 --- a/Source/CursesDialog/cmCursesStringWidget.cxx +++ b/Source/CursesDialog/cmCursesStringWidget.cxx @@ -8,8 +8,8 @@ #include "cmCursesWidget.h" #include "cmStateTypes.h" -#include <stdio.h> -#include <string.h> +#include <cstdio> +#include <cstring> inline int ctrl(int z) { diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 5e03c39..f168162 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -184,8 +184,8 @@ int main(int argc, char** argv) } #if defined(Q_OS_MAC) -#include <errno.h> -#include <string.h> +#include <cerrno> +#include <cstring> #include <sys/stat.h> #include <unistd.h> static bool cmOSXInstall(std::string const& dir, std::string const& tool) diff --git a/Source/bindexplib.h b/Source/bindexplib.h index d6900ba..be229c4 100644 --- a/Source/bindexplib.h +++ b/Source/bindexplib.h @@ -5,8 +5,8 @@ #include <cmConfigure.h> +#include <cstdio> #include <set> -#include <stdio.h> #include <string> class bindexplib diff --git a/Source/cmAddSubDirectoryCommand.cxx b/Source/cmAddSubDirectoryCommand.cxx index 34ec0e3..32daf68 100644 --- a/Source/cmAddSubDirectoryCommand.cxx +++ b/Source/cmAddSubDirectoryCommand.cxx @@ -2,8 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmAddSubDirectoryCommand.h" +#include <cstring> #include <sstream> -#include <string.h> #include "cmMakefile.h" #include "cmSystemTools.h" diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h index f5469e5..4b72c7a 100644 --- a/Source/cmAlgorithms.h +++ b/Source/cmAlgorithms.h @@ -7,10 +7,10 @@ #include <algorithm> #include <cm_kwiml.h> +#include <cstring> #include <functional> #include <iterator> #include <sstream> -#include <string.h> #include <string> #include <utility> #include <vector> diff --git a/Source/cmArchiveWrite.cxx b/Source/cmArchiveWrite.cxx index 879c2ca..63da7ff 100644 --- a/Source/cmArchiveWrite.cxx +++ b/Source/cmArchiveWrite.cxx @@ -9,9 +9,9 @@ #include <cmsys/Directory.hxx> #include <cmsys/Encoding.hxx> #include <cmsys/FStream.hxx> +#include <cstring> +#include <ctime> #include <iostream> -#include <string.h> -#include <time.h> #ifndef __LA_SSIZE_T #define __LA_SSIZE_T la_ssize_t diff --git a/Source/cmArchiveWrite.h b/Source/cmArchiveWrite.h index 27c62b9..2e57a10 100644 --- a/Source/cmArchiveWrite.h +++ b/Source/cmArchiveWrite.h @@ -5,8 +5,8 @@ #include <cmConfigure.h> // IWYU pragma: keep +#include <cstddef> #include <iosfwd> -#include <stddef.h> #include <string> #if !defined(CMAKE_BUILD_WITH_CMAKE) diff --git a/Source/cmAuxSourceDirectoryCommand.cxx b/Source/cmAuxSourceDirectoryCommand.cxx index 7cfa4d8..8d5b142 100644 --- a/Source/cmAuxSourceDirectoryCommand.cxx +++ b/Source/cmAuxSourceDirectoryCommand.cxx @@ -4,7 +4,7 @@ #include <algorithm> #include <cmsys/Directory.hxx> -#include <stddef.h> +#include <cstddef> #include "cmAlgorithms.h" #include "cmMakefile.h" diff --git a/Source/cmBase32.h b/Source/cmBase32.h index 44bca2f..51bd5b8 100644 --- a/Source/cmBase32.h +++ b/Source/cmBase32.h @@ -5,7 +5,7 @@ #include <cmConfigure.h> // IWYU pragma: keep -#include <stddef.h> +#include <cstddef> #include <string> /** \class cmBase32Encoder diff --git a/Source/cmCMakeHostSystemInformationCommand.h b/Source/cmCMakeHostSystemInformationCommand.h index 22f3d54..414c8ef 100644 --- a/Source/cmCMakeHostSystemInformationCommand.h +++ b/Source/cmCMakeHostSystemInformationCommand.h @@ -4,7 +4,7 @@ #define cmCMakeHostSystemInformationCommand_h #include <cmConfigure.h> -#include <stddef.h> +#include <cstddef> #include <string> #include <vector> diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx index 942688c..60c34af 100644 --- a/Source/cmCMakeMinimumRequired.cxx +++ b/Source/cmCMakeMinimumRequired.cxx @@ -2,8 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCMakeMinimumRequired.h" +#include <cstdio> #include <sstream> -#include <stdio.h> #include "cmMakefile.h" #include "cmSystemTools.h" diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx index e78f5fe..45805b2 100644 --- a/Source/cmCPluginAPI.cxx +++ b/Source/cmCPluginAPI.cxx @@ -14,7 +14,7 @@ #include "cmState.h" #include "cmVersion.h" -#include <stdlib.h> +#include <cstdlib> #ifdef __QNX__ #include <malloc.h> /* for malloc/free on QNX */ diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 559275e..0cfd79b 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2,6 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTest.h" +#include <cctype> #include <cm_curl.h> #include <cm_zlib.h> #include <cmsys/Base64.h> @@ -11,15 +12,14 @@ #include <cmsys/Process.h> #include <cmsys/String.hxx> #include <cmsys/SystemInformation.hxx> -#include <ctype.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> #include <iostream> #include <map> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <string> -#include <time.h> #include <utility> #include <vector> diff --git a/Source/cmCTest.h b/Source/cmCTest.h index ebdc8b0..4cc1e4f 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -7,11 +7,11 @@ #include <cmProcessOutput.h> #include <cmsys/String.hxx> +#include <ctime> #include <map> #include <set> #include <sstream> #include <string> -#include <time.h> #include <vector> class cmCTestGenericHandler; diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index cb0ba63..e80d77d 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -5,9 +5,9 @@ #include <algorithm> #include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> +#include <cstdio> +#include <cstring> #include <sstream> -#include <stdio.h> -#include <string.h> #include "cmGeneratedFileStream.h" #include "cmState.h" diff --git a/Source/cmCommandArgumentParser.y b/Source/cmCommandArgumentParser.y index d71b605..ccf0475 100644 --- a/Source/cmCommandArgumentParser.y +++ b/Source/cmCommandArgumentParser.y @@ -189,4 +189,3 @@ void cmCommandArgument_yyerror(yyscan_t yyscanner, const char* message) { yyGetParser->Error(message); } - diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx index 2d66344..978d4a4 100644 --- a/Source/cmCommandArgumentParserHelper.cxx +++ b/Source/cmCommandArgumentParserHelper.cxx @@ -11,9 +11,9 @@ #include "cmake.h" #include <cmConfigure.h> +#include <cstring> #include <iostream> #include <sstream> -#include <string.h> int cmCommandArgument_yyparse(yyscan_t yyscanner); // diff --git a/Source/cmComputeComponentGraph.cxx b/Source/cmComputeComponentGraph.cxx index a02d885..6f3abfa 100644 --- a/Source/cmComputeComponentGraph.cxx +++ b/Source/cmComputeComponentGraph.cxx @@ -4,7 +4,7 @@ #include <algorithm> -#include <assert.h> +#include <cassert> cmComputeComponentGraph::cmComputeComponentGraph(Graph const& input) : InputGraph(input) diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index 3e2cf18..4ecff20 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -14,11 +14,11 @@ #include "cmake.h" #include <algorithm> -#include <assert.h> +#include <cassert> +#include <cstdio> +#include <cstring> #include <iterator> #include <sstream> -#include <stdio.h> -#include <string.h> #include <utility> /* diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 80e7e7d..31badd9 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -18,9 +18,9 @@ #include "cmake.h" #include <algorithm> -#include <ctype.h> +#include <cctype> +#include <cstring> #include <sstream> -#include <string.h> #include <utility> //#define CM_COMPUTE_LINK_INFO_DEBUG diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx index cfebda2..cae505b 100644 --- a/Source/cmComputeTargetDepends.cxx +++ b/Source/cmComputeTargetDepends.cxx @@ -17,9 +17,9 @@ #include "cmTargetDepend.h" #include "cmake.h" -#include <assert.h> +#include <cassert> +#include <cstdio> #include <sstream> -#include <stdio.h> #include <utility> class cmListFileBacktrace; diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index f2eb601..42362d4 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -5,10 +5,10 @@ #include <algorithm> #include <cmConfigure.h> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "cmAlgorithms.h" #include "cmMakefile.h" diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index fd9d04b..a4bc768 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -4,10 +4,10 @@ #include <cmConfigure.h> #include <cmsys/Directory.hxx> +#include <cstdio> +#include <cstring> #include <set> #include <sstream> -#include <stdio.h> -#include <string.h> #include <utility> #include "cmAlgorithms.h" diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx index d5807b1..771c377 100644 --- a/Source/cmCryptoHash.cxx +++ b/Source/cmCryptoHash.cxx @@ -5,7 +5,7 @@ #include <cm_kwiml.h> #include <cm_rhash.h> #include <cmsys/FStream.hxx> -#include <string.h> +#include <cstring> static unsigned int const cmCryptoHashAlgoToId[] = { /* clang-format needs this comment to break after the opening brace */ diff --git a/Source/cmCryptoHash.h b/Source/cmCryptoHash.h index 0b562da..2372a45 100644 --- a/Source/cmCryptoHash.h +++ b/Source/cmCryptoHash.h @@ -5,7 +5,7 @@ #include <cmConfigure.h> // IWYU pragma: keep -#include <stddef.h> +#include <cstddef> #include <string> #include <vector> diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx index 47fe76a..c20d277 100644 --- a/Source/cmDefinitions.cxx +++ b/Source/cmDefinitions.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmDefinitions.h" -#include <assert.h> +#include <cassert> #include <cmConfigure.h> #include <set> #include <utility> diff --git a/Source/cmDepends.cxx b/Source/cmDepends.cxx index c189419..201a1bf 100644 --- a/Source/cmDepends.cxx +++ b/Source/cmDepends.cxx @@ -9,8 +9,8 @@ #include "cmSystemTools.h" #include <cmsys/FStream.hxx> +#include <cstring> #include <sstream> -#include <string.h> #include <utility> cmDepends::cmDepends(cmLocalGenerator* lg, const char* targetDir) diff --git a/Source/cmDepends.h b/Source/cmDepends.h index f677f80..205667b 100644 --- a/Source/cmDepends.h +++ b/Source/cmDepends.h @@ -5,10 +5,10 @@ #include <cmConfigure.h> +#include <cstddef> #include <iosfwd> #include <map> #include <set> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index 7927402..891a885 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -2,12 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmDependsFortran.h" -#include <assert.h> +#include <cassert> #include <cmsys/FStream.hxx> +#include <cstdlib> +#include <cstring> #include <iostream> #include <map> -#include <stdlib.h> -#include <string.h> #include <utility> #include "cmFortranParser.h" /* Interface to parser object. */ diff --git a/Source/cmDependsJavaParserHelper.cxx b/Source/cmDependsJavaParserHelper.cxx index f5998ef..bc20d63 100644 --- a/Source/cmDependsJavaParserHelper.cxx +++ b/Source/cmDependsJavaParserHelper.cxx @@ -8,10 +8,10 @@ #include "cmSystemTools.h" #include <cmsys/FStream.hxx> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <iostream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> int cmDependsJava_yyparse(yyscan_t yyscanner); diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx index cb24adf..8d7f2f0 100644 --- a/Source/cmDocumentation.cxx +++ b/Source/cmDocumentation.cxx @@ -10,10 +10,10 @@ #include "cmVersion.h" #include <algorithm> +#include <cctype> #include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> -#include <ctype.h> -#include <string.h> +#include <cstring> #include <utility> static const char* cmDocumentationStandardOptions[][2] = { diff --git a/Source/cmDocumentationFormatter.cxx b/Source/cmDocumentationFormatter.cxx index 0018263..58a1743 100644 --- a/Source/cmDocumentationFormatter.cxx +++ b/Source/cmDocumentationFormatter.cxx @@ -5,8 +5,8 @@ #include "cmDocumentationEntry.h" #include "cmDocumentationSection.h" +#include <cstring> #include <ostream> -#include <string.h> #include <string> #include <vector> diff --git a/Source/cmELF.cxx b/Source/cmELF.cxx index 0655da9..7e88bb2 100644 --- a/Source/cmELF.cxx +++ b/Source/cmELF.cxx @@ -5,16 +5,16 @@ #include <cm_auto_ptr.hxx> #include <cm_kwiml.h> #include <cmsys/FStream.hxx> +#include <cstddef> #include <map> #include <sstream> -#include <stddef.h> #include <utility> #include <vector> // Include the ELF format information system header. #if defined(__OpenBSD__) +#include <cstdint> #include <elf_abi.h> -#include <stdint.h> #elif defined(__HAIKU__) #include <elf32.h> #include <elf64.h> diff --git a/Source/cmExecProgramCommand.cxx b/Source/cmExecProgramCommand.cxx index 6a7292d..5ce39ae 100644 --- a/Source/cmExecProgramCommand.cxx +++ b/Source/cmExecProgramCommand.cxx @@ -3,7 +3,7 @@ #include "cmExecProgramCommand.h" #include <cmsys/Process.h> -#include <stdio.h> +#include <cstdio> #include "cmMakefile.h" #include "cmProcessOutput.h" diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx index 92cdf64..1292dbe 100644 --- a/Source/cmExecuteProcessCommand.cxx +++ b/Source/cmExecuteProcessCommand.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExecuteProcessCommand.h" +#include <cctype> /* isspace */ #include <cmsys/Process.h> -#include <ctype.h> /* isspace */ +#include <cstdio> #include <sstream> -#include <stdio.h> #include "cmMakefile.h" #include "cmProcessOutput.h" diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 6c21eaf..86b0e23 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -17,11 +17,11 @@ #include "cmTargetExport.h" #include "cmake.h" -#include <assert.h> +#include <cassert> #include <cm_auto_ptr.hxx> #include <cmsys/FStream.hxx> +#include <cstring> #include <sstream> -#include <string.h> #include <utility> static std::string cmExportFileGeneratorEscape(std::string const& str) diff --git a/Source/cmExportInstallAndroidMKGenerator.cxx b/Source/cmExportInstallAndroidMKGenerator.cxx index 9a1c647..e61717e 100644 --- a/Source/cmExportInstallAndroidMKGenerator.cxx +++ b/Source/cmExportInstallAndroidMKGenerator.cxx @@ -2,8 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExportInstallAndroidMKGenerator.h" +#include <cstddef> #include <ostream> -#include <stddef.h> #include "cmExportBuildAndroidMKGenerator.h" #include "cmExportSet.h" diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 2dffcaa..44ba83a 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -2,9 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmExtraCodeBlocksGenerator.h" +#include <cstring> #include <map> #include <ostream> -#include <string.h> #include <utility> #include "cmAlgorithms.h" diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index fd7da18..9a78554 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -14,10 +14,10 @@ #include "cmake.h" #include <cmsys/SystemInformation.hxx> +#include <cstring> #include <map> #include <set> #include <sstream> -#include <string.h> #include <utility> cmExtraCodeLiteGenerator::cmExtraCodeLiteGenerator() diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index b4fc771..1007329 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -3,11 +3,11 @@ #include "cmExtraEclipseCDT4Generator.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmsys/RegularExpression.hxx> +#include <cstdio> #include <map> #include <sstream> -#include <stdio.h> #include <utility> #include "cmGeneratedFileStream.h" diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index 3730433..ed90851 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/Source/cmExtraKateGenerator.cxx @@ -11,9 +11,9 @@ #include "cmStateTypes.h" #include "cmSystemTools.h" +#include <cstring> #include <ostream> #include <set> -#include <string.h> #include <vector> cmExtraKateGenerator::cmExtraKateGenerator() diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index 36ba520..76d5891 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -3,9 +3,9 @@ #include "cmExtraSublimeTextGenerator.h" #include <cmsys/RegularExpression.hxx> +#include <cstring> #include <set> #include <sstream> -#include <string.h> #include <utility> #include "cmGeneratedFileStream.h" diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx index ff78f52..c82127b 100644 --- a/Source/cmFLTKWrapUICommand.cxx +++ b/Source/cmFLTKWrapUICommand.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFLTKWrapUICommand.h" -#include <stddef.h> +#include <cstddef> #include "cmCustomCommandLines.h" #include "cmMakefile.h" diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 91cecb3..5503b08 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -3,18 +3,18 @@ #include "cmFileCommand.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cm_kwiml.h> #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> #include <cmsys/String.hxx> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <list> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/types.h> // include sys/stat.h after sys/types.h diff --git a/Source/cmFileLock.cxx b/Source/cmFileLock.cxx index 786d6c6..a03f09e 100644 --- a/Source/cmFileLock.cxx +++ b/Source/cmFileLock.cxx @@ -3,7 +3,7 @@ #include "cmFileLock.h" #include "cmFileLockResult.h" -#include <assert.h> +#include <cassert> // Common implementation diff --git a/Source/cmFileLockPool.cxx b/Source/cmFileLockPool.cxx index 7b1564c..24f8467 100644 --- a/Source/cmFileLockPool.cxx +++ b/Source/cmFileLockPool.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileLockPool.h" -#include <assert.h> +#include <cassert> #include "cmAlgorithms.h" #include "cmFileLock.h" diff --git a/Source/cmFileLockResult.cxx b/Source/cmFileLockResult.cxx index a040705..0ae3a37 100644 --- a/Source/cmFileLockResult.cxx +++ b/Source/cmFileLockResult.cxx @@ -2,8 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileLockResult.h" -#include <errno.h> -#include <string.h> +#include <cerrno> +#include <cstring> cmFileLockResult cmFileLockResult::MakeOk() { diff --git a/Source/cmFileLockUnix.cxx b/Source/cmFileLockUnix.cxx index 7353b01..9f928d6 100644 --- a/Source/cmFileLockUnix.cxx +++ b/Source/cmFileLockUnix.cxx @@ -3,9 +3,9 @@ #include "cmFileLock.h" #include "cmSystemTools.h" -#include <errno.h> // errno +#include <cerrno> // errno +#include <cstdio> // SEEK_SET #include <fcntl.h> -#include <stdio.h> // SEEK_SET #include <unistd.h> cmFileLock::cmFileLock() diff --git a/Source/cmFilePathChecksum.h b/Source/cmFilePathChecksum.h index 59ca34c..3f2f50a 100644 --- a/Source/cmFilePathChecksum.h +++ b/Source/cmFilePathChecksum.h @@ -5,7 +5,7 @@ #include <cmConfigure.h> // IWYU pragma: keep -#include <stddef.h> +#include <cstddef> #include <string> #include <utility> diff --git a/Source/cmFileTimeComparison.cxx b/Source/cmFileTimeComparison.cxx index 991ebb8..6f0393a 100644 --- a/Source/cmFileTimeComparison.cxx +++ b/Source/cmFileTimeComparison.cxx @@ -2,8 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmFileTimeComparison.h" +#include <ctime> #include <string> -#include <time.h> #include <utility> #include "cm_unordered_map.hxx" diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index dce5021..cabecdf 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -3,9 +3,9 @@ #include "cmFindBase.h" #include <cmConfigure.h> +#include <cstddef> #include <iostream> #include <map> -#include <stddef.h> #include "cmAlgorithms.h" #include "cmMakefile.h" diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx index 110195c..ee6add0 100644 --- a/Source/cmFindCommon.cxx +++ b/Source/cmFindCommon.cxx @@ -3,7 +3,7 @@ #include "cmFindCommon.h" #include <algorithm> -#include <string.h> +#include <cstring> #include <utility> #include "cmMakefile.h" diff --git a/Source/cmFindLibraryCommand.cxx b/Source/cmFindLibraryCommand.cxx index c86f9c1..4272407 100644 --- a/Source/cmFindLibraryCommand.cxx +++ b/Source/cmFindLibraryCommand.cxx @@ -4,9 +4,9 @@ #include <algorithm> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <cstring> #include <set> -#include <stdio.h> -#include <string.h> #include "cmGlobalGenerator.h" #include "cmMakefile.h" diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 60de74f..1ac2b11 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -3,18 +3,18 @@ #include "cmFindPackageCommand.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmSystemTools.h> #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> #include <cmsys/String.h> +#include <cstdio> +#include <cstring> #include <functional> #include <iterator> #include <sstream> -#include <stdio.h> -#include <string.h> #include <utility> #include "cmAlgorithms.h" diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx index 6273f6e..7690852 100644 --- a/Source/cmForEachCommand.cxx +++ b/Source/cmForEachCommand.cxx @@ -2,9 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmForEachCommand.h" +#include <cstdio> +#include <cstdlib> #include <sstream> -#include <stdio.h> -#include <stdlib.h> #include "cmExecutionStatus.h" #include "cmMakefile.h" diff --git a/Source/cmFortranParserImpl.cxx b/Source/cmFortranParserImpl.cxx index 1a5e6c5..1c93fd5 100644 --- a/Source/cmFortranParserImpl.cxx +++ b/Source/cmFortranParserImpl.cxx @@ -4,11 +4,11 @@ #include "cmFortranLexer.h" #include "cmSystemTools.h" -#include <assert.h> +#include <cassert> #include <cmConfigure.h> +#include <cstdio> #include <set> #include <stack> -#include <stdio.h> #include <string> #include <vector> diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx index 4731493..4cf1023 100644 --- a/Source/cmGeneratedFileStream.cxx +++ b/Source/cmGeneratedFileStream.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGeneratedFileStream.h" -#include <stdio.h> +#include <cstdio> #include "cmSystemTools.h" diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index e70bbfe..88ec85e 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -5,7 +5,6 @@ #include <cmsys/RegularExpression.hxx> #include <utility> -#include "assert.h" #include "cmAlgorithms.h" #include "cmGeneratorExpressionContext.h" #include "cmGeneratorExpressionEvaluator.h" @@ -13,6 +12,7 @@ #include "cmGeneratorExpressionParser.h" #include "cmSystemTools.h" #include "cm_auto_ptr.hxx" +#include <cassert> cmGeneratorExpression::cmGeneratorExpression( const cmListFileBacktrace& backtrace) diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index c026631..2a834b7 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -9,8 +9,8 @@ #include "cmLocalGenerator.h" #include "cmake.h" +#include <cstring> #include <sstream> -#include <string.h> #include <utility> cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( diff --git a/Source/cmGeneratorExpressionEvaluator.h b/Source/cmGeneratorExpressionEvaluator.h index 41bea9b..5174290 100644 --- a/Source/cmGeneratorExpressionEvaluator.h +++ b/Source/cmGeneratorExpressionEvaluator.h @@ -5,7 +5,7 @@ #include <cmConfigure.h> -#include <stddef.h> +#include <cstddef> #include <string> #include <vector> diff --git a/Source/cmGeneratorExpressionLexer.h b/Source/cmGeneratorExpressionLexer.h index cac255d..de6ae13 100644 --- a/Source/cmGeneratorExpressionLexer.h +++ b/Source/cmGeneratorExpressionLexer.h @@ -5,7 +5,7 @@ #include <cmConfigure.h> // IWYU pragma: keep -#include <stddef.h> +#include <cstddef> #include <string> #include <vector> diff --git a/Source/cmGeneratorExpressionNode.cxx b/Source/cmGeneratorExpressionNode.cxx index 66202df..2f8bed1 100644 --- a/Source/cmGeneratorExpressionNode.cxx +++ b/Source/cmGeneratorExpressionNode.cxx @@ -22,16 +22,16 @@ #include "cmake.h" #include <algorithm> -#include <assert.h> +#include <cassert> +#include <cerrno> #include <cmConfigure.h> #include <cmsys/RegularExpression.hxx> #include <cmsys/String.h> -#include <errno.h> +#include <cstdlib> +#include <cstring> #include <map> #include <set> #include <sstream> -#include <stdlib.h> -#include <string.h> #include <utility> std::string cmGeneratorExpressionNode::EvaluateDependentExpression( diff --git a/Source/cmGeneratorExpressionParser.cxx b/Source/cmGeneratorExpressionParser.cxx index c33349a..e07e8c8 100644 --- a/Source/cmGeneratorExpressionParser.cxx +++ b/Source/cmGeneratorExpressionParser.cxx @@ -4,8 +4,8 @@ #include "cmGeneratorExpressionEvaluator.h" -#include <assert.h> -#include <stddef.h> +#include <cassert> +#include <cstddef> cmGeneratorExpressionParser::cmGeneratorExpressionParser( const std::vector<cmGeneratorExpressionToken>& tokens) diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 47d685d..e39c497 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -3,15 +3,15 @@ #include "cmGeneratorTarget.h" #include <algorithm> -#include <assert.h> +#include <cassert> +#include <cerrno> #include <cmsys/RegularExpression.hxx> -#include <errno.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <iterator> #include <queue> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" @@ -46,8 +46,9 @@ const char* cmTargetPropertyComputer::GetSources<cmGeneratorTarget>( } template <> -const char* cmTargetPropertyComputer::ComputeLocationForBuild< - cmGeneratorTarget>(cmGeneratorTarget const* tgt) +const char* +cmTargetPropertyComputer::ComputeLocationForBuild<cmGeneratorTarget>( + cmGeneratorTarget const* tgt) { return tgt->GetLocation(""); } diff --git a/Source/cmGhsMultiTargetGenerator.cxx b/Source/cmGhsMultiTargetGenerator.cxx index ba623d5..6138bf9 100644 --- a/Source/cmGhsMultiTargetGenerator.cxx +++ b/Source/cmGhsMultiTargetGenerator.cxx @@ -10,7 +10,7 @@ #include "cmMakefile.h" #include "cmSourceFile.h" #include "cmTarget.h" -#include <assert.h> +#include <cassert> std::string const cmGhsMultiTargetGenerator::DDOption("-dynamic"); diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index b6b7d9e..4d40466 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -10,14 +10,14 @@ #include "cmGlobalGenerator.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <iterator> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "cmAlgorithms.h" #include "cmCPackPropertiesGenerator.h" diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx index 75209c3..c66b14d 100644 --- a/Source/cmGlobalKdevelopGenerator.cxx +++ b/Source/cmGlobalKdevelopGenerator.cxx @@ -16,9 +16,9 @@ #include <cmsys/Directory.hxx> #include <cmsys/FStream.hxx> +#include <cstring> #include <map> #include <set> -#include <string.h> #include <utility> cmGlobalKdevelopGenerator::cmGlobalKdevelopGenerator() diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 1bdef53..5de5105 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -3,15 +3,15 @@ #include "cmGlobalNinjaGenerator.h" #include <algorithm> +#include <cctype> #include <cm_jsoncpp_reader.h> #include <cm_jsoncpp_value.h> #include <cm_jsoncpp_writer.h> #include <cmsys/FStream.hxx> -#include <ctype.h> +#include <cstdio> #include <functional> #include <iterator> #include <sstream> -#include <stdio.h> #include "cmAlgorithms.h" #include "cmDocumentationEntry.h" diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h index 67d7bc9..900fdfb 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.h +++ b/Source/cmGlobalUnixMakefileGenerator3.h @@ -5,10 +5,10 @@ #include <cmConfigure.h> +#include <cstddef> #include <iosfwd> #include <map> #include <set> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 65a0bde..e16384c 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -13,7 +13,7 @@ #include "cmake.h" #include <cmsys/Encoding.hxx> -#include <assert.h> +#include <cassert> static cmVS7FlagTable cmVS7ExtraFlagTable[] = { // Precompiled header and related options. Note that the diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index d1b6130..c298cb4 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2,12 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmGlobalXCodeGenerator.h" -#include <assert.h> +#include <cassert> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <cstring> #include <iomanip> #include <sstream> -#include <stdio.h> -#include <string.h> #include "cmComputeLinkInformation.h" #include "cmCustomCommandGenerator.h" diff --git a/Source/cmHexFileConverter.cxx b/Source/cmHexFileConverter.cxx index d9d6598..443d465 100644 --- a/Source/cmHexFileConverter.cxx +++ b/Source/cmHexFileConverter.cxx @@ -3,8 +3,8 @@ #include "cmHexFileConverter.h" #include <cmConfigure.h> -#include <stdio.h> -#include <string.h> +#include <cstdio> +#include <cstring> #include "cmSystemTools.h" diff --git a/Source/cmIDEOptions.cxx b/Source/cmIDEOptions.cxx index 1c0a99e..3a19ae2 100644 --- a/Source/cmIDEOptions.cxx +++ b/Source/cmIDEOptions.cxx @@ -3,8 +3,8 @@ #include "cmIDEOptions.h" #include <cmsys/String.h> +#include <cstring> #include <iterator> -#include <string.h> #include "cmIDEFlagTable.h" #include "cmSystemTools.h" diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 4c331c7..1ef7aac 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -3,8 +3,8 @@ #include "cmInstallCommand.h" #include <cmsys/Glob.hxx> +#include <cstddef> #include <sstream> -#include <stddef.h> #include "cmAlgorithms.h" #include "cmCommandArgumentsHelper.h" diff --git a/Source/cmInstallExportAndroidMKGenerator.cxx b/Source/cmInstallExportAndroidMKGenerator.cxx index 8eeaa9c..ceb54bd 100644 --- a/Source/cmInstallExportAndroidMKGenerator.cxx +++ b/Source/cmInstallExportAndroidMKGenerator.cxx @@ -3,7 +3,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmInstallExportAndroidMKGenerator.h" -#include <stdio.h> +#include <cstdio> #include "cmExportInstallFileGenerator.h" #include "cmExportSet.h" diff --git a/Source/cmInstallExportGenerator.h b/Source/cmInstallExportGenerator.h index b0fe889..2270e85 100644 --- a/Source/cmInstallExportGenerator.h +++ b/Source/cmInstallExportGenerator.h @@ -8,8 +8,8 @@ #include "cmInstallGenerator.h" #include "cmScriptGenerator.h" +#include <cstddef> #include <iosfwd> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 88fcc56..4d34c7d 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmInstallTargetGenerator.h" -#include <assert.h> +#include <cassert> #include <map> #include <set> #include <sstream> diff --git a/Source/cmLinkedTree.h b/Source/cmLinkedTree.h index 4f95522..e5b7b97 100644 --- a/Source/cmLinkedTree.h +++ b/Source/cmLinkedTree.h @@ -5,7 +5,7 @@ #include <cmConfigure.h> -#include <assert.h> +#include <cassert> #include <iterator> #include <vector> diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index 295ea28..22e4fe4 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -3,12 +3,12 @@ #include "cmListCommand.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <cstdlib> // required for atoi #include <iterator> #include <sstream> -#include <stdio.h> -#include <stdlib.h> // required for atoi #include "cmAlgorithms.h" #include "cmMakefile.h" diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index 23b666e..bc25d8c 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -10,7 +10,7 @@ #include "cmake.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmConfigure.h> #include <sstream> diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx index 5cf1853..2163f06 100644 --- a/Source/cmLoadCommandCommand.cxx +++ b/Source/cmLoadCommandCommand.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmLoadCommandCommand.h" -#include <signal.h> +#include <csignal> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "cmCPluginAPI.cxx" #include "cmCPluginAPI.h" diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 07d712c..d077a07 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -31,12 +31,12 @@ #endif #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <cstring> #include <iterator> #include <sstream> -#include <stdio.h> -#include <string.h> #include <utility> #if defined(__HAIKU__) diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index c2d9d57..756f63a 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -3,10 +3,10 @@ #include "cmLocalNinjaGenerator.h" #include <algorithm> -#include <assert.h> +#include <cassert> +#include <cstdio> #include <iterator> #include <sstream> -#include <stdio.h> #include <utility> #include "cmCustomCommand.h" diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 4388e75..7b614a8 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -5,9 +5,9 @@ #include <algorithm> #include <cmsys/FStream.hxx> #include <cmsys/Terminal.h> +#include <cstdio> #include <functional> #include <sstream> -#include <stdio.h> #include <utility> #include "cmAlgorithms.h" diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index 6e976e1..3a8e404 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -15,7 +15,7 @@ #include "cmComputeLinkInformation.h" #include "cmGeneratedFileStream.h" -#include <ctype.h> // for isspace +#include <cctype> // for isspace static bool cmLVS7G_IsFAT(const char* dir); diff --git a/Source/cmLocale.h b/Source/cmLocale.h index cca7cf5..ec05a46 100644 --- a/Source/cmLocale.h +++ b/Source/cmLocale.h @@ -5,7 +5,7 @@ #include <cmConfigure.h> -#include <locale.h> +#include <clocale> #include <string> class cmLocaleRAII diff --git a/Source/cmMachO.cxx b/Source/cmMachO.cxx index 586e6c6..fc2b3f9 100644 --- a/Source/cmMachO.cxx +++ b/Source/cmMachO.cxx @@ -4,7 +4,7 @@ #include <algorithm> #include <cmsys/FStream.hxx> -#include <stddef.h> +#include <cstddef> #include <string> #include <vector> diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx index 583f801..50ef47a 100644 --- a/Source/cmMacroCommand.cxx +++ b/Source/cmMacroCommand.cxx @@ -2,8 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmMacroCommand.h" +#include <cstdio> #include <sstream> -#include <stdio.h> #include "cmAlgorithms.h" #include "cmExecutionStatus.h" diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c75d101..2d9fabb 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3,13 +3,13 @@ #include "cmMakefile.h" #include <algorithm> -#include <assert.h> +#include <cassert> +#include <cctype> #include <cmsys/FStream.hxx> #include <cmsys/RegularExpression.hxx> -#include <ctype.h> +#include <cstdlib> +#include <cstring> #include <sstream> -#include <stdlib.h> -#include <string.h> #include <utility> #include "cmAlgorithms.h" diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 54b3f36..05e77d7 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -2,8 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmMakefileTargetGenerator.h" +#include <cstdio> #include <sstream> -#include <stdio.h> #include <utility> #include "cmAlgorithms.h" diff --git a/Source/cmMathCommand.cxx b/Source/cmMathCommand.cxx index c1cd1b6..11210ed 100644 --- a/Source/cmMathCommand.cxx +++ b/Source/cmMathCommand.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmMathCommand.h" -#include <stdio.h> +#include <cstdio> #include "cmExprParserHelper.h" #include "cmMakefile.h" diff --git a/Source/cmNewLineStyle.cxx b/Source/cmNewLineStyle.cxx index 55451ff..2d1d8cc 100644 --- a/Source/cmNewLineStyle.cxx +++ b/Source/cmNewLineStyle.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmNewLineStyle.h" -#include <stddef.h> +#include <cstddef> cmNewLineStyle::cmNewLineStyle() : NewLineStyle(Invalid) diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 9bf0ccd..c3dd148 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -3,13 +3,13 @@ #include "cmNinjaNormalTargetGenerator.h" #include <algorithm> -#include <assert.h> +#include <cassert> +#include <cstddef> #include <iterator> #include <limits> #include <map> #include <set> #include <sstream> -#include <stddef.h> #include "cmAlgorithms.h" #include "cmCustomCommand.h" diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index b1f26e4..d6aa1e0 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -3,13 +3,13 @@ #include "cmNinjaTargetGenerator.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cm_jsoncpp_value.h> #include <cm_jsoncpp_writer.h> +#include <cstring> #include <iterator> #include <map> #include <sstream> -#include <string.h> #include "cmAlgorithms.h" #include "cmComputeLinkInformation.h" diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx index 7744a5a..928de52 100644 --- a/Source/cmOrderDirectories.cxx +++ b/Source/cmOrderDirectories.cxx @@ -9,7 +9,7 @@ #include "cmake.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <functional> #include <sstream> diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx index d6864a6..2aa0131 100644 --- a/Source/cmOutputConverter.cxx +++ b/Source/cmOutputConverter.cxx @@ -3,8 +3,8 @@ #include "cmOutputConverter.h" #include <algorithm> -#include <assert.h> -#include <ctype.h> +#include <cassert> +#include <cctype> #include <set> #include <sstream> #include <vector> diff --git a/Source/cmOutputRequiredFilesCommand.h b/Source/cmOutputRequiredFilesCommand.h index c4ce680..2de2671 100644 --- a/Source/cmOutputRequiredFilesCommand.h +++ b/Source/cmOutputRequiredFilesCommand.h @@ -4,8 +4,8 @@ #define cmOutputRequiredFilesCommand_h #include <cmConfigure.h> +#include <cstdio> #include <set> -#include <stdio.h> #include <string> #include <vector> diff --git a/Source/cmParseArgumentsCommand.cxx b/Source/cmParseArgumentsCommand.cxx index d75ee8e..ac67e04 100644 --- a/Source/cmParseArgumentsCommand.cxx +++ b/Source/cmParseArgumentsCommand.cxx @@ -2,10 +2,10 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmParseArgumentsCommand.h" +#include <cstddef> #include <map> #include <set> #include <sstream> -#include <stddef.h> #include <utility> #include "cmAlgorithms.h" diff --git a/Source/cmPathLabel.cxx b/Source/cmPathLabel.cxx index 30ba081..8f97c84 100644 --- a/Source/cmPathLabel.cxx +++ b/Source/cmPathLabel.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmPathLabel.h" -#include <stddef.h> +#include <cstddef> cmPathLabel::cmPathLabel(const std::string& label) : Label(label) diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index 6339e11..da6359b 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -8,12 +8,12 @@ #include "cmVersion.h" #include "cmake.h" -#include <assert.h> +#include <cassert> +#include <cctype> #include <cmConfigure.h> -#include <ctype.h> +#include <cstdio> +#include <cstring> #include <sstream> -#include <stdio.h> -#include <string.h> #include <vector> static bool stringToId(const char* input, cmPolicies::PolicyID& pid) diff --git a/Source/cmProcessOutput.h b/Source/cmProcessOutput.h index d2e631f..80ef792 100644 --- a/Source/cmProcessOutput.h +++ b/Source/cmProcessOutput.h @@ -5,7 +5,7 @@ #include <cmConfigure.h> // IWYU pragma: keep -#include <stddef.h> +#include <cstddef> #include <string> #include <vector> diff --git a/Source/cmProcessTools.h b/Source/cmProcessTools.h index df131b9..8668a5c 100644 --- a/Source/cmProcessTools.h +++ b/Source/cmProcessTools.h @@ -6,8 +6,8 @@ #include "cmProcessOutput.h" #include <cmConfigure.h> +#include <cstring> #include <iosfwd> -#include <string.h> #include <string> /** \class cmProcessTools diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx index 4e0fa57..3aefdb2 100644 --- a/Source/cmProjectCommand.cxx +++ b/Source/cmProjectCommand.cxx @@ -3,8 +3,8 @@ #include "cmProjectCommand.h" #include <cmsys/RegularExpression.hxx> +#include <cstdio> #include <sstream> -#include <stdio.h> #include "cmMakefile.h" #include "cmPolicies.h" diff --git a/Source/cmPropertyMap.cxx b/Source/cmPropertyMap.cxx index fa92ae2..6db73c0 100644 --- a/Source/cmPropertyMap.cxx +++ b/Source/cmPropertyMap.cxx @@ -3,7 +3,7 @@ #include "cmPropertyMap.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmConfigure.h> #include <utility> diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index de18265..25521c1 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -25,10 +25,10 @@ #include <cmConfigure.h> #include <cmsys/FStream.hxx> #include <cmsys/RegularExpression.hxx> +#include <cstring> #include <map> #include <set> #include <sstream> -#include <string.h> #include <string> #include <sys/stat.h> #include <utility> diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index e7e456a..603e166 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -3,14 +3,14 @@ #include "cmQtAutoGenerators.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmConfigure.h> #include <cmsys/FStream.hxx> #include <cmsys/Terminal.h> +#include <cstdlib> +#include <cstring> #include <list> #include <sstream> -#include <stdlib.h> -#include <string.h> #include <utility> #include "cmAlgorithms.h" diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx index 355b8c4..bc17236 100644 --- a/Source/cmRST.cxx +++ b/Source/cmRST.cxx @@ -7,10 +7,10 @@ #include "cmVersion.h" #include <algorithm> +#include <cctype> #include <cmsys/FStream.hxx> -#include <ctype.h> +#include <cstddef> #include <iterator> -#include <stddef.h> #include <utility> cmRST::cmRST(std::ostream& os, std::string const& docroot) diff --git a/Source/cmRulePlaceholderExpander.cxx b/Source/cmRulePlaceholderExpander.cxx index f190a5c..d96d1c3 100644 --- a/Source/cmRulePlaceholderExpander.cxx +++ b/Source/cmRulePlaceholderExpander.cxx @@ -2,8 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmRulePlaceholderExpander.h" -#include <ctype.h> -#include <string.h> +#include <cctype> +#include <cstring> #include <utility> #include "cmOutputConverter.h" diff --git a/Source/cmServerConnection.cxx b/Source/cmServerConnection.cxx index 008052b..5ee8684 100644 --- a/Source/cmServerConnection.cxx +++ b/Source/cmServerConnection.cxx @@ -7,8 +7,8 @@ #include "cmFileMonitor.h" #include "cmServer.h" -#include <assert.h> -#include <string.h> +#include <cassert> +#include <cstring> namespace { diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx index 820e7f6..728fbbd 100644 --- a/Source/cmSetCommand.cxx +++ b/Source/cmSetCommand.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmSetCommand.h" -#include <string.h> +#include <cstring> #include "cmAlgorithms.h" #include "cmMakefile.h" diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index 4e0880e..d3e5cd1 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -11,7 +11,7 @@ #include "cmake.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <vector> cmSourceFileLocation::cmSourceFileLocation() diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx index 631f2a6..9293c23 100644 --- a/Source/cmSourceGroupCommand.cxx +++ b/Source/cmSourceGroupCommand.cxx @@ -2,9 +2,9 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmSourceGroupCommand.h" +#include <cstddef> #include <set> #include <sstream> -#include <stddef.h> #include "cmMakefile.h" #include "cmSourceGroup.h" diff --git a/Source/cmState.cxx b/Source/cmState.cxx index 18d5ea1..aaf8cf0 100644 --- a/Source/cmState.cxx +++ b/Source/cmState.cxx @@ -3,9 +3,9 @@ #include "cmState.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmsys/RegularExpression.hxx> -#include <string.h> +#include <cstring> #include <utility> #include "cmAlgorithms.h" diff --git a/Source/cmStateDirectory.cxx b/Source/cmStateDirectory.cxx index 46a1858..c402619 100644 --- a/Source/cmStateDirectory.cxx +++ b/Source/cmStateDirectory.cxx @@ -4,7 +4,7 @@ #include "cmStateDirectory.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <iterator> #include <map> #include <utility> diff --git a/Source/cmStateSnapshot.cxx b/Source/cmStateSnapshot.cxx index d2c9d73..9e5bcce 100644 --- a/Source/cmStateSnapshot.cxx +++ b/Source/cmStateSnapshot.cxx @@ -4,9 +4,9 @@ #include "cmStateSnapshot.h" #include <algorithm> -#include <assert.h> +#include <cassert> +#include <cstdio> #include <iterator> -#include <stdio.h> #include "cmAlgorithms.h" #include "cmDefinitions.h" diff --git a/Source/cmStringCommand.cxx b/Source/cmStringCommand.cxx index eb94080..a308975 100644 --- a/Source/cmStringCommand.cxx +++ b/Source/cmStringCommand.cxx @@ -2,11 +2,11 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmStringCommand.h" +#include <cctype> #include <cmsys/RegularExpression.hxx> -#include <ctype.h> +#include <cstdio> +#include <cstdlib> #include <sstream> -#include <stdio.h> -#include <stdlib.h> #include "cmAlgorithms.h" #include "cmCryptoHash.h" diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index b7afa10..3123329 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -27,7 +27,9 @@ #endif #include <algorithm> -#include <assert.h> +#include <cassert> +#include <cctype> +#include <cerrno> #include <cmsys/Directory.hxx> #include <cmsys/Encoding.hxx> #include <cmsys/FStream.hxx> @@ -35,16 +37,14 @@ #include <cmsys/System.h> #include <cmsys/SystemTools.hxx> #include <cmsys/Terminal.h> -#include <ctype.h> -#include <errno.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <ctime> #include <iostream> #include <set> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <sys/stat.h> -#include <time.h> #include <utility> #if defined(_WIN32) diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 10e8280..2641faa 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -8,7 +8,7 @@ #include <cmProcessOutput.h> #include <cmsys/Process.h> #include <cmsys/SystemTools.hxx> -#include <stddef.h> +#include <cstddef> #include <string> #include <vector> diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 0f3d91b..9fb57fc 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -3,12 +3,12 @@ #include "cmTarget.h" #include <algorithm> -#include <assert.h> +#include <cassert> #include <cmsys/RegularExpression.hxx> +#include <cstring> #include <map> #include <set> #include <sstream> -#include <string.h> #include "cmAlgorithms.h" #include "cmGeneratorExpression.h" diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index e173036..50fd9b7 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -2,8 +2,8 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmTargetLinkLibrariesCommand.h" +#include <cstring> #include <sstream> -#include <string.h> #include "cmGeneratorExpression.h" #include "cmGlobalGenerator.h" diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 3d42e26..4b72d49 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -3,9 +3,9 @@ #include "cmTimestamp.h" #include <cmConfigure.h> +#include <cstdlib> #include <cstring> #include <sstream> -#include <stdlib.h> #include "cmSystemTools.h" diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h index fdee564..e2adc4d 100644 --- a/Source/cmTimestamp.h +++ b/Source/cmTimestamp.h @@ -5,8 +5,8 @@ #include <cmConfigure.h> // IWYU pragma: keep +#include <ctime> #include <string> -#include <time.h> /** \class cmTimestamp * \brief Utility class to generate string representation of a timestamp diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index c4fc94e..c476bcb 100644 --- a/Source/cmTryRunCommand.cxx +++ b/Source/cmTryRunCommand.cxx @@ -3,8 +3,8 @@ #include "cmTryRunCommand.h" #include <cmsys/FStream.hxx> -#include <stdio.h> -#include <string.h> +#include <cstdio> +#include <cstring> #include "cmMakefile.h" #include "cmState.h" diff --git a/Source/cmUnexpectedCommand.cxx b/Source/cmUnexpectedCommand.cxx index a8de9e6..fe25038 100644 --- a/Source/cmUnexpectedCommand.cxx +++ b/Source/cmUnexpectedCommand.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmUnexpectedCommand.h" -#include <stdlib.h> +#include <cstdlib> #include "cmMakefile.h" diff --git a/Source/cmUnsetCommand.cxx b/Source/cmUnsetCommand.cxx index 31525ba..1c73312 100644 --- a/Source/cmUnsetCommand.cxx +++ b/Source/cmUnsetCommand.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmUnsetCommand.h" -#include <string.h> +#include <cstring> #include "cmAlgorithms.h" #include "cmMakefile.h" diff --git a/Source/cmUtilitySourceCommand.cxx b/Source/cmUtilitySourceCommand.cxx index 37d8bfb..07ada54 100644 --- a/Source/cmUtilitySourceCommand.cxx +++ b/Source/cmUtilitySourceCommand.cxx @@ -2,7 +2,7 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmUtilitySourceCommand.h" -#include <string.h> +#include <cstring> #include "cmMakefile.h" #include "cmState.h" diff --git a/Source/cmUuid.cxx b/Source/cmUuid.cxx index 201e1cc..c7b4d1c 100644 --- a/Source/cmUuid.cxx +++ b/Source/cmUuid.cxx @@ -4,7 +4,7 @@ #include "cmCryptoHash.h" -#include <string.h> +#include <cstring> cmUuid::cmUuid() { diff --git a/Source/cmVisualStudioSlnParser.h b/Source/cmVisualStudioSlnParser.h index a3391a6..49eb5dc 100644 --- a/Source/cmVisualStudioSlnParser.h +++ b/Source/cmVisualStudioSlnParser.h @@ -6,8 +6,8 @@ #include <cmConfigure.h> #include <bitset> +#include <cstddef> #include <iosfwd> -#include <stddef.h> #include <string> class cmSlnData; diff --git a/Source/cmVisualStudioWCEPlatformParser.h b/Source/cmVisualStudioWCEPlatformParser.h index 8ed6083..e2ee582 100644 --- a/Source/cmVisualStudioWCEPlatformParser.h +++ b/Source/cmVisualStudioWCEPlatformParser.h @@ -5,8 +5,8 @@ #include <cmConfigure.h> +#include <cstddef> #include <map> -#include <stddef.h> #include <string> #include <vector> diff --git a/Source/cmXMLParser.cxx b/Source/cmXMLParser.cxx index 231e95e..c642e6d 100644 --- a/Source/cmXMLParser.cxx +++ b/Source/cmXMLParser.cxx @@ -2,12 +2,12 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmXMLParser.h" +#include <cctype> #include <cm_expat.h> #include <cmsys/FStream.hxx> -#include <ctype.h> +#include <cstring> #include <iostream> #include <sstream> -#include <string.h> cmXMLParser::cmXMLParser() { diff --git a/Source/cmXMLSafe.cxx b/Source/cmXMLSafe.cxx index d9bdc02..7c3b306 100644 --- a/Source/cmXMLSafe.cxx +++ b/Source/cmXMLSafe.cxx @@ -4,9 +4,9 @@ #include "cm_utf8.h" +#include <cstdio> +#include <cstring> #include <sstream> -#include <stdio.h> -#include <string.h> cmXMLSafe::cmXMLSafe(const char* s) : Data(s) diff --git a/Source/cm_codecvt.hxx b/Source/cm_codecvt.hxx index fcd9954..cbd9c22 100644 --- a/Source/cm_codecvt.hxx +++ b/Source/cm_codecvt.hxx @@ -5,9 +5,9 @@ #include <cmConfigure.h> +#include <cwchar> #include <locale> #include <vector> -#include <wchar.h> class codecvt : public std::codecvt<char, char, mbstate_t> { diff --git a/Source/cm_get_date.h b/Source/cm_get_date.h index 6acf8de..d486a39 100644 --- a/Source/cm_get_date.h +++ b/Source/cm_get_date.h @@ -3,10 +3,11 @@ #ifndef cm_get_date_h #define cm_get_date_h -#include <time.h> - #ifdef __cplusplus +#include <ctime> extern "C" { +#else +#include <time.h> #endif /** Parse a date/time string. Treat relative times with respect to 'now'. */ diff --git a/Source/cmake.cxx b/Source/cmake.cxx index b2384cd..6a006a2 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -113,11 +113,11 @@ #include <cmsys/FStream.hxx> #include <cmsys/Glob.hxx> #include <cmsys/RegularExpression.hxx> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <iostream> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include <utility> namespace { diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index b8e227f..a27ee75 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -22,8 +22,8 @@ #if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE) #include <cmsys/ConsoleBuf.hxx> #endif +#include <cstring> #include <iostream> -#include <string.h> #include <string> #include <vector> diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 823b38f..7bc3e2f 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -38,11 +38,11 @@ #include <cmsys/FStream.hxx> #include <cmsys/Process.h> #include <cmsys/Terminal.h> +#include <cstdio> +#include <cstdlib> +#include <ctime> #include <iostream> #include <sstream> -#include <stdio.h> -#include <stdlib.h> -#include <time.h> int cmcmd_cmake_ninja_depends(std::vector<std::string>::const_iterator argBeg, std::vector<std::string>::const_iterator argEnd); diff --git a/Source/ctest.cxx b/Source/ctest.cxx index 1cf75c8..85965a2 100644 --- a/Source/ctest.cxx +++ b/Source/ctest.cxx @@ -13,8 +13,8 @@ #if defined(_WIN32) && defined(CMAKE_BUILD_WITH_CMAKE) #include <cmsys/ConsoleBuf.hxx> #endif +#include <cstring> #include <iostream> -#include <string.h> #include <string> #include <vector> diff --git a/Tests/CMakeLib/run_compile_commands.cxx b/Tests/CMakeLib/run_compile_commands.cxx index 5d4ca70..9701464 100644 --- a/Tests/CMakeLib/run_compile_commands.cxx +++ b/Tests/CMakeLib/run_compile_commands.cxx @@ -1,9 +1,9 @@ #include <cmConfigure.h> #include <cmsys/FStream.hxx> +#include <cstdlib> #include <iostream> #include <map> -#include <stdlib.h> #include <string> #include <utility> #include <vector> diff --git a/Tests/CMakeLib/testSystemTools.cxx b/Tests/CMakeLib/testSystemTools.cxx index 0dfa326..bdffecc 100644 --- a/Tests/CMakeLib/testSystemTools.cxx +++ b/Tests/CMakeLib/testSystemTools.cxx @@ -3,8 +3,8 @@ #include <cmConfigure.h> // IWYU pragma: keep +#include <cstddef> #include <iostream> -#include <stddef.h> #include <string> #include <vector> diff --git a/Tests/CMakeLib/testUTF8.cxx b/Tests/CMakeLib/testUTF8.cxx index fb5f3d8..568268d 100644 --- a/Tests/CMakeLib/testUTF8.cxx +++ b/Tests/CMakeLib/testUTF8.cxx @@ -1,7 +1,7 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ #include <cm_utf8.h> -#include <stdio.h> +#include <cstdio> typedef char test_utf8_char[5]; diff --git a/Tests/CMakeLib/testXMLSafe.cxx b/Tests/CMakeLib/testXMLSafe.cxx index fe776c5..9290414 100644 --- a/Tests/CMakeLib/testXMLSafe.cxx +++ b/Tests/CMakeLib/testXMLSafe.cxx @@ -3,8 +3,8 @@ #include <cmConfigure.h> +#include <cstdio> #include <sstream> -#include <stdio.h> #include <string> #include "cmXMLSafe.h" ----------------------------------------------------------------------- Summary of changes: Source/CPack/IFW/cmCPackIFWInstaller.cxx | 2 +- Source/CPack/IFW/cmCPackIFWPackage.cxx | 2 +- Source/CPack/IFW/cmCPackIFWRepository.cxx | 2 +- Source/CPack/OSXScriptLauncher.cxx | 2 +- Source/CPack/cmCPackDebGenerator.cxx | 6 +++--- Source/CPack/cmCPackDragNDropGenerator.cxx | 2 +- Source/CPack/cmCPackDragNDropGenerator.h | 2 +- Source/CPack/cmCPackLog.h | 2 +- Source/CPack/cmCPackNSISGenerator.cxx | 4 ++-- Source/CPack/cmCPackPackageMakerGenerator.cxx | 6 +++--- Source/CPack/cmCPackProductBuildGenerator.cxx | 2 +- Source/CPack/cmCPackRPMGenerator.cxx | 2 +- Source/CPack/cmCPackSTGZGenerator.cxx | 2 +- Source/CPack/cpack.cxx | 2 +- Source/CTest/cmCTestBZR.cxx | 2 +- Source/CTest/cmCTestBuildAndTestHandler.cxx | 2 +- Source/CTest/cmCTestBuildAndTestHandler.h | 2 +- Source/CTest/cmCTestBuildCommand.cxx | 2 +- Source/CTest/cmCTestBuildHandler.cxx | 4 ++-- Source/CTest/cmCTestBuildHandler.h | 2 +- Source/CTest/cmCTestConfigureCommand.cxx | 2 +- Source/CTest/cmCTestCoverageHandler.cxx | 4 ++-- Source/CTest/cmCTestCurl.cxx | 2 +- Source/CTest/cmCTestGIT.cxx | 8 ++++---- Source/CTest/cmCTestGenericHandler.h | 2 +- Source/CTest/cmCTestHandlerCommand.cxx | 2 +- Source/CTest/cmCTestHandlerCommand.h | 2 +- Source/CTest/cmCTestLaunch.cxx | 6 +++--- Source/CTest/cmCTestMemCheckHandler.cxx | 2 +- Source/CTest/cmCTestMultiProcessHandler.cxx | 4 ++-- Source/CTest/cmCTestMultiProcessHandler.h | 2 +- Source/CTest/cmCTestP4.cxx | 2 +- Source/CTest/cmCTestRunTest.cxx | 4 ++-- Source/CTest/cmCTestRunTest.h | 2 +- Source/CTest/cmCTestSVN.cxx | 4 ++-- Source/CTest/cmCTestScriptHandler.cxx | 6 +++--- Source/CTest/cmCTestSleepCommand.cxx | 2 +- Source/CTest/cmCTestStartCommand.cxx | 2 +- Source/CTest/cmCTestSubmitHandler.cxx | 4 ++-- Source/CTest/cmCTestTestCommand.cxx | 2 +- Source/CTest/cmCTestTestHandler.cxx | 8 ++++---- Source/CTest/cmCTestTestHandler.h | 2 +- Source/CTest/cmCTestVC.cxx | 4 ++-- Source/CTest/cmParseBlanketJSCoverage.cxx | 4 ++-- Source/CTest/cmParseCacheCoverage.cxx | 4 ++-- Source/CTest/cmParseCoberturaCoverage.cxx | 4 ++-- Source/CTest/cmParseDelphiCoverage.cxx | 4 ++-- Source/CTest/cmParseGTMCoverage.cxx | 4 ++-- Source/CTest/cmParseJacocoCoverage.cxx | 4 ++-- Source/CTest/cmParsePHPCoverage.cxx | 4 ++-- Source/CursesDialog/ccmake.cxx | 4 ++-- Source/CursesDialog/cmCursesCacheEntryComposite.cxx | 2 +- Source/CursesDialog/cmCursesLongMessageForm.cxx | 4 ++-- Source/CursesDialog/cmCursesMainForm.cxx | 4 ++-- Source/CursesDialog/cmCursesMainForm.h | 2 +- Source/CursesDialog/cmCursesStringWidget.cxx | 4 ++-- Source/QtDialog/CMakeSetup.cxx | 4 ++-- Source/bindexplib.h | 2 +- Source/cmAddSubDirectoryCommand.cxx | 2 +- Source/cmAlgorithms.h | 2 +- Source/cmArchiveWrite.cxx | 4 ++-- Source/cmArchiveWrite.h | 2 +- Source/cmAuxSourceDirectoryCommand.cxx | 2 +- Source/cmBase32.h | 2 +- Source/cmCMakeHostSystemInformationCommand.h | 2 +- Source/cmCMakeMinimumRequired.cxx | 2 +- Source/cmCPluginAPI.cxx | 2 +- Source/cmCTest.cxx | 10 +++++----- Source/cmCTest.h | 2 +- Source/cmCacheManager.cxx | 4 ++-- Source/cmCommandArgumentParser.y | 1 - Source/cmCommandArgumentParserHelper.cxx | 2 +- Source/cmComputeComponentGraph.cxx | 2 +- Source/cmComputeLinkDepends.cxx | 6 +++--- Source/cmComputeLinkInformation.cxx | 4 ++-- Source/cmComputeTargetDepends.cxx | 4 ++-- Source/cmConditionEvaluator.cxx | 6 +++--- Source/cmCoreTryCompile.cxx | 4 ++-- Source/cmCryptoHash.cxx | 2 +- Source/cmCryptoHash.h | 2 +- Source/cmDefinitions.cxx | 2 +- Source/cmDepends.cxx | 2 +- Source/cmDepends.h | 2 +- Source/cmDependsFortran.cxx | 6 +++--- Source/cmDependsJavaParserHelper.cxx | 6 +++--- Source/cmDocumentation.cxx | 4 ++-- Source/cmDocumentationFormatter.cxx | 2 +- Source/cmELF.cxx | 4 ++-- Source/cmExecProgramCommand.cxx | 2 +- Source/cmExecuteProcessCommand.cxx | 4 ++-- Source/cmExportFileGenerator.cxx | 4 ++-- Source/cmExportInstallAndroidMKGenerator.cxx | 2 +- Source/cmExtraCodeBlocksGenerator.cxx | 2 +- Source/cmExtraCodeLiteGenerator.cxx | 2 +- Source/cmExtraEclipseCDT4Generator.cxx | 4 ++-- Source/cmExtraKateGenerator.cxx | 2 +- Source/cmExtraSublimeTextGenerator.cxx | 2 +- Source/cmFLTKWrapUICommand.cxx | 2 +- Source/cmFileCommand.cxx | 8 ++++---- Source/cmFileLock.cxx | 2 +- Source/cmFileLockPool.cxx | 2 +- Source/cmFileLockResult.cxx | 4 ++-- Source/cmFileLockUnix.cxx | 4 ++-- Source/cmFilePathChecksum.h | 2 +- Source/cmFileTimeComparison.cxx | 2 +- Source/cmFindBase.cxx | 2 +- Source/cmFindCommon.cxx | 2 +- Source/cmFindLibraryCommand.cxx | 4 ++-- Source/cmFindPackageCommand.cxx | 6 +++--- Source/cmForEachCommand.cxx | 4 ++-- Source/cmFortranParserImpl.cxx | 4 ++-- Source/cmGeneratedFileStream.cxx | 2 +- Source/cmGeneratorExpression.cxx | 2 +- Source/cmGeneratorExpressionDAGChecker.cxx | 2 +- Source/cmGeneratorExpressionEvaluator.h | 2 +- Source/cmGeneratorExpressionLexer.h | 2 +- Source/cmGeneratorExpressionNode.cxx | 8 ++++---- Source/cmGeneratorExpressionParser.cxx | 4 ++-- Source/cmGeneratorTarget.cxx | 15 ++++++++------- Source/cmGhsMultiTargetGenerator.cxx | 2 +- Source/cmGlobalGenerator.cxx | 8 ++++---- Source/cmGlobalKdevelopGenerator.cxx | 2 +- Source/cmGlobalNinjaGenerator.cxx | 4 ++-- Source/cmGlobalUnixMakefileGenerator3.h | 2 +- Source/cmGlobalVisualStudio7Generator.cxx | 2 +- Source/cmGlobalXCodeGenerator.cxx | 6 +++--- Source/cmHexFileConverter.cxx | 4 ++-- Source/cmIDEOptions.cxx | 2 +- Source/cmInstallCommand.cxx | 2 +- Source/cmInstallExportAndroidMKGenerator.cxx | 2 +- Source/cmInstallExportGenerator.h | 2 +- Source/cmInstallTargetGenerator.cxx | 2 +- Source/cmLinkedTree.h | 2 +- Source/cmListCommand.cxx | 6 +++--- Source/cmListFileCache.cxx | 2 +- Source/cmLoadCommandCommand.cxx | 8 ++++---- Source/cmLocalGenerator.cxx | 6 +++--- Source/cmLocalNinjaGenerator.cxx | 4 ++-- Source/cmLocalUnixMakefileGenerator3.cxx | 2 +- Source/cmLocalVisualStudio7Generator.cxx | 2 +- Source/cmLocale.h | 2 +- Source/cmMachO.cxx | 2 +- Source/cmMacroCommand.cxx | 2 +- Source/cmMakefile.cxx | 8 ++++---- Source/cmMakefileTargetGenerator.cxx | 2 +- Source/cmMathCommand.cxx | 2 +- Source/cmNewLineStyle.cxx | 2 +- Source/cmNinjaNormalTargetGenerator.cxx | 4 ++-- Source/cmNinjaTargetGenerator.cxx | 4 ++-- Source/cmOrderDirectories.cxx | 2 +- Source/cmOutputConverter.cxx | 4 ++-- Source/cmOutputRequiredFilesCommand.h | 2 +- Source/cmParseArgumentsCommand.cxx | 2 +- Source/cmPathLabel.cxx | 2 +- Source/cmPolicies.cxx | 8 ++++---- Source/cmProcessOutput.h | 2 +- Source/cmProcessTools.h | 2 +- Source/cmProjectCommand.cxx | 2 +- Source/cmPropertyMap.cxx | 2 +- Source/cmQtAutoGeneratorInitializer.cxx | 2 +- Source/cmQtAutoGenerators.cxx | 6 +++--- Source/cmRST.cxx | 4 ++-- Source/cmRulePlaceholderExpander.cxx | 4 ++-- Source/cmServerConnection.cxx | 4 ++-- Source/cmSetCommand.cxx | 2 +- Source/cmSourceFileLocation.cxx | 2 +- Source/cmSourceGroupCommand.cxx | 2 +- Source/cmState.cxx | 4 ++-- Source/cmStateDirectory.cxx | 2 +- Source/cmStateSnapshot.cxx | 4 ++-- Source/cmStringCommand.cxx | 6 +++--- Source/cmSystemTools.cxx | 14 +++++++------- Source/cmSystemTools.h | 2 +- Source/cmTarget.cxx | 4 ++-- Source/cmTargetLinkLibrariesCommand.cxx | 2 +- Source/cmTimestamp.cxx | 2 +- Source/cmTimestamp.h | 2 +- Source/cmTryRunCommand.cxx | 4 ++-- Source/cmUnexpectedCommand.cxx | 2 +- Source/cmUnsetCommand.cxx | 2 +- Source/cmUtilitySourceCommand.cxx | 2 +- Source/cmUuid.cxx | 2 +- Source/cmVisualStudioSlnParser.h | 2 +- Source/cmVisualStudioWCEPlatformParser.h | 2 +- Source/cmXMLParser.cxx | 4 ++-- Source/cmXMLSafe.cxx | 4 ++-- Source/cm_codecvt.hxx | 2 +- Source/cm_get_date.h | 5 +++-- Source/cmake.cxx | 6 +++--- Source/cmakemain.cxx | 2 +- Source/cmcmd.cxx | 6 +++--- Source/ctest.cxx | 2 +- Tests/CMakeLib/run_compile_commands.cxx | 2 +- Tests/CMakeLib/testSystemTools.cxx | 2 +- Tests/CMakeLib/testUTF8.cxx | 2 +- Tests/CMakeLib/testXMLSafe.cxx | 2 +- 196 files changed, 321 insertions(+), 320 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits