diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2020-08-06 16:27:24 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2020-08-06 16:27:24 +0000 |
| commit | 4beee107921198ecca69a26d70533b36e96bb21c (patch) | |
| tree | dbfbb0329755ae4a2bd3c2155026650ecd161a7e | |
| parent | 5c25fe9464cd01388704412b96df78a0e5fa8f74 (diff) | |
| download | src-4beee107921198ecca69a26d70533b36e96bb21c.tar.gz src-4beee107921198ecca69a26d70533b36e96bb21c.zip | |
Reapply r344852:
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=/projects/clang1100-import/; revision=363969
| -rw-r--r-- | contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h b/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h index a22da8d72b83..9f089b4b0083 100644 --- a/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h +++ b/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h @@ -126,7 +126,7 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, // 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; }; } |