suppress unused warning and avoid call == when always equal

uxlfoundation · Oct 3, 2024 · 0767ceb · 0767ceb
1 parent d129813
commit 0767ceb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/include/oneapi/tbb/concurrent_queue.h b/include/oneapi/tbb/concurrent_queue.h
@@ -237,7 +237,7 @@ class concurrent_queue {
 
 private:
     void internal_swap(concurrent_queue& src) {
-        if (!allocator_traits_type::queue_allocator_traits::propagate_on_container)
+        if (!queue_allocator_traits::propagate_on_container_swap::value)
             __TBB_ASSERT(my_allocator == src.my_allocator, "Swapping with unequal allocators is not allowed");
         using std::swap;
         swap(my_queue_representation, src.my_queue_representation);

diff --git a/include/oneapi/tbb/detail/_allocator_traits.h b/include/oneapi/tbb/detail/_allocator_traits.h
@@ -93,7 +93,11 @@ void swap_allocators_impl( Allocator& lhs, Allocator& rhs, /*pocs = */ std::true
 template <typename Allocator>
 void swap_allocators_impl( Allocator& lhs, Allocator& rhs, /*pocs = */ std::false_type ) {
     // If the lhs and rhs are not equal, the behavior is undefined
-    __TBB_ASSERT(lhs == rhs, "Swapping with unequal allocators is not allowed");
+    if (!allocator_traits<Allocator>::is_always_equal::value) {
+        __TBB_ASSERT(lhs == rhs, "Swapping with unequal allocators is not allowed");
+    }
+    tbb::detail::suppress_unused_warning(lhs);
+    tbb::detail::suppress_unused_warning(rhs);
 }
 
 // Swaps allocators only if propagate_on_container_swap is true