Include <cmeow> instead of <meow.h>, Part 2 (#2852)

Co-authored-by: Stephan T. Lavavej <stl@nuwen.net>

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;

tests/std/tests/Dev09_165853_tr1_tuple_swap/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 <string>
 #include <tuple>
 #include <utility>

tests/std/tests/Dev09_171205_tr1_assign_pair_to_tuple/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 <tuple>
 #include <utility>
 

tests/std/tests/Dev09_172505_tr1_bind_reference_wrapper/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;

tests/std/tests/Dev09_172666_tr1_tuple_odr/test.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <__msvc_all_public_headers.hpp>
-#include <assert.h>
+#include <cassert>
 
 namespace fs = std::experimental::filesystem;
 

tests/std/tests/Dev09_173612_tr1_regex_leak/test.cpp

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
+#include <cstddef>
+#include <cstdio>
+#include <cstdlib>
 #include <locale>
 #include <new>
 #include <regex>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 using namespace std;
 

tests/std/tests/Dev09_174589_tr1_function_storing_pmf_called_with_reference_or_pointer/test.cpp

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

tests/std/tests/Dev09_175314_tr1_reference_wrapper_assignment/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;

tests/std/tests/Dev09_175716_tr1_dereferencing_reference_wrapper/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;

tests/std/tests/Dev09_176467_tr1_make_tuple_from_string_literal/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 <string>
 #include <tuple>
 

tests/std/tests/Dev09_176498_tr1_binding_functors_with_non_const_fxn_call_ops/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;

tests/std/tests/Dev09_181509_tr1_inf_loop_uniform_int_ull/test.cpp

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cstdint>
 #include <execution>
 #include <random>
-#include <stdint.h>
 #include <vector>
 
 using namespace std;

tests/std/tests/Dev09_182017_tr1_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 <functional>
 #include <vector>
 

tests/std/tests/Dev09_186118_stoullx_corner_cases/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/Dev09_192736_tr1_prngs_not_copyconstructible/test.cpp

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

tests/std/tests/Dev09_196243_tr1_enable_shared_from_this_ops/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 <memory>
 
 using namespace std;

tests/std/tests/Dev09_199123_tr1_mem_fun_abstract_classes/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;

tests/std/tests/Dev10_441756_function_reference_wrapper/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 <random>
 

tests/std/tests/Dev10_445289_make_shared/test.cpp

@@ -2,12 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 #include <new>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 
 using namespace std;
 

tests/std/tests/Dev10_482830_header_only_string/test.cpp

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

tests/std/tests/Dev10_491486_floating_point_hash/test.cpp

@@ -3,9 +3,9 @@
 
 #include <algorithm>
 #include <array>
-#include <assert.h>
+#include <cassert>
+#include <cstring>
 #include <functional>
-#include <string.h>
 #include <type_traits>
 
 using namespace std;

tests/std/tests/Dev10_492345_tr1_function_swap/test.cpp

@@ -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 <functional>
 #include <new>
-#include <stddef.h>
 #include <tuple>
 #include <vector>
 

tests/std/tests/Dev10_498944_enable_shared_from_this_auto_ptr/test.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #define _HAS_AUTO_PTR_ETC 1
-#include <assert.h>
+#include <cassert>
 #include <memory>
 #include <utility>
 

tests/std/tests/Dev10_500860_overloaded_address_of/test.cpp

@@ -4,12 +4,12 @@
 #define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
 
 #include <array>
-#include <stddef.h>
-#include <stdlib.h>
+#include <cstddef>
+#include <cstdlib>
 #ifndef _M_CEE_PURE
 #include <atomic>
 #endif // _M_CEE_PURE
-#include <assert.h>
+#include <cassert>
 #include <deque>
 #include <exception>
 #include <forward_list>

tests/std/tests/Dev10_544258_heterogeneous_comparisons/test.cpp

@@ -6,7 +6,7 @@
 // family of functions"
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 #include <iterator>
 #include <utility>
 

tests/std/tests/Dev10_555491_complex_linker_errors/test.cpp

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
 #include <cmath>
 #include <complex>
+#include <cstdint>
+#include <cstring>
 #include <limits>
-#include <stdint.h>
-#include <string.h>
 #include <type_traits>
 
 using namespace std;

tests/std/tests/Dev10_561430_list_and_tree_leaks/test.cpp

@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdlib>
 #include <deque>
 #include <forward_list>
 #include <functional>
@@ -10,8 +12,6 @@
 #include <memory>
 #include <regex>
 #include <set>
-#include <stddef.h>
-#include <stdlib.h>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>

tests/std/tests/Dev10_562056_tree_leak/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 <deque>
 #include <list>
 #include <map>

tests/std/tests/Dev10_563443_empty_vector_begin_plus_zero/test.cpp

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <array>
-#include <assert.h>
+#include <cassert>
+#include <cstdlib>
 #include <deque>
-#include <stdlib.h>
 #include <string>
 #include <vector>
 

tests/std/tests/Dev10_567556_move_from_empty_list/test.cpp

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <array>
-#include <assert.h>
+#include <cassert>
+#include <cstdlib>
 #include <deque>
 #include <forward_list>
 #include <list>
 #include <map>
 #include <set>
-#include <stdlib.h>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>

tests/std/tests/Dev10_579381_vector_grow_to/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>
 #include <vector>
 

tests/std/tests/Dev10_590599_hash_string/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 <string>
 

tests/std/tests/Dev10_617014_tuple_tie/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 <string>
 #include <tuple>
 

tests/std/tests/Dev10_632876_regex_proxy/test.cpp

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
 #include <new>
 #include <regex>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
 
 using namespace std;
 

tests/std/tests/Dev10_635436_shared_ptr_reset/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 <memory>
 #include <string>
 #include <utility>

tests/std/tests/Dev10_639436_const_map_at/test.cpp

@@ -3,10 +3,10 @@
 
 #define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
 
-#include <assert.h>
+#include <cassert>
+#include <cstdlib>
 #include <hash_map>
 #include <map>
-#include <stdlib.h>
 #include <unordered_map>
 
 using namespace std;

tests/std/tests/Dev10_646244_bad_alloc_message/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 <cstring>
 #include <new>
-#include <string.h>
 
 using namespace std;
 

tests/std/tests/Dev10_646556_construct_tuple_from_const/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 <string>
 #include <tuple>
 #include <utility>

tests/std/tests/Dev10_654977_655012_shared_ptr_move/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 <memory>
 #include <string>
 #include <utility>

tests/std/tests/Dev10_661739_tuple_copy_ctors/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 <tuple>
 #include <utility>
 

tests/std/tests/Dev10_682964_stable_sort_warnings/test.cpp

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cstdlib>
 #include <random>
-#include <stdlib.h>
 #include <string>
 #include <vector>
 

tests/std/tests/Dev10_689595_back_inserter_vector_bool/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 <list>
 #include <vector>

tests/std/tests/Dev10_709166_checked_and_unchecked_array_iterator/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 <type_traits>
 #include <utility>

tests/std/tests/Dev10_709168_marking_iterators_as_checked/test.compile.pass.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <array>
+#include <cstddef>
 #include <deque>
 #include <filesystem>
 #include <forward_list>
@@ -10,7 +11,6 @@
 #include <map>
 #include <set>
 #include <span>
-#include <stddef.h>
 #include <string>
 #include <string_view>
 #include <type_traits>

tests/std/tests/Dev10_729003_bind_reference_wrapper/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 <string>
 

tests/std/tests/Dev10_766948_insert_ambiguity/test.cpp

@@ -4,7 +4,7 @@
 #define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 #include <hash_map>
 #include <hash_set>
 #include <map>

tests/std/tests/Dev10_780098_movable_elements/test.cpp

@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <assert.h>
+#include <cassert>
+#include <cstddef>
 #include <deque>
 #include <forward_list>
 #include <functional>
@@ -9,7 +10,6 @@
 #include <list>
 #include <memory>
 #include <set>
-#include <stddef.h>
 #include <unordered_set>
 #include <utility>
 #include <vector>

tests/std/tests/Dev10_783436_rvalue_string_plus/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 <string>
 
 using namespace std;

tests/std/tests/Dev10_809142_copy_n_istream_iterator/test.cpp

@@ -3,13 +3,13 @@
 
 #include <algorithm>
 #include <array>
-#include <assert.h>
+#include <cassert>
+#include <cstdlib>
 #include <forward_list>
 #include <iterator>
 #include <list>
 #include <memory>
 #include <sstream>
-#include <stdlib.h>
 #include <string>
 #include <vector>
 

tests/std/tests/Dev10_814245_regex_character_class_crash/test.cpp

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
 #include <regex>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string>
 
 #include <test_regex_support.hpp>

tests/std/tests/Dev10_816787_swap_vector_bool_elements/test.cpp

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

tests/std/tests/Dev10_847656_shared_ptr_is_convertible/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 <memory>
 
 using namespace std;

tests/std/tests/Dev10_851347_weak_ptr_virtual_inheritance/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 <memory>
 #include <utility>
 #ifndef _M_CEE_PURE // in /clr:pure we miss runtime coverage of weak_ptr converting constructor

tests/std/tests/Dev10_860410_bitset_ctors/test.cpp

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <algorithm>
-#include <assert.h>
 #include <bitset>
+#include <cassert>
+#include <cstdlib>
 #include <stdexcept>
-#include <stdlib.h>
 #include <string>
 
 using namespace std;

tests/std/tests/Dev10_860421_deque_push_back_pop_front/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 <deque>
 #include <vector>
 

tests/std/tests/Dev10_881629_vector_erase_return_value/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 <deque>
 #include <vector>
 

tests/std/tests/Dev10_904413_moved_from_function_should_be_empty/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 <utility>
 

tests/std/tests/Dev10_905461_is_sorted_until/test.cpp

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

tests/std/tests/Dev10_908702_string_memory_leak/test.cpp

@@ -3,7 +3,7 @@
 
 // REQUIRES: debug_CRT
 
-#include <assert.h>
+#include <cassert>
 #include <crtdbg.h>
 #include <locale>
 #include <new>

tests/std/tests/Dev10_909646_stringstream_vd2/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>
 
 using namespace std;

tests/std/tests/Dev11_0000000_dual_range_algorithms/test.cpp

@@ -3,13 +3,13 @@
 
 #include <algorithm>
 #include <array>
-#include <assert.h>
+#include <cassert>
+#include <cstdlib>
 #include <deque>
 #include <forward_list>
 #include <functional>
 #include <iterator>
 #include <list>
-#include <stdlib.h>
 #include <string>
 #include <utility>
 #include <vector>

tests/std/tests/Dev11_0000000_null_forward_iterators/test.cpp

@@ -5,7 +5,8 @@
 #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
 
 #include <array>
-#include <assert.h>
+#include <cassert>
+#include <cstring>
 #include <deque>
 #include <experimental/filesystem>
 #include <filesystem>
@@ -17,7 +18,6 @@
 #include <regex>
 #include <set>
 #include <span>
-#include <string.h>
 #include <string>
 #include <type_traits>
 #include <unordered_map>

tests/std/tests/Dev11_0000000_quoted/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 <iomanip>
 #include <iostream>
 #include <sstream>

tests/std/tests/Dev11_0000000_rotate_test/test.cpp

@@ -17,7 +17,7 @@
 // -5- Complexity: At most last - first swaps.
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 #include <forward_list>
 #include <iterator>
 #include <list>

tests/std/tests/Dev11_0000000_tuple_cat/test.cpp

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

tests/std/tests/Dev11_0000000_user_defined_literals/test.cpp

@@ -8,7 +8,7 @@
 
 #include <algorithm>
 #include <array>
-#include <assert.h>
+#include <cassert>
 #include <chrono>
 #include <complex>
 #include <cstddef>

tests/std/tests/Dev11_0019127_singular_iterators/test.cpp

@@ -14,7 +14,7 @@
 // a value-initialized iterator as the source of a copy or move operation."
 
 #include <array>
-#include <assert.h>
+#include <cassert>
 #include <deque>
 #include <forward_list>
 #include <list>