From 229aa886d9288f13ac4f9f6cf4ea2df53723b3a7 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 11 Mar 2021 15:35:04 +0000
Subject: [PATCH] [Minor] Move utilities to a separate header

---
 src/libserver/css/css_rule.hxx | 31 +-----------------
 src/libutil/cxx/util.hxx       | 58 ++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 30 deletions(-)
 create mode 100644 src/libutil/cxx/util.hxx

diff --git a/src/libserver/css/css_rule.hxx b/src/libserver/css/css_rule.hxx
index fa9f2a78e..dbd4fb1c7 100644
--- a/src/libserver/css/css_rule.hxx
+++ b/src/libserver/css/css_rule.hxx
@@ -22,6 +22,7 @@
 #include "css_property.hxx"
 #include "css_parser.hxx"
 #include "contrib/robin-hood/robin_hood.h"
+#include "libutil/cxx/util.hxx"
 #include <vector>
 #include <memory>
 
@@ -75,36 +76,6 @@ public:
 
 namespace rspamd::css {
 
-/*
- * We have to define transparent hash and compare methods
- *
- * TODO: move to some utility library
- */
-template<typename T>
-struct shared_ptr_equal {
-	using is_transparent = void; /* We want to find values in a set of shared_ptr by reference */
-	auto operator()(const std::shared_ptr<T> &a, const std::shared_ptr<T> &b) const {
-		return (*a) == (*b);
-	}
-	auto operator()(const std::shared_ptr<T> &a, const T &b) const {
-		return (*a) == b;
-	}
-	auto operator()(const T &a, const std::shared_ptr<T> &b) const {
-		return a == (*b);
-	}
-};
-
-template<typename T>
-struct shared_ptr_hash {
-	using is_transparent = void; /* We want to find values in a set of shared_ptr by reference */
-	auto operator()(const std::shared_ptr<T> &a) const {
-		return std::hash<T>()(*a);
-	}
-	auto operator()(const T &a) const {
-		return std::hash<T>()(a);
-	}
-};
-
 class css_declarations_block {
 public:
 	using rule_shared_ptr = std::shared_ptr<css_rule>;
diff --git a/src/libutil/cxx/util.hxx b/src/libutil/cxx/util.hxx
new file mode 100644
index 000000000..a61399977
--- /dev/null
+++ b/src/libutil/cxx/util.hxx
@@ -0,0 +1,58 @@
+/*-
+ * Copyright 2021 Vsevolod Stakhov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef RSPAMD_UTIL_HXX
+#define RSPAMD_UTIL_HXX
+
+#pragma once
+
+#include <memory>
+
+/*
+ * Common C++ utilities
+ */
+
+namespace rspamd {
+/*
+ * Transparent smart pointers hashing
+ */
+template<typename T>
+struct shared_ptr_equal {
+	using is_transparent = void; /* We want to find values in a set of shared_ptr by reference */
+	auto operator()(const std::shared_ptr<T> &a, const std::shared_ptr<T> &b) const {
+		return (*a) == (*b);
+	}
+	auto operator()(const std::shared_ptr<T> &a, const T &b) const {
+		return (*a) == b;
+	}
+	auto operator()(const T &a, const std::shared_ptr<T> &b) const {
+		return a == (*b);
+	}
+};
+
+template<typename T>
+struct shared_ptr_hash {
+	using is_transparent = void; /* We want to find values in a set of shared_ptr by reference */
+	auto operator()(const std::shared_ptr<T> &a) const {
+		return std::hash<T>()(*a);
+	}
+	auto operator()(const T &a) const {
+		return std::hash<T>()(a);
+	}
+};
+
+}
+
+#endif //RSPAMD_UTIL_HXX
-- 
2.39.5