Fix errors in bundled packages

diff --git a/bundled/boost-1.70.0/include/boost/graph/depth_first_search.hpp b/bundled/boost-1.70.0/include/boost/graph/depth_first_search.hpp
index cf60e1ac843bc6abc66bd5ff619f418ede2f3a01..e9b41bcf71cf3f631b3634eedef451d13991712d 100644 (file)
--- a/bundled/boost-1.70.0/include/boost/graph/depth_first_search.hpp
+++ b/bundled/boost-1.70.0/include/boost/graph/depth_first_search.hpp
@@ -156,7 +156,7 @@ namespace boost {
           ColorValue v_color = get(color, v);
           if (v_color == Color::white()) {
             vis.tree_edge(*ei, g);
-            src_e = *ei;
+            src_e = decltype(src_e)(*ei);
             stack.push_back(std::make_pair(u, std::make_pair(src_e, std::make_pair(++ei, ei_end))));
             u = v;
             put(color, u, Color::gray());

diff --git a/bundled/tbb-2018_U2/src/tbb/cache_aligned_allocator.cpp b/bundled/tbb-2018_U2/src/tbb/cache_aligned_allocator.cpp
index e1e87132066d823fcfcca749417efca24989eba2..21cb209ee58372633882814a41ba7b76517253fe 100644 (file)
--- a/bundled/tbb-2018_U2/src/tbb/cache_aligned_allocator.cpp
+++ b/bundled/tbb-2018_U2/src/tbb/cache_aligned_allocator.cpp
@@ -248,9 +248,10 @@ bool __TBB_EXPORTED_FUNC is_malloc_used_v3() {
     }
     __TBB_ASSERT( MallocHandler!=&DummyMalloc && FreeHandler!=&DummyFree, NULL );
     // Cast to void avoids type mismatch errors on some compilers (e.g. __IBMCPP__)
-    __TBB_ASSERT( !(((void*)MallocHandler==(void*)&malloc) ^ ((void*)FreeHandler==(void*)&free)),
+    __TBB_ASSERT( !(((void*)MallocHandler==(void*)static_cast<void*(*)(size_t)>(malloc)) ^
+                    ((void*)FreeHandler==(void*)static_cast<void(*)(void*)>(free))),
                   "Both shim pointers must refer to routines from the same package (either TBB or CRT)" );
-    return (void*)MallocHandler == (void*)&malloc;
+    return (void*)MallocHandler == (void*)static_cast<void*(*)(size_t)>(malloc);
 }
 
 } // namespace internal