2 files changed, 11 insertions, 11 deletions

diff --git a/util/generic/hash_table.h b/util/generic/hash_table.h
index 31e245339e..a09c5e73d6 100644
--- a/util/generic/hash_table.h
+++ b/util/generic/hash_table.h
@@ -88,11 +88,11 @@ struct __yhashtable_iterator {
     }
     iterator& operator++();
     iterator operator++(int);
-    bool operator==(const iterator& it) const {
-        return cur == it.cur;
+    friend bool operator==(const iterator& l, const iterator& r) {
+        return l.cur == r.cur;
     }
-    bool operator!=(const iterator& it) const {
-        return cur != it.cur;
+    friend bool operator!=(const iterator& l, const iterator& r) {
+        return l.cur != r.cur;
     }
     bool IsEnd() const {
         return !cur;
@@ -135,11 +135,11 @@ struct __yhashtable_const_iterator {
     }
     const_iterator& operator++();
     const_iterator operator++(int);
-    bool operator==(const const_iterator& it) const {
-        return cur == it.cur;
+    friend bool operator==(const const_iterator& l, const const_iterator& r) {
+        return l.cur == r.cur;
     }
-    bool operator!=(const const_iterator& it) const {
-        return cur != it.cur;
+    friend bool operator!=(const const_iterator& l, const const_iterator& r) {
+        return l.cur != r.cur;
     }
     bool IsEnd() const {
         return !cur;
diff --git a/ydb/library/yql/core/yql_expr_type_annotation.cpp b/ydb/library/yql/core/yql_expr_type_annotation.cpp
index c3c7efd75e..99a82dce2a 100644
--- a/ydb/library/yql/core/yql_expr_type_annotation.cpp
+++ b/ydb/library/yql/core/yql_expr_type_annotation.cpp
@@ -4423,7 +4423,7 @@ IGraphTransformer::TStatus ConvertChildrenToType(const TExprNode::TPtr& input, c
         }
 
         status = status.Combine(TryConvertTo(input->ChildRef(i), *targetType, ctx));
-        if (IGraphTransformer::TStatus::Error == status)
+        if (status == IGraphTransformer::TStatus::Error)
             break;
     }
 
@@ -5373,10 +5373,10 @@ IGraphTransformer::TStatus NormalizeTupleOfAtoms(const TExprNode::TPtr& input, u
                 if (1U == item->ChildrenSize() && item->Head().IsAtom()) {
                     needRestart = true;
                     children[i] = item->HeadPtr();
-                } else if (const auto status = NormalizeTupleOfAtoms<Deduplicte, 1U>(input->ChildPtr(index), i, children[i], ctx); IGraphTransformer::TStatus::Error == status)
+                } else if (const auto status = NormalizeTupleOfAtoms<Deduplicte, 1U>(input->ChildPtr(index), i, children[i], ctx); status == IGraphTransformer::TStatus::Error)
                     return status;
                 else
-                    needRestart = needRestart || IGraphTransformer::TStatus::Repeat == status;
+                    needRestart = needRestart || (status == IGraphTransformer::TStatus::Repeat);
             } else if (!EnsureAtom(*item, ctx))
                 return IGraphTransformer::TStatus::Error;
         }