Index: test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp =================================================================== --- test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp +++ test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate.pass.cpp @@ -17,6 +17,7 @@ // }; #include +#include #include template @@ -27,12 +28,12 @@ value_type* allocate(std::size_t n) { assert(n == 10); - return (value_type*)0xDEADBEEF; + return reinterpret_cast(static_cast(0xDEADBEEF)); } }; int main() { A a; - assert(std::allocator_traits >::allocate(a, 10) == (int*)0xDEADBEEF); + assert(std::allocator_traits >::allocate(a, 10) == reinterpret_cast(static_cast(0xDEADBEEF))); } Index: test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp =================================================================== --- test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp +++ test/std/utilities/memory/allocator.traits/allocator.traits.members/allocate_hint.pass.cpp @@ -17,6 +17,7 @@ // }; #include +#include #include template @@ -27,7 +28,7 @@ value_type* allocate(std::size_t n) { assert(n == 10); - return (value_type*)0xDEADBEEF; + return reinterpret_cast(static_cast(0xDEADBEEF)); } }; @@ -39,13 +40,13 @@ value_type* allocate(std::size_t n) { assert(n == 12); - return (value_type*)0xEEADBEEF; + return reinterpret_cast(static_cast(0xEEADBEEF)); } value_type* allocate(std::size_t n, const void* p) { assert(n == 11); assert(p == 0); - return (value_type*)0xFEADBEEF; + return reinterpret_cast(static_cast(0xFEADBEEF)); } }; @@ -53,8 +54,8 @@ { #ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE A a; - assert(std::allocator_traits >::allocate(a, 10, nullptr) == (int*)0xDEADBEEF); + assert(std::allocator_traits >::allocate(a, 10, nullptr) == reinterpret_cast(static_cast(0xDEADBEEF))); #endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE B b; - assert(std::allocator_traits >::allocate(b, 11, nullptr) == (int*)0xFEADBEEF); + assert(std::allocator_traits >::allocate(b, 11, nullptr) == reinterpret_cast(static_cast(0xFEADBEEF))); } Index: test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp =================================================================== --- test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp +++ test/std/utilities/memory/allocator.traits/allocator.traits.members/deallocate.pass.cpp @@ -17,6 +17,7 @@ // }; #include +#include #include int called = 0; @@ -28,7 +29,7 @@ void deallocate(value_type* p, std::size_t n) { - assert(p == (value_type*)0xDEADBEEF); + assert(p == reinterpret_cast(static_cast(0xDEADBEEF))); assert(n == 10); ++called; } @@ -37,6 +38,6 @@ int main() { A a; - std::allocator_traits >::deallocate(a, (int*)0xDEADBEEF, 10); + std::allocator_traits >::deallocate(a, reinterpret_cast(static_cast(0xDEADBEEF)), 10); assert(called == 1); }