Merge pull request #316 from nigels-com/ifdef__cpp_sized_deallocation

igaztanaga · web-flow · commit d618e482a8a0 · 2025-09-06T12:20:07.000+02:00
__cpp_sized_deallocation is not always defined (clang is opt-in) for Issue #306
diff --git a/include/boost/container/new_allocator.hpp b/include/boost/container/new_allocator.hpp
@@ -163,7 +163,7 @@ class new_allocator
    void deallocate(pointer ptr, size_type n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       (void)n;
-      # if __cpp_sized_deallocation
+      # if defined(__cpp_sized_deallocation)
       ::operator delete((void*)ptr, n * sizeof(T));
       #else
       ::operator delete((void*)ptr);
diff --git a/test/allocator_argument_tester.hpp b/test/allocator_argument_tester.hpp
@@ -74,7 +74,7 @@ class propagation_test_allocator
    void deallocate(value_type *ptr, std::size_t n)
    {
       (void)n;
-      # if __cpp_sized_deallocation
+      # if defined(__cpp_sized_deallocation)
       ::operator delete((void*)ptr, n * sizeof(value_type));
       #else
       ::operator delete((void*)ptr);
diff --git a/test/dummy_test_allocator.hpp b/test/dummy_test_allocator.hpp
@@ -65,7 +65,7 @@ class simple_allocator
    void deallocate(T *ptr, std::size_t n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       (void)n;
-      # if __cpp_sized_deallocation
+      # if defined(__cpp_sized_deallocation)
       ::operator delete((void*)ptr, n * sizeof(T));
       #else
       ::operator delete((void*)ptr);
@@ -187,7 +187,7 @@ class propagation_test_allocator
    void deallocate(T *ptr, std::size_t n) BOOST_NOEXCEPT_OR_NOTHROW
    {
       (void)n;
-      # if __cpp_sized_deallocation
+      # if defined(__cpp_sized_deallocation)
       ::operator delete((void*)ptr, n * sizeof(T));
       #else
       ::operator delete((void*)ptr);
diff --git a/test/explicit_inst_vector_test.cpp b/test/explicit_inst_vector_test.cpp
@@ -38,7 +38,7 @@ class CustomAllocator
 	void deallocate(pointer ptr, size_type n)
    {
       (void)n;
-      # if __cpp_sized_deallocation
+      # if defined(__cpp_sized_deallocation)
       ::operator delete((void*)ptr, n * sizeof(value_type));
       #else
       ::operator delete((void*)ptr);

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ class new_allocator`
`163`	`163`	`void deallocate(pointer ptr, size_type n) BOOST_NOEXCEPT_OR_NOTHROW`
`164`	`164`	`{`
`165`	`165`	`(void)n;`
`166`		`- # if __cpp_sized_deallocation`
	`166`	`+ # if defined(__cpp_sized_deallocation)`
`167`	`167`	`::operator delete((void)ptr, n sizeof(T));`
`168`	`168`	`#else`
`169`	`169`	`::operator delete((void*)ptr);`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class propagation_test_allocator`
`74`	`74`	`void deallocate(value_type *ptr, std::size_t n)`
`75`	`75`	`{`
`76`	`76`	`(void)n;`
`77`		`- # if __cpp_sized_deallocation`
	`77`	`+ # if defined(__cpp_sized_deallocation)`
`78`	`78`	`::operator delete((void)ptr, n sizeof(value_type));`
`79`	`79`	`#else`
`80`	`80`	`::operator delete((void*)ptr);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class CustomAllocator`
`38`	`38`	`void deallocate(pointer ptr, size_type n)`
`39`	`39`	`{`
`40`	`40`	`(void)n;`
`41`		`- # if __cpp_sized_deallocation`
	`41`	`+ # if defined(__cpp_sized_deallocation)`
`42`	`42`	`::operator delete((void)ptr, n sizeof(value_type));`
`43`	`43`	`#else`
`44`	`44`	`::operator delete((void*)ptr);`