Include <cmeow> instead of <meow.h>, Part2

benchmarks/inc/utility.hpp

@@ -4,9 +4,9 @@
 #pragma once
 
 #include <algorithm>
+#include <cstddef>
+#include <cstdint>
 #include <random>
-#include <stddef.h>
-#include <stdint.h>
 #include <vector>
 
 #include <xoshiro.hpp>

benchmarks/src/std_copy.cpp

@@ -3,8 +3,8 @@
 
 #include <algorithm>
 #include <benchmark/benchmark.h>
-#include <stddef.h>
-#include <string.h>
+#include <cstddef>
+#include <cstring>
 #include <type_traits>
 #include <vector>
 

stl/src/vector_algorithms.cpp

@@ -12,11 +12,11 @@
 
 #if (defined(_M_IX86) || defined(_M_X64)) && !defined(_M_ARM64EC)
 
+#include <cstdint>
 #include <emmintrin.h>
 #include <immintrin.h>
 #include <intrin0.h>
 #include <isa_availability.h>
-#include <stdint.h>
 
 extern "C" long __isa_enabled;
 

stl/src/xonce2.cpp

@@ -3,7 +3,7 @@
 
 #include <yvals_core.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <synchapi.h>
 
 // This must be as small as possible, because its contents are

stl/src/xxxprec.hpp

@@ -27,7 +27,7 @@ _EXTERN_C
     } // STET
 
 #if 0
