Source: Replace C headers with C++ ones

In applicable areas only, of course.

Source/CPack/cmCPackDragNDropGenerator.h

@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmCPackGenerator.h"
 
 class cmGeneratedFileStream;

Source/CPack/cmCPackLog.h

@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstring>
 #include <memory>
 #include <ostream>
 #include <string>
 
-#include <string.h>
-
 #define cmCPack_Log(ctSelf, logType, msg)                                     \
   do {                                                                        \
     std::ostringstream cmCPackLog_msg;                                        \

Source/CTest/cmCTestBuildAndTestHandler.h

@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmCTestGenericHandler.h"
 #include "cmDuration.h"
 

Source/CTest/cmCTestBuildHandler.h

@@ -5,13 +5,12 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <chrono>
+#include <cstddef>
 #include <deque>
 #include <iosfwd>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmsys/RegularExpression.hxx"
 
 #include "cmCTestGenericHandler.h"

Source/CTest/cmCTestGenericHandler.h

@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <map>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmCTest.h"
 #include "cmSystemTools.h"
 #include "cmValue.h"

Source/CTest/cmCTestLaunch.cxx

@@ -20,9 +20,10 @@
 #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)

Source/CTest/cmCTestLaunchReporter.cxx

@@ -13,9 +13,10 @@
 #include "cmXMLWriter.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
 
 cmCTestLaunchReporter::cmCTestLaunchReporter()

Source/CTest/cmCTestMultiProcessHandler.h

@@ -4,6 +4,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <map>
 #include <memory>
 #include <set>
@@ -11,7 +12,6 @@
 #include <vector>
 
 #include <cm3p/uv.h>
-#include <stddef.h>
 
 #include "cmCTest.h"
 #include "cmCTestResourceAllocator.h"

Source/CTest/cmCTestRunTest.h

@@ -4,14 +4,13 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmCTest.h"
 #include "cmCTestMultiProcessHandler.h"
 #include "cmCTestTestHandler.h"

Source/CTest/cmCTestTestHandler.h

@@ -5,6 +5,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <chrono>
+#include <cstddef>
 #include <cstdint>
 #include <iosfwd>
 #include <map>
@@ -13,8 +14,6 @@
 #include <utility>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmsys/RegularExpression.hxx"
 
 #include "cmCTest.h"

Source/CTest/cmProcess.h

@@ -5,14 +5,14 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include <cm3p/uv.h>
-#include <stddef.h>
-#include <stdint.h>
 
 #include "cmDuration.h"
 #include "cmProcessOutput.h"

Source/bindexplib.h

@@ -4,11 +4,10 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstdio>
 #include <set>
 #include <string>
 
-#include <stdio.h>
-
 class bindexplib
 {
 public:

Source/cmAffinity.cxx

@@ -12,7 +12,7 @@
 #    define CM_HAVE_CPU_AFFINITY
 #    include <pthread.h>
 #    include <sched.h>
-// On some platforms CPU_ZERO needs memset but sched.h forgets string.h
+// On some platforms CPU_ZERO needs memset but sched.h forgets cstring
 #    include <cstring> // IWYU pragma: keep
 #    if defined(__FreeBSD__)
 #      include <pthread_np.h>

Source/cmGlobalVisualStudio7Generator.cxx

@@ -2,6 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmGlobalVisualStudio7Generator.h"
 
+#include <cassert>
 #include <utility>
 #include <vector>
 
@@ -10,8 +11,6 @@
 
 #include <windows.h>
 
-#include <assert.h>
-
 #include "cmsys/Encoding.hxx"
 
 #include "cmGeneratedFileStream.h"

Source/cmIDEOptions.cxx

@@ -2,12 +2,11 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmIDEOptions.h"
 
+#include <cstring>
 #include <iterator>
 
 #include <cmext/algorithm>
 
-#include <string.h>
-
 #include "cmsys/String.h"
 
 #include "cmAlgorithms.h"

Source/cmLocalVisualStudio7Generator.cxx

@@ -2,13 +2,14 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmLocalVisualStudio7Generator.h"
 
+#include <cctype> // for isspace
+
 #include <cm/memory>
 #include <cmext/algorithm>
 
 #include <windows.h>
 
 #include <cm3p/expat.h>
-#include <ctype.h> // for isspace
 
 #include "cmComputeLinkInformation.h"
 #include "cmCustomCommand.h"

Source/cmSystemTools.cxx

@@ -540,7 +540,7 @@ size_t cmSystemTools::CalculateCommandLineLengthLimit()
 #if defined(_SC_ARG_MAX)
   // ARG_MAX is the maximum size of the command and environment
   // that can be passed to the exec functions on UNIX.
-  // The value in limits.h does not need to be present and may
+  // The value in climits does not need to be present and may
   // depend upon runtime memory constraints, hence sysconf()
   // should be used to query it.
   long szArgMax = sysconf(_SC_ARG_MAX);

Source/cmVisualStudioSlnParser.h

@@ -5,13 +5,12 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <bitset>
+#include <cstddef>
 #include <iosfwd>
 #include <string>
 
 #include <cm/string_view>
 
-#include <stddef.h>
-
 class cmSlnData;
 
 class cmVisualStudioSlnParser

Source/cmVisualStudioWCEPlatformParser.h

@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <map>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmXMLParser.h"
 
 // This class is used to parse XML with configuration

Source/cm_codecvt.cxx

@@ -3,10 +3,10 @@
 #include "cm_codecvt.hxx"
 
 #if defined(_WIN32)
-#  include <windows.h>
+#  include <cassert>
+#  include <cstring>
 
-#  include <assert.h>
-#  include <string.h>
+#  include <windows.h>
 #  undef max
 #  include "cmsys/Encoding.hxx"
 #endif

Source/cmcmd.cxx

@@ -58,7 +58,6 @@
 #ifdef _WIN32
 #  include <fcntl.h> // for _O_BINARY
 #  include <io.h>    // for _setmode
-#  include <stdio.h> // for std{out,err} and fileno
 #endif
 
 #include <cm/string_view>