From 17024c259fed5e49a143f564dca3b0c5deffb91b Mon Sep 17 00:00:00 2001
From: Alex Guteniev <gutenev@gmail.com>
Date: Tue, 23 Nov 2021 21:59:51 +0200
Subject: [PATCH] Simplify more

---
 include/fmt/core.h | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/include/fmt/core.h b/include/fmt/core.h
index 029d941b..3b0537ea 100644
--- a/include/fmt/core.h
+++ b/include/fmt/core.h
@@ -1368,33 +1368,17 @@ template <typename Context> struct arg_mapper {
     return val;
   }
 
-  template <typename T,
-            FMT_ENABLE_IF(
-                std::is_function<typename std::remove_pointer<T>::type>::value)>
-  FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
-    return {};
-  }
-
-  template <typename T, FMT_ENABLE_IF(std::is_member_object_pointer<T>::value)>
-  FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
-    return {};
-  }
-
-  template <typename T,
-            FMT_ENABLE_IF(std::is_member_function_pointer<T>::value)>
-  FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
-    return {};
-  }
-
   // We use SFINAE instead of a const T* parameter to avoid conflicting with
   // the C array overload.
 
   template <
       typename T,
       FMT_ENABLE_IF(
-          !std::is_function<typename std::remove_pointer<T>::type>::value &&
-          std::is_convertible<const T&, const void*>::value &&
-          !std::is_convertible<const T&, const char_type*>::value)>
+          std::is_member_object_pointer<T>::value ||
+          std::is_member_function_pointer<T>::value ||
+          std::is_function<typename std::remove_pointer<T>::type>::value ||
+          (std::is_convertible<const T&, const void*>::value &&
+           !std::is_convertible<const T&, const char_type*>::value))>
   FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
     return {};
   }