From f2b64102cf5f0407206829a7c07cdc6fc9bfbfd2 Mon Sep 17 00:00:00 2001
From: Dmitry Arkhipov <grisumbras@gmail.com>
Date: Fri, 11 Nov 2022 22:27:57 +0300
Subject: [PATCH] use another template parameter names

Avoids clash with an X11 define
---
 include/boost/json/impl/conversion.hpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boost/json/impl/conversion.hpp b/include/boost/json/impl/conversion.hpp
index b7a950e6..24e97bc8 100644
--- a/include/boost/json/impl/conversion.hpp
+++ b/include/boost/json/impl/conversion.hpp
@@ -210,11 +210,11 @@ template<class T>
 using value_to_implementation
     = conversion_implementation<T, value_to_conversion>;
 
-template<class Main, class Opposite>
+template<class Impl1, class Impl2>
 using conversion_round_trips_helper = mp11::mp_or<
-    std::is_same<Main, Opposite>,
-    std::is_same<user_conversion_tag, Main>,
-    std::is_same<user_conversion_tag, Opposite>>;
+    std::is_same<Impl1, Impl2>,
+    std::is_same<user_conversion_tag, Impl1>,
+    std::is_same<user_conversion_tag, Impl2>>;
 template<class T, class Dir>
 using conversion_round_trips  = conversion_round_trips_helper<
     conversion_implementation<T, Dir>,