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
This commit is contained in:
parent
5c25fe9464
commit
4beee10792
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/clang1100-import/; revision=363969
@ -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;
|
||||
};
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user