Author: dim
Date: Wed Mar 6 18:19:27 2019
New Revision: 344852
URL: https://svnweb.freebsd.org/changeset/base/344852
Log:
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
Modified:
head/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h
Modified: head/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h
==============================================================================
--- head/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h Wed Mar
6 17:41:12 2019 (r344851)
+++ head/contrib/llvm/tools/lldb/include/lldb/Target/MemoryRegionInfo.h Wed Mar
6 18:19:27 2019 (r344852)
@@ -125,7 +125,7 @@ inline bool operator<(lldb::addr_t lhs, const MemoryRe
// 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;
};
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
