Move overloaded() magic function into its own header file

joto · joto · commit e21d977fd6ea · 2023-02-13T15:38:11.000+01:00
diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp
@@ -8,7 +8,9 @@
  */
 
 #include "geom-functions.hpp"
+
 #include "geom-boost-adaptor.hpp"
+#include "overloaded.hpp"
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/geom.hpp b/src/geom.hpp
@@ -403,16 +403,4 @@ std::size_t dimension(geometry_t const &geom);
 
 } // namespace geom
 
-// This magic is used for visiting geometries. For an explanation see for
-// instance here:
-// https://arne-mertz.de/2018/05/overload-build-a-variant-visitor-on-the-fly/
-template <class... Ts>
-struct overloaded : Ts...
-{
-    using Ts::operator()...;
-};
-
-template <class... Ts>
-overloaded(Ts...) -> overloaded<Ts...>;
-
 #endif // OSM2PGSQL_GEOM_HPP
diff --git a/src/overloaded.hpp b/src/overloaded.hpp
@@ -0,0 +1,25 @@
+#ifndef OSM2PGSQL_OVERLOADED_HPP
+#define OSM2PGSQL_OVERLOADED_HPP
+
+/**
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ * This file is part of osm2pgsql (https://osm2pgsql.org/).
+ *
+ * Copyright (C) 2006-2023 by the osm2pgsql developer community.
+ * For a full list of authors see the git log.
+ */
+
+// This magic is used for visiting geometries. For an explanation see for
+// instance here:
+// https://arne-mertz.de/2018/05/overload-build-a-variant-visitor-on-the-fly/
+template <class... Ts>
+struct overloaded : Ts...
+{
+    using Ts::operator()...;
+};
+
+template <class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;
+
+#endif // OSM2PGSQL_OVERLOADED_HPP
diff --git a/src/wkb.cpp b/src/wkb.cpp
@@ -10,6 +10,7 @@
 #include "wkb.hpp"
 
 #include "format.hpp"
+#include "overloaded.hpp"
 
 #include <array>
 #include <cassert>
