From 01c21ea0a76239be3b2ee6399dc55220174a67b3 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Wed, 6 Mar 2019 18:19:27 +0000 Subject: [PATCH] Put in a temporary workaround for what is likely a gcc 6 bug (it does not occur with gcc 7 or later). This should prevent the following error from breaking the head-amd64-gcc CI builds: In file included from /workspace/src/contrib/llvm/tools/lldb/source/API/SBMemoryRegionInfo.cpp:14:0: /workspace/src/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h:128:54: error: 'template lldb_private::MemoryRegionInfos::MemoryRegionInfos(_InputIterator, _InputIterator, const allocator_type&)' inherited from 'std::__1::vector' using std::vector::vector; ^~~~~~ /workspace/src/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h:128:54: error: conflicts with version inherited from 'std::__1::vector' Reported by: CI --- contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h b/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h index a57c4678bb3..7745098af57 100644 --- a/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h +++ b/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h @@ -125,7 +125,7 @@ inline bool operator<(lldb::addr_t lhs, const MemoryRegionInfo &rhs) { // Forward-declarable wrapper. class MemoryRegionInfos : public std::vector { public: - using std::vector::vector; + //using std::vector::vector; }; }