svn commit: r363969 - projects/clang1100-import/contrib/llvm-project/lldb/include/lldb/Target

[Dimitry Andric]

Author: dim
Date: Thu Aug  6 16:27:24 2020
New Revision: 363969
URL: https://svnweb.freebsd.org/changeset/base/363969

Log:
  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

Modified:
  projects/clang1100-import/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h

Modified: projects/clang1100-import/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h
==============================================================================
--- projects/clang1100-import/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h	Thu Aug  6 16:25:56 2020	(r363968)
+++ projects/clang1100-import/contrib/llvm-project/lldb/include/lldb/Target/MemoryRegionInfo.h	Thu Aug  6 16:27:24 2020	(r363969)
@@ -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;
 };
 
 }