You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by al...@apache.org on 2018/02/24 20:29:31 UTC
kudu git commit: [thirdparty] fix gperftools build on Mac OS X
Repository: kudu
Updated Branches:
refs/heads/master 00815045f -> 03e49899a
[thirdparty] fix gperftools build on Mac OS X
The recently introduced large-span-search patch didn't comply
with build-time checks enforced by the C++ compiler from the dev
toolchain on Mac OS X version 10.13.2 (a.k.a. High Sierra). The
build error was:
In file included from thirdparty/src/gperftools-2.6.3/src/central_freelist.cc:36:
In file included from thirdparty/src/gperftools-2.6.3/src/central_freelist.h:45:
In file included from thirdparty/src/gperftools-2.6.3/src/span.h:40:
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/set:412:5: error:
static_assert failed "Allocator::value_type must be same type as
value_type"
static_assert((is_same<typename allocator_type::value_type, value_type>::value),
This patch fixes the issue.
Change-Id: Iff3e3a5dd50541c8eba48e7e6aa917d649e54931
Reviewed-on: http://gerrit.cloudera.org:8080/9444
Tested-by: Kudu Jenkins
Reviewed-by: Todd Lipcon <to...@apache.org>
Reviewed-by: Will Berkeley <wd...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/03e49899
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/03e49899
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/03e49899
Branch: refs/heads/master
Commit: 03e49899a6bbd2ccc3559900ae67e23bffd8498e
Parents: 0081504
Author: Alexey Serbin <as...@cloudera.com>
Authored: Sat Feb 24 09:43:18 2018 -0800
Committer: Alexey Serbin <as...@cloudera.com>
Committed: Sat Feb 24 20:27:36 2018 +0000
----------------------------------------------------------------------
...perftools-Implemented-O-log-n-searching-among-large-spans.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kudu/blob/03e49899/thirdparty/patches/gperftools-Implemented-O-log-n-searching-among-large-spans.patch
----------------------------------------------------------------------
diff --git a/thirdparty/patches/gperftools-Implemented-O-log-n-searching-among-large-spans.patch b/thirdparty/patches/gperftools-Implemented-O-log-n-searching-among-large-spans.patch
index 87ab134..9a840ee 100644
--- a/thirdparty/patches/gperftools-Implemented-O-log-n-searching-among-large-spans.patch
+++ b/thirdparty/patches/gperftools-Implemented-O-log-n-searching-among-large-spans.patch
@@ -416,7 +416,7 @@ index 83feda1..4e343ba 100644
+ Span* span;
+ Length length;
+};
-+typedef std::set<SpanPtrWithLength, SpanBestFitLess, STLPageHeapAllocator<Span*, void> > SpanSet;
++typedef std::set<SpanPtrWithLength, SpanBestFitLess, STLPageHeapAllocator<SpanPtrWithLength, void> > SpanSet;
+
+// Comparator for best-fit search, with address order as a tie-breaker.
+struct SpanBestFitLess {