propagate changes from utils

include/utue/pe/tools/lsh/Token.h

@@ -107,13 +107,6 @@ namespace utue::pe::tools::lsh {
              * @return Hash of the token
              */
             unsigned long operator()(const Token &key) const;
-        };
-
-        /**
-         * @brief Provides a comparator for std::unordered_map
-         */
-        class Equal {
-        public:
             /**
              * Compares two Tokens without using the hash
              * @param left First Token
@@ -127,12 +120,12 @@ namespace utue::pe::tools::lsh {
          * HashMap with a Token key
          */
         template <class ValueType>
-        using HashMap = utils::HashMap<Token, ValueType, Token::Hash, Token::Equal>;
+        using HashMap = utils::HashMap<Token, ValueType, Token::Hash>;
 
         /**
          * Hash Set with a Token key
          */
-        typedef utils::HashSet<Token,Token::Hash,Token::Equal> HashSet;
+        typedef utils::HashSet<Token,Token::Hash> HashSet;
 
     private:
 

utils @ 54c896d6

-Subproject commit 5e8d82c1767ca601aba30ce63c751030e618236d
+Subproject commit 54c896d649f71b2613cb2ff252a46b567f214540

source/utue/pe/tools/lsh/Scanner.cpp

@@ -53,8 +53,6 @@
  */
 
 #include <utue/pe/tools/lsh/Scanner.h>
-#include "../../../../../../../include/utue/pe/etra2020/scanpath/Scanner.h"
-
 
 namespace utue::pe::tools::lsh {
 

source/utue/pe/tools/lsh/Token.cpp

@@ -64,7 +64,7 @@ namespace utue::pe::tools::lsh {
     }
 
 
-    bool Token::Equal::operator()(const Token& left, const Token& right) const {
+    bool Token::Hash::operator()(const Token& left, const Token& right) const {
         return left.equal(right);
     }