From 82f7d5d429f7f04a82235dd0b7023b23feb39eae Mon Sep 17 00:00:00 2001
From: lisyarus <lisyarus@gmail.com>
Date: Sat, 17 Aug 2024 20:19:07 +0300
Subject: [PATCH] Rename util::begin/end -> xbegin/xend to prevent ambiguity
 via ADL

---
 libs/cg/include/psemek/cg/bbox.hpp                | 2 +-
 libs/geom/include/psemek/geom/contains.hpp        | 2 +-
 libs/geom/include/psemek/geom/distance.hpp        | 6 +++---
 libs/util/include/psemek/util/cyclic_iterator.hpp | 2 +-
 libs/util/include/psemek/util/range.hpp           | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/cg/include/psemek/cg/bbox.hpp b/libs/cg/include/psemek/cg/bbox.hpp
index 9457a077..72e2bb4c 100644
--- a/libs/cg/include/psemek/cg/bbox.hpp
+++ b/libs/cg/include/psemek/cg/bbox.hpp
@@ -20,7 +20,7 @@ namespace psemek::cg
 	template <typename Container>
 	auto bbox(Container const & container)
 	{
-		return bbox(util::begin(container), util::end(container));
+		return bbox(util::xbegin(container), util::xend(container));
 	}
 
 }
diff --git a/libs/geom/include/psemek/geom/contains.hpp b/libs/geom/include/psemek/geom/contains.hpp
index 3da9d280..06e25429 100644
--- a/libs/geom/include/psemek/geom/contains.hpp
+++ b/libs/geom/include/psemek/geom/contains.hpp
@@ -95,7 +95,7 @@ namespace psemek::geom
 	template <typename Polygon, typename T>
 	bool polygon_contains(Polygon const & polygon, point<T, 2> const & p)
 	{
-		return polygon_contains(util::begin(polygon), util::end(polygon), p);
+		return polygon_contains(util::xbegin(polygon), util::xend(polygon), p);
 	}
 
 }
diff --git a/libs/geom/include/psemek/geom/distance.hpp b/libs/geom/include/psemek/geom/distance.hpp
index c29c93c1..1aed86b8 100644
--- a/libs/geom/include/psemek/geom/distance.hpp
+++ b/libs/geom/include/psemek/geom/distance.hpp
@@ -134,7 +134,7 @@ namespace psemek::geom
 	template <typename T, typename Polygon>
 	std::pair<T, vector<T, 2>> signed_polygon_distance_direction(point<T, 2> const & p, Polygon const & polygon)
 	{
-		return signed_polygon_distance_direction(p, util::begin(polygon), util::end(polygon));
+		return signed_polygon_distance_direction(p, util::xbegin(polygon), util::xend(polygon));
 	}
 
 	template <typename T, typename Iterator>
@@ -146,7 +146,7 @@ namespace psemek::geom
 	template <typename T, typename Polygon>
 	T signed_polygon_distance(point<T, 2> const & p, Polygon const & polygon)
 	{
-		return signed_polygon_distance(p, util::begin(polygon), util::end(polygon));
+		return signed_polygon_distance(p, util::xbegin(polygon), util::xend(polygon));
 	}
 
 	template <typename T, typename Iterator>
@@ -158,7 +158,7 @@ namespace psemek::geom
 	template <typename T, typename Polygon>
 	T polygon_distance(point<T, 2> const & p, Polygon const & polygon)
 	{
-		return polygon_distance(p, util::begin(polygon), util::end(polygon));
+		return polygon_distance(p, util::xbegin(polygon), util::xend(polygon));
 	}
 
 }
diff --git a/libs/util/include/psemek/util/cyclic_iterator.hpp b/libs/util/include/psemek/util/cyclic_iterator.hpp
index d64a6a0a..34cbbd16 100644
--- a/libs/util/include/psemek/util/cyclic_iterator.hpp
+++ b/libs/util/include/psemek/util/cyclic_iterator.hpp
@@ -91,7 +91,7 @@ namespace psemek::util
 	template <typename Container>
 	auto make_cyclic_iterator(Container & container)
 	{
-		return cyclic_iterator{util::begin(container), util::end(container)};
+		return cyclic_iterator{util::xbegin(container), util::xend(container)};
 	}
 
 }
diff --git a/libs/util/include/psemek/util/range.hpp b/libs/util/include/psemek/util/range.hpp
index 16233826..35d1859f 100644
--- a/libs/util/include/psemek/util/range.hpp
+++ b/libs/util/include/psemek/util/range.hpp
@@ -26,13 +26,13 @@ namespace psemek::util
 	}
 
 	template <typename Container>
-	auto begin(Container & x)
+	auto xbegin(Container & x)
 	{
 		return detail::begin_helper(x);
 	}
 
 	template <typename Container>
-	auto end(Container & x)
+	auto xend(Container & x)
 	{
 		return detail::end_helper(x);
 	}