From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Thu, 7 Jun 2018 23:06:38 +0000 (+0200)
Subject: Silence gcc-8 warnings in bundled TBB
X-Git-Tag: v9.1.0-rc1~1058^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6731%2Fhead;p=dealii.git

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 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<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 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);