Merge pull request #1085 from hiradyazdan/cpp_master

Fix to avoid common function name's (`has_as::check`) ambiguity/conflict with other libraries' macros
msgpack · Aug 14, 2023 · b2f056c · b2f056c
2 parents 8c602e8 + e7f7b51
commit b2f056c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/include/msgpack/v1/object_fwd.hpp b/include/msgpack/v1/object_fwd.hpp
@@ -53,16 +53,16 @@ template <typename T>
 struct has_as {
 private:
     template <typename U>
-    static auto check(U*) ->
+    static auto check_(U*) ->
         // Check v1 specialization
         typename std::is_same<
             decltype(adaptor::as<U>()(std::declval<msgpack::object>())),
             T
         >::type;
     template <typename...>
-    static std::false_type check(...);
+    static std::false_type check_(...);
 public:
-    using type = decltype(check<T>(MSGPACK_NULLPTR));
+    using type = decltype(check_<T>(MSGPACK_NULLPTR));
     static constexpr bool value = type::value;
 };
 

diff --git a/include/msgpack/v2/object_fwd.hpp b/include/msgpack/v2/object_fwd.hpp
@@ -79,7 +79,7 @@ template <typename T>
 struct has_as {
 private:
     template <typename U>
-    static auto check(U*) ->
+    static auto check_(U*) ->
         typename std::enable_if<
             // check v2 specialization
             std::is_same<
@@ -92,9 +92,9 @@ struct has_as {
             std::true_type
         >::type;
     template <typename...>
-    static std::false_type check(...);
+    static std::false_type check_(...);
 public:
-    using type = decltype(check<T>(MSGPACK_NULLPTR));
+    using type = decltype(check_<T>(MSGPACK_NULLPTR));
     static constexpr bool value = type::value;
 };
 

diff --git a/include/msgpack/v3/object_fwd.hpp b/include/msgpack/v3/object_fwd.hpp
@@ -36,7 +36,7 @@ template <typename T>
 struct has_as {
 private:
     template <typename U>
-    static auto check(U*) ->
+    static auto check_(U*) ->
         typename std::enable_if<
             // check v3 specialization
             std::is_same<
@@ -52,9 +52,9 @@ struct has_as {
             std::true_type
         >::type;
     template <typename...>
-    static std::false_type check(...);
+    static std::false_type check_(...);
 public:
-    using type = decltype(check<T>(MSGPACK_NULLPTR));
+    using type = decltype(check_<T>(MSGPACK_NULLPTR));
     static constexpr bool value = type::value;
 };