diff options
Diffstat (limited to 'dev-util/mdds/files')
-rw-r--r-- | dev-util/mdds/files/mdds-1.7.0-bashism.patch | 75 | ||||
-rw-r--r-- | dev-util/mdds/files/mdds-1.7.0-rtree_test.patch | 52 |
2 files changed, 0 insertions, 127 deletions
diff --git a/dev-util/mdds/files/mdds-1.7.0-bashism.patch b/dev-util/mdds/files/mdds-1.7.0-bashism.patch deleted file mode 100644 index 3e94f32e8f8b..000000000000 --- a/dev-util/mdds/files/mdds-1.7.0-bashism.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 65da7c25f4d8204b1379a0afb46d82dc1b263ab0 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 28 May 2020 18:36:07 +0200 -Subject: [PATCH] Fix bashisms in configure.ac - ---- - configure.ac | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 00ab937..2282165 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -32,7 +32,7 @@ AC_ARG_ENABLE(debug-stdcxx, - ] - ,debug_stdcxx=yes) - --AS_IF([test x"$debug_stdcxx" == "xyes"], [ -+AS_IF([test x"$debug_stdcxx" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -D_GLIBCXX_DEBUG" - ]) - -@@ -42,7 +42,7 @@ AC_ARG_ENABLE(release-tests, - ] - ,release_tests=yes) - --AS_IF([test x"$release_tests" == "xyes"], [ -+AS_IF([test x"$release_tests" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -DNDEBUG -O2" - ]) - -@@ -56,11 +56,11 @@ AC_ARG_ENABLE(loop-unrolling, - [enable_loop_unrolling="$enableval"],[enable_loop_unrolling=yes] - ) - --AS_IF([test x"$enable_loop_unrolling" == "xno"], [ -+AS_IF([test x"$enable_loop_unrolling" = "xno"], [ - CXXFLAGS="$CXXFLAGS -DMDDS_LOOP_UNROLLING=0" - ]) - --AS_IF([test x"$enable_gcov" == "xyes"], [ -+AS_IF([test x"$enable_gcov" = "xyes"], [ - CXXFLAGS="$CXXFLAGS --coverage -O0" - ]) - -@@ -69,7 +69,7 @@ AC_ARG_ENABLE(openmp, - [enable_openmp="$enableval"],[enable_openmp=yes] - ) - --AS_IF([test x"$enable_openmp" == "xyes"], [ -+AS_IF([test x"$enable_openmp" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -fopenmp -DMDDS_USE_OPENMP=1" - LDFLAGS="$LDFLAGS -fopenmp" - ]) -@@ -79,7 +79,7 @@ AC_ARG_ENABLE(sanitizer-coverage, - [enable_sanitizer_coverage="$enableval"],[enable_sanitizer_coverage=no] - ) - --AS_IF([test x"$enable_sanitizer_coverage" == "xyes"], [ -+AS_IF([test x"$enable_sanitizer_coverage" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -fprofile-instr-generate -fcoverage-mapping -O0" - ]) - -@@ -122,7 +122,7 @@ AC_ARG_ENABLE([werror], - [enable_werror="$enableval"], - [enable_werror=no] - ) --AS_IF([test x"$enable_werror" == "xyes"], [ -+AS_IF([test x"$enable_werror" = "xyes"], [ - CXXFLAGS="$CXXFLAGS -Werror" - ]) - --- -2.26.2 - diff --git a/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch b/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch deleted file mode 100644 index 391f89798915..000000000000 --- a/dev-util/mdds/files/mdds-1.7.0-rtree_test.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7ab81002fe127d16602b85b391c1d1b0422a9afd Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida <kohei.yoshida@gmail.com> -Date: Mon, 14 Jun 2021 22:52:14 -0400 -Subject: [PATCH] std::deque::erase invalidates all elements if the erased - element ... - -... is not the first or the last element. My previous assumption ( -that only the elements that occur after the erased element become -invalid) was in fact wrong. - -This should resolve #66. ---- - include/mdds/rtree_def.inl | 21 ++++++++++++--------- - 1 file changed, 12 insertions(+), 9 deletions(-) - -diff --git a/include/mdds/rtree_def.inl b/include/mdds/rtree_def.inl -index ed0e9be..84f0673 100644 ---- a/include/mdds/rtree_def.inl -+++ b/include/mdds/rtree_def.inl -@@ -836,17 +836,20 @@ bool rtree<_Key,_Value,_Trait>::directory_node::erase(const node_store* ns) - if (it == children.end()) - return false; - -- it = children.erase(it); -+ // NB: std::deque::erase invalidates all elements when the erased element -+ // is somwhere in the middle. But if the erased element is either the -+ // first or the last element, only the erased element becomes invalidated. - -- // All nodes that occur after the erased node have their memory addresses -- // shifted. -+ std::size_t pos = std::distance(children.begin(), it); -+ bool all_valid = pos == 0 || pos == children.size() - 1; - -- std::for_each(it, children.end(), -- [](node_store& this_ns) -- { -- this_ns.valid_pointer = false; -- } -- ); -+ it = children.erase(it); -+ -+ if (!all_valid) -+ { -+ for (node_store& ns : children) -+ ns.valid_pointer = false; -+ } - - return true; - } --- -GitLab - |