[Mlir-commits] [mlir] 9991f0e - [mlir] Fix windows build after D113511

[River Riddle]

Author: River Riddle
Date: 2021-11-11T05:17:05Z
New Revision: 9991f0e40ec80efdae7c2a051125a3e5e25159e9

URL: https://github.com/llvm/llvm-project/commit/9991f0e40ec80efdae7c2a051125a3e5e25159e9
DIFF: https://github.com/llvm/llvm-project/commit/9991f0e40ec80efdae7c2a051125a3e5e25159e9.diff

LOG: [mlir] Fix windows build after D113511

Added: 
    

Modified: 
    mlir/include/mlir/IR/BuiltinAttributes.h
    mlir/include/mlir/IR/DialectInterface.h
    mlir/include/mlir/IR/TypeRange.h
    mlir/include/mlir/IR/UseDefLists.h

Removed: 
    


################################################################################
diff  --git a/mlir/include/mlir/IR/BuiltinAttributes.h b/mlir/include/mlir/IR/BuiltinAttributes.h
index db58d58d5453..969bb9574834 100644
--- a/mlir/include/mlir/IR/BuiltinAttributes.h
+++ b/mlir/include/mlir/IR/BuiltinAttributes.h
@@ -503,7 +503,9 @@ class DenseElementsAttr : public Attribute {
   struct DerivedAttributeElementIterator
       : public llvm::mapped_iterator_base<DerivedAttributeElementIterator<T>,
                                           AttributeElementIterator, T> {
-    using DerivedAttributeElementIterator::BaseT::BaseT;
+    using llvm::mapped_iterator_base<DerivedAttributeElementIterator<T>,
+                                     AttributeElementIterator,
+                                     T>::mapped_iterator_base;
 
     /// Map the element to the iterator result type.
     T mapElement(Attribute attr) const { return attr.cast<T>(); }

diff  --git a/mlir/include/mlir/IR/DialectInterface.h b/mlir/include/mlir/IR/DialectInterface.h
index e58be464e921..3ffed3d932d9 100644
--- a/mlir/include/mlir/IR/DialectInterface.h
+++ b/mlir/include/mlir/IR/DialectInterface.h
@@ -115,7 +115,9 @@ class DialectInterfaceCollectionBase {
       : public llvm::mapped_iterator_base<iterator<InterfaceT>,
                                           InterfaceVectorT::const_iterator,
                                           const InterfaceT &> {
-    using iterator::BaseT::BaseT;
+    using llvm::mapped_iterator_base<iterator<InterfaceT>,
+                                     InterfaceVectorT::const_iterator,
+                                     const InterfaceT &>::mapped_iterator_base;
 
     /// Map the element to the iterator result type.
     const InterfaceT &mapElement(const DialectInterface *interface) const {

diff  --git a/mlir/include/mlir/IR/TypeRange.h b/mlir/include/mlir/IR/TypeRange.h
index ad4ec67f19c2..bca21ac3736c 100644
--- a/mlir/include/mlir/IR/TypeRange.h
+++ b/mlir/include/mlir/IR/TypeRange.h
@@ -127,7 +127,8 @@ class ValueTypeIterator final
     : public llvm::mapped_iterator_base<ValueTypeIterator<ValueIteratorT>,
                                         ValueIteratorT, Type> {
 public:
-  using ValueTypeIterator::BaseT::BaseT;
+  using llvm::mapped_iterator_base<ValueTypeIterator<ValueIteratorT>,
+                                   ValueIteratorT, Type>::mapped_iterator_base;
 
   /// Map the element to the iterator result type.
   Type mapElement(Value value) const { return value.getType(); }

diff  --git a/mlir/include/mlir/IR/UseDefLists.h b/mlir/include/mlir/IR/UseDefLists.h
index d27ee58d295b..845e403edcfb 100644
--- a/mlir/include/mlir/IR/UseDefLists.h
+++ b/mlir/include/mlir/IR/UseDefLists.h
@@ -285,7 +285,9 @@ class ValueUserIterator final
           ValueUserIterator<UseIteratorT, OperandType>, UseIteratorT,
           Operation *> {
 public:
-  using ValueUserIterator::BaseT::BaseT;
+  using llvm::mapped_iterator_base<ValueUserIterator<UseIteratorT, OperandType>,
+                                   UseIteratorT,
+                                   Operation *>::mapped_iterator_base;
 
   /// Map the element to the iterator result type.
   Operation *mapElement(OperandType &value) const { return value.getOwner(); }