Silence gcc-8 warnings in bundled TBB

diff --git a/bundled/tbb-2018_U2/include/tbb/concurrent_vector.h b/bundled/tbb-2018_U2/include/tbb/concurrent_vector.h
index 274ab43165ff449d519e82cd2716114ae78665f1..318b538fc59ed3a39352e5c72f2a32ab195c1461 100644 (file)
--- 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<typename T>
     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 38e1ec67aed9971e736e91f13370779d3a993e18..3caa9bae8fe03731401382d2099495015d4ce8b9 100644 (file)
--- 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);