From b905670d8259bf690e88e26a41e1b6670b9ea422 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 8 Jun 2018 01:06:38 +0200 Subject: [PATCH] Silence gcc-8 warnings in bundled TBB --- bundled/tbb-2018_U2/include/tbb/concurrent_vector.h | 2 +- .../include/tbb/internal/_concurrent_unordered_impl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundled/tbb-2018_U2/include/tbb/concurrent_vector.h b/bundled/tbb-2018_U2/include/tbb/concurrent_vector.h index 274ab43165..318b538fc5 100644 --- a/bundled/tbb-2018_U2/include/tbb/concurrent_vector.h +++ b/bundled/tbb-2018_U2/include/tbb/concurrent_vector.h @@ -74,7 +74,7 @@ namespace internal { //! Exception helper function template void handle_unconstructed_elements(T* array, size_t n_of_elements){ - std::memset( array, 0, n_of_elements * sizeof( T ) ); + std::memset( (void*)array, 0, n_of_elements * sizeof( T ) ); } //! Base class of concurrent vector implementation. diff --git a/bundled/tbb-2018_U2/include/tbb/internal/_concurrent_unordered_impl.h b/bundled/tbb-2018_U2/include/tbb/internal/_concurrent_unordered_impl.h index 38e1ec67ae..3caa9bae8f 100644 --- a/bundled/tbb-2018_U2/include/tbb/internal/_concurrent_unordered_impl.h +++ b/bundled/tbb-2018_U2/include/tbb/internal/_concurrent_unordered_impl.h @@ -1468,7 +1468,7 @@ private: if (my_buckets[segment] == NULL) { size_type sz = segment_size(segment); raw_iterator * new_segment = my_allocator.allocate(sz); - std::memset(new_segment, 0, sz*sizeof(raw_iterator)); + std::memset((void*)new_segment, 0, sz*sizeof(raw_iterator)); if (my_buckets[segment].compare_and_swap( new_segment, NULL) != NULL) my_allocator.deallocate(new_segment, sz); -- 2.39.5