C++: Undo the iterator.qll change. Notice that it was 'and' not 'or'.

geoffw0 · geoffw0 · commit b79ca4535abd · 2020-12-10T18:29:39.000Z
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/Iterator.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/Iterator.qll
@@ -31,9 +31,11 @@ private class IteratorTraits extends Class {
  */
 private class IteratorByTypedefs extends Iterator, Class {
   IteratorByTypedefs() {
-    this.getAMember()
-        .(TypedefType)
-        .hasName(["difference_type", "value_type", "pointer", "reference", "iterator_category"]) and
+    this.getAMember().(TypedefType).hasName("difference_type") and
+    this.getAMember().(TypedefType).hasName("value_type") and
+    this.getAMember().(TypedefType).hasName("pointer") and
+    this.getAMember().(TypedefType).hasName("reference") and
+    this.getAMember().(TypedefType).hasName("iterator_category") and
     not this.hasQualifiedName("std", "iterator_traits")
   }
 }
