[PATCH] D78400: Fix DenseMapIterator for C++20 compliance

[Jean-Michaël Celerier via Phabricator via llvm-commits]

jcelerier created this revision.
jcelerier added a project: LLVM.
Herald added subscribers: llvm-commits, dexonsmith.

C++20 has stricter requirements regarding comparison operators :
the conversion-inducing (in the non-const_iterator case) `operator==(const DenseMapIterator&) const;` 
creates ambiguousness with  `operator!=(const DenseMapIterator&) const;`.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D78400

Files:
  llvm/include/llvm/ADT/DenseMap.h


Index: llvm/include/llvm/ADT/DenseMap.h
===================================================================
--- llvm/include/llvm/ADT/DenseMap.h
+++ llvm/include/llvm/ADT/DenseMap.h
@@ -1213,14 +1213,14 @@
     return Ptr;
   }
 
-  bool operator==(const ConstIterator &RHS) const {
+  bool operator==(const DenseMapIterator &RHS) const {
     assert((!Ptr || isHandleInSync()) && "handle not in sync!");
     assert((!RHS.Ptr || RHS.isHandleInSync()) && "handle not in sync!");
     assert(getEpochAddress() == RHS.getEpochAddress() &&
            "comparing incomparable iterators!");
     return Ptr == RHS.Ptr;
   }
-  bool operator!=(const ConstIterator &RHS) const {
+  bool operator!=(const DenseMapIterator &RHS) const {
     assert((!Ptr || isHandleInSync()) && "handle not in sync!");
     assert((!RHS.Ptr || RHS.isHandleInSync()) && "handle not in sync!");
     assert(getEpochAddress() == RHS.getEpochAddress() &&


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D78400.258413.patch
Type: text/x-patch
Size: 927 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200417/f78be24e/attachment.bin>