Revert "Relax service map probe for MSVC"

This reverts commit 49dce64.
gracicot · Apr 29, 2024 · 189d701 · 189d701
1 parent 49dce64
commit 189d701
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 21 deletions.
diff --git 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
@@ -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;
 };