- up to 12.2.1

[packages/dyninst.git] / dyninst-tbb.patch

diff --git a/dyninst-tbb.patch b/dyninst-tbb.patch
index 701869e5ade31a0a774d72adf03441e2490263eb..f32f2a69a592753c463c80d931322bb10cd0d3f5 100644 (file)
--- a/dyninst-tbb.patch
+++ b/dyninst-tbb.patch
@@ -10,40 +10,3 @@
      foreach(f IN ITEMS ${_version_files})
          if(EXISTS ${f})
              set(_version_file ${f})
-diff --color -ur dyninst-12.0.1.orig/common/h/concurrent.h dyninst-12.0.1/common/h/concurrent.h
---- dyninst-12.0.1.orig/common/h/concurrent.h  2021-11-23 22:48:27.000000000 +0100
-+++ dyninst-12.0.1/common/h/concurrent.h       2021-12-20 00:43:49.261018867 +0100
-@@ -54,10 +54,10 @@
- 
- template<typename K, typename V>
- class dyn_c_hash_map : protected tbb::concurrent_hash_map<K, V,
--    tbb::tbb_hash_compare<K>, std::allocator<std::pair<K,V>>> {
-+    tbb::tbb_hash_compare<K>, std::allocator<std::pair<const K,V>>> {
- 
-     typedef tbb::concurrent_hash_map<K, V,
--        tbb::tbb_hash_compare<K>, std::allocator<std::pair<K,V>>> base;
-+        tbb::tbb_hash_compare<K>, std::allocator<std::pair<const K,V>>> base;
- public:
-     using typename base::value_type;
-     using typename base::mapped_type;
-diff --color -ur dyninst-12.0.1.orig/symtabAPI/src/dwarfWalker.h dyninst-12.0.1/symtabAPI/src/dwarfWalker.h
---- dyninst-12.0.1.orig/symtabAPI/src/dwarfWalker.h    2021-11-23 22:48:27.000000000 +0100
-+++ dyninst-12.0.1/symtabAPI/src/dwarfWalker.h 2021-12-20 00:46:32.186998418 +0100
-@@ -36,6 +36,8 @@
- }
- 
- namespace tbb {
-+namespace detail {
-+namespace d1 {
-     using namespace Dyninst::SymtabAPI;
-     template<>
-     struct tbb_hash_compare<type_key> {
-@@ -51,6 +53,8 @@
-         }
-     };
- }
-+}
-+}
- 
- namespace Dyninst {
- namespace SymtabAPI {