-#include <stdio.h>
+#include <cstdio>
 
 static void printit(const char* s, FTYPE* p, int n) { // print xp array
     int i;

tests/std/include/constexpr_char_traits.hpp

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
-#include <stdio.h>
-#include <wchar.h>
+#include <cstdio>
+#include <cwchar>
 
 struct constexpr_char_traits {
     typedef char char_type;

tests/std/include/fenv_prefix.hpp

@@ -40,7 +40,7 @@
 #endif // defined(FP_CONTRACT_MODE)
 
 #include <cassert>
-#include <float.h>
+#include <cfloat>
 
 struct fenv_initializer_t {
     fenv_initializer_t() {

tests/std/include/floating_point_test_cases.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <utility>
 
 constexpr std::pair<const char*, uint64_t> floating_point_test_cases_double[] = {

tests/std/include/instantiate_algorithms.hpp

@@ -6,13 +6,13 @@
 // Notably, all permutations of all iterator strengths are tested.
 
 #include <algorithm>
+#include <cstddef>
 #include <forward_list>
 #include <functional>
 #include <iterator>
 #include <list>
 #include <memory>
 #include <numeric>
-#include <stddef.h>
 #include <type_traits>
 
 #if _HAS_CXX17 && !defined(_M_CEE)

tests/std/include/new_counter.hpp

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdlib>
 #include <new>
-#include <stddef.h>
-#include <stdlib.h>
 
 #pragma once
 #pragma warning(push)

tests/std/include/parallel_algorithms_utilities.hpp

@@ -3,7 +3,7 @@
 
 #pragma once
 #include <algorithm>
-#include <stddef.h>
+#include <cstddef>
 #include <thread>
 
 #ifdef EXHAUSTIVE

tests/std/include/test_atomic_wait.hpp

@@ -3,11 +3,11 @@
 
 #pragma once
 
-#include <assert.h>
 #include <atomic>
+#include <cassert>
 #include <chrono>
+#include <cstring>
 #include <memory>
-#include <string.h>
 #include <thread>
 
 template <template <class> class Template, class UnderlyingType>

tests/std/include/test_death.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 #include <crtdbg.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
 #include <string>
 #include <vector>
 

tests/std/include/test_filesystem_support.hpp

@@ -6,11 +6,11 @@
 #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
 
 #include <algorithm>
+#include <cstring>
 #include <experimental/filesystem>
 #include <filesystem>
 #include <iterator>
 #include <random>
-#include <string.h>
 #include <string>
 
 inline std::string get_test_directory_subname(const char* const testName, const size_t testNameLength) {

tests/std/include/test_regex_support.hpp

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #pragma once
+#include <cstdio>
 #include <regex>
-#include <stdio.h>
 #include <string>
 
 class regex_fixture {

tests/std/include/test_thread_support.hpp

@@ -5,9 +5,9 @@
 
 #include <chrono>
 #include <condition_variable>
+#include <cstdio>
+#include <cstdlib>
 #include <mutex>
-#include <stdio.h>
-#include <stdlib.h>
 #include <thread>
 
 #include <Windows.h>

tests/std/tests/Dev08_496675_iostream_int_reading/test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
 #include <sstream>
 
 int main() {

tests/std/tests/Dev08_563686_ostream/test.cpp

@@ -26,8 +26,8 @@
 
 #define CRTDBG_MAP_ALLOC
 #include <crtdbg.h>
+#include <cstdlib>
 #include <sstream>
-#include <stdlib.h>
 
 #include <Windows.h>
 

tests/std/tests/Dev08_576265_list_remove/test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
 #include <list>
 
 struct Val {

tests/std/tests/Dev08_584299_search_n/test.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 #include <list>
 
 // This test makes sure that the search_n algorithm behaves correctly.

tests/std/tests/Dev09_012361_vector_swap/test.cpp

@@ -85,14 +85,14 @@
 // deque<int>::iterator: Previously 12, 16, 16, 12, 8. Now 12, 8, 8, 8, 8.
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+#include <cstring>
 #include <deque>
 #include <iterator>
 #include <list>
 #include <set>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
 #include <vector>
 
 using namespace std;

tests/std/tests/Dev09_052961_has_iterator_debugging_0/test.cpp

@@ -49,9 +49,9 @@
 // correctness to all known cases, and also increases efficiency (as iterator destructors
 // in debug mode with iterator debugging disabled now perform no extra work).
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+#include <cassert>
+#include <cstdio>
+#include <cstring>
 #include <vector>
 
 using namespace std;

tests/std/tests/Dev09_056375_locale_cleanup/test.cpp

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
+#include <cstdio>
 #include <locale>
-#include <stdio.h>
 
 #include <Windows.h>
 

tests/std/tests/Dev09_056375_locale_cleanup/testdll.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
 #include <locale>
 
 #include <Windows.h>

tests/std/tests/Dev09_098637_stl_function_typeids/test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
 #include <sstream>
 #include <typeinfo>
 

tests/std/tests/Dev09_126254_persistent_aux_allocators/test.cpp

@@ -1,16 +1,16 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
 #include <deque>
 #include <forward_list>
 #include <list>
 #include <map>
 #include <new>
 #include <set>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>

tests/std/tests/Dev09_130060_unique_copy/test.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 #include <iterator>
 #include <sstream>
 #include <string>

tests/std/tests/Dev09_152755_tr1_nested_bind/test.cpp

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cmath>
 #include <functional>
-#include <math.h>
 #include <vector>
 
 using namespace std;

tests/std/tests/Dev09_153419_tr1_allocators/test.cpp

@@ -12,14 +12,14 @@
 // Big is 7 * 64 bits to disable the Small Functor Optimization.
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <functional>
 #include <memory>
 #include <new>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <vector>
 
 using namespace std;

tests/std/tests/Dev09_154033_tr1_predicate_search_n/test.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 #include <vector>
 
 struct X {

tests/std/tests/Dev09_155328_tr1_vector_of_set/test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
 #include <set>
 #include <vector>
 

tests/std/tests/Dev09_158181_tr1_unordered_meow_swap/test.cpp

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
+#include <climits>
 #include <cmath>
-#include <limits.h>
+#include <cstdlib>
 #include <stdexcept>
-#include <stdlib.h>
 #include <unordered_set>
 #include <utility>
 

tests/std/tests/Dev09_158457_tr1_mem_fn_calling_conventions/test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
 #include <functional>
 #include <type_traits>
 

tests/std/tests/Dev09_161106_tr1_bind_templated_fxn_call_operator/test.cpp

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
 #include <functional>
 
 using namespace std;