diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2019-03-06 18:19:27 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2019-03-06 18:19:27 +0000 |
commit | 01c21ea0a76239be3b2ee6399dc55220174a67b3 (patch) | |
tree | c6acc829c94dbe44ccf6167b0e038a867c878fea /contrib/llvm/tools | |
parent | 1e61b940491ebb0bd920d00e477ff7fa919c546d (diff) |
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<class _InputIterator> lldb_private::MemoryRegionInfos::MemoryRegionInfos(_InputIterator, _InputIterator, const allocator_type&)' inherited from 'std::__1::vector<lldb_private::MemoryRegionInfo>'
using std::vector<lldb_private::MemoryRegionInfo>::vector;
^~~~~~
/workspace/src/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h:128:54: error: conflicts with version inherited from 'std::__1::vector<lldb_private::MemoryRegionInfo>'
Reported by: CI
Notes
Notes:
svn path=/head/; revision=344852
Diffstat (limited to 'contrib/llvm/tools')
-rw-r--r-- | contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h b/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h index a57c4678bb37..7745098af572 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<lldb_private::MemoryRegionInfo> { public: - using std::vector<lldb_private::MemoryRegionInfo>::vector; + //using std::vector<lldb_private::MemoryRegionInfo>::vector; }; } |