Skip to content
This repository was archived by the owner on Jan 29, 2026. It is now read-only.

Fix typo #114

Merged
mingxwa merged 1 commit into from
Jun 7, 2024
Merged

Fix typo #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions proxy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,7 @@ using op_dispatch_accessor = typename op_dispatch_traits<SIGN, POS>
___PRO_EXPAND_MACRO( \
___PRO_DEF_OPERATOR_DISPATCH, __NAME, right, __VA_ARGS__)

#define ___PRO_DEF_CONVERTION_DISPATCH_IMPL(__NAME, __T, ...) \
#define ___PRO_DEF_CONVERSION_DISPATCH_IMPL(__NAME, __T, ...) \
struct __NAME { \
__T operator()(auto& __self) \
___PRO_DIRECT_FUNC_IMPL(static_cast<__T>(__self)) \
Expand All @@ -1452,13 +1452,13 @@ using op_dispatch_accessor = typename op_dispatch_traits<SIGN, POS>
}; \
__VA_ARGS__ \
}
#define ___PRO_DEF_CONVERTION_DISPATCH_2(__NAME, __T) \
___PRO_DEF_CONVERTION_DISPATCH_IMPL(__NAME, __T)
#define ___PRO_DEF_CONVERTION_DISPATCH_3(__NAME, __T, __DEFFUNC) \
___PRO_DEF_CONVERTION_DISPATCH_IMPL( \
#define ___PRO_DEF_CONVERSION_DISPATCH_2(__NAME, __T) \
___PRO_DEF_CONVERSION_DISPATCH_IMPL(__NAME, __T)
#define ___PRO_DEF_CONVERSION_DISPATCH_3(__NAME, __T, __DEFFUNC) \
___PRO_DEF_CONVERSION_DISPATCH_IMPL( \
__NAME, __T, ___PRO_DEFAULT_DISPATCH_CALL_IMPL(__DEFFUNC))
#define PRO_DEF_CONVERTION_DISPATCH(__NAME, ...) \
___PRO_EXPAND_MACRO(___PRO_DEF_CONVERTION_DISPATCH, __NAME, __VA_ARGS__)
#define PRO_DEF_CONVERSION_DISPATCH(__NAME, ...) \
___PRO_EXPAND_MACRO(___PRO_DEF_CONVERSION_DISPATCH, __NAME, __VA_ARGS__)

} // namespace pro

Expand Down
4 changes: 2 additions & 2 deletions tests/proxy_dispatch_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ PRO_DEF_PREFIX_OPERATOR_DISPATCH(PreOpRightShift, ">>");
PRO_DEF_PREFIX_OPERATOR_DISPATCH(PreOpComma, ",");
PRO_DEF_PREFIX_OPERATOR_DISPATCH(PreOpPtrToMem, "->*");

PRO_DEF_CONVERTION_DISPATCH(ConvertToInt, int);
PRO_DEF_CONVERSION_DISPATCH(ConvertToInt, int);

struct CommaTester {
public:
Expand Down Expand Up @@ -579,7 +579,7 @@ TEST(ProxyDispatchTests, TestPreOpPtrToMem) {
ASSERT_EQ(2->*p, 6);
}

TEST(ProxyDispatchTests, TestConvertion) {
TEST(ProxyDispatchTests, TestConversion) {
struct TestFacade : pro::facade_builder::add_convention<ConvertToInt, int()>::build {};
double v = 12.3;
pro::proxy<TestFacade> p = &v;
Expand Down