Skip to content

Commit e7f7b51

Browse files
committed
modified function name 'has_as::check' to avoid ambiguity/conflicts with other libraries/engines's macro definitions (e.g. UE)
1 parent 8c602e8 commit e7f7b51

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

include/msgpack/v1/object_fwd.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ template <typename T>
5353
struct has_as {
5454
private:
5555
template <typename U>
56-
static auto check(U*) ->
56+
static auto check_(U*) ->
5757
// Check v1 specialization
5858
typename std::is_same<
5959
decltype(adaptor::as<U>()(std::declval<msgpack::object>())),
6060
T
6161
>::type;
6262
template <typename...>
63-
static std::false_type check(...);
63+
static std::false_type check_(...);
6464
public:
65-
using type = decltype(check<T>(MSGPACK_NULLPTR));
65+
using type = decltype(check_<T>(MSGPACK_NULLPTR));
6666
static constexpr bool value = type::value;
6767
};
6868

include/msgpack/v2/object_fwd.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ template <typename T>
7979
struct has_as {
8080
private:
8181
template <typename U>
82-
static auto check(U*) ->
82+
static auto check_(U*) ->
8383
typename std::enable_if<
8484
// check v2 specialization
8585
std::is_same<
@@ -92,9 +92,9 @@ struct has_as {
9292
std::true_type
9393
>::type;
9494
template <typename...>
95-
static std::false_type check(...);
95+
static std::false_type check_(...);
9696
public:
97-
using type = decltype(check<T>(MSGPACK_NULLPTR));
97+
using type = decltype(check_<T>(MSGPACK_NULLPTR));
9898
static constexpr bool value = type::value;
9999
};
100100

include/msgpack/v3/object_fwd.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ template <typename T>
3636
struct has_as {
3737
private:
3838
template <typename U>
39-
static auto check(U*) ->
39+
static auto check_(U*) ->
4040
typename std::enable_if<
4141
// check v3 specialization
4242
std::is_same<
@@ -52,9 +52,9 @@ struct has_as {
5252
std::true_type
5353
>::type;
5454
template <typename...>
55-
static std::false_type check(...);
55+
static std::false_type check_(...);
5656
public:
57-
using type = decltype(check<T>(MSGPACK_NULLPTR));
57+
using type = decltype(check_<T>(MSGPACK_NULLPTR));
5858
static constexpr bool value = type::value;
5959
};
6060

0 commit comments

Comments
 (0)