From 189d70138fb1353ee7e883d6fb472349d5d2946a Mon Sep 17 00:00:00 2001
From: Guillaume Racicot <dev@gracicot.com>
Date: Sun, 28 Apr 2024 23:40:01 -0400
Subject: [PATCH] Revert "Relax service map probe for MSVC"

This reverts commit 49dce64bf969839043077c95ac14078d0f510b41.
---
 include/kangaru/detail/define.hpp      | 16 ++++++----------
 include/kangaru/detail/service_map.hpp | 13 ++-----------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/include/kangaru/detail/define.hpp b/include/kangaru/detail/define.hpp
index 97d39835..7a1f6b7b 100644
--- a/include/kangaru/detail/define.hpp
+++ b/include/kangaru/detail/define.hpp
@@ -12,10 +12,12 @@
 
 #ifndef KGR_KANGARU_USE_ALTERNATE_MAP_PROBE
 #if ( \
-	!(defined(__clang__) && __clang_major__ < 7 && !defined(__APPLE__)) && \
-	!(defined(_MSC_VER) && !defined(__clang__)) && \
-	!(defined(__APPLE__) && defined(__clang__) && __clang_major__ == 10 && __clang_patchlevel__ < 1) && \
-	!(defined(__APPLE__) && defined(__clang__) && __clang_major__ < 10) \
+  defined(_MSC_VER) || (\
+    !(defined(__clang__) && __clang_major__ < 7 && !defined(__APPLE__)) && \
+    !(defined(_MSC_VER) && !defined(__clang__)) && \
+    !(defined(__APPLE__) && defined(__clang__) && __clang_major__ == 10 && __clang_patchlevel__ < 1) && \
+    !(defined(__APPLE__) && defined(__clang__) && __clang_major__ < 10) \
+  ) \
 )
 #define KGR_KANGARU_USE_ALTERNATE_MAP_PROBE
 #endif
@@ -41,12 +43,6 @@
 #endif
 #endif
 
-#ifndef KGR_KANGARU_MSVC_RELAX_PROBE
-#ifdef _MSC_VER
-#define KGR_KANGARU_MSVC_RELAX_PROBE
-#endif
-#endif
-
 #ifndef KGR_KANGARU_MSVC_NO_DEPENDENT_TEMPLATE_KEYWORD
 #if defined(_MSC_VER) && _MSC_VER <= 1900
 #ifndef __clang__
diff --git a/include/kangaru/detail/service_map.hpp b/include/kangaru/detail/service_map.hpp
index 9c556876..1a9857db 100644
--- a/include/kangaru/detail/service_map.hpp
+++ b/include/kangaru/detail/service_map.hpp
@@ -74,20 +74,11 @@ struct probe {
 	operator T&& ();
 	
 	template<typename T, enable_if_t<
-
-		std::is_same<T const&, S>::value
-#ifdef KGR_KANGARU_MSVC_RELAX_PROBE
-    || std::is_same<T const&, constify<S>>
-#endif
-  , int> = 0>
+		std::is_same<T const&, S>::value, int> = 0>
 	operator T const& () const;
 	
 	template<typename T, enable_if_t<
-		std::is_same<T const&&, S&&>::value
-#ifdef KGR_KANGARU_MSVC_RELAX_PROBE
-    || std::is_same<T const&&, constify<S>&&>
-#endif
-  , int> = 0>
+		std::is_same<T const&&, S&&>::value, int> = 0>
 	operator T const&& () const;
 };