Skip to content

Commit 9c33ffa

Browse files
committed
general refactor, header
1 parent d92865b commit 9c33ffa

File tree

5 files changed

+16
-29
lines changed

5 files changed

+16
-29
lines changed

ReflectionTemplateLib/rtl/dispatch/function_ptr.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#pragma once
1313

1414
#include "function_ptr.h"
15-
#include "function_lambda.h"
1615
#include "aware_return.h"
1716
#include "aware_constructor.h"
1817

ReflectionTemplateLib/rtl/dispatch/method_ptr.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#pragma once
1313

1414
#include "functor.h"
15+
#include "method_lambda.h"
16+
#include "function_lambda.h"
1517

1618
namespace rtl::dispatch
1719
{

ReflectionTemplateLib/rtl/dispatch/method_ptr.hpp

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,35 @@
1212
#pragma once
1313

1414
#include "method_ptr.h"
15-
#include "method_lambda.h"
16-
#include "function_lambda.h"
1715
#include "aware_return_n_target.h"
1816

1917
namespace rtl::dispatch
2018
{
2119
template<class record_t, class return_t, class ...signature_t>
2220
void method_ptr<record_t, return_t, signature_t...>::init_lambda()
2321
{
24-
if constexpr (fn_void_v == fn_void::yes)
22+
if constexpr (fn_void_v == fn_void::yes)
2523
{
26-
{
27-
// erased-return-aware-target (e_return_a_target)
24+
{ // erased-return-aware-target
2825
const auto& fn = aware_return_n_target<record_t, return_t, signature_t...>::e_return_a_target_fnv();
2926
m_erased_return.set_hop(fn);
30-
} {
31-
// erased-target-aware-return (e_target_a_return)
27+
} { // erased-target-aware-return
3228
const auto& fn = aware_return_n_target<record_t, return_t, signature_t...>::e_target_a_return_fnv();
3329
m_erased_target.set_hop(fn);
34-
} {
35-
// erased-return-erased-target (e_return_e_target)
30+
} { // erased-return-erased-target
3631
const auto& fn = aware_return_n_target<record_t, return_t, signature_t...>::e_return_e_target_fnv();
3732
m_erased_method.set_hop(fn);
3833
}
3934
}
4035
else
4136
{
42-
{
43-
// erased-return-aware-target (e_return_a_target)
37+
{ // erased-return-aware-target
4438
const auto& fn = aware_return_n_target<record_t, return_t, signature_t...>::e_return_a_target_fnr();
4539
m_erased_return.set_hop(fn);
46-
} {
47-
// erased-target-aware-return (e_target_a_return)
40+
} { // erased-target-aware-return
4841
const auto& fn = aware_return_n_target<record_t, return_t, signature_t...>::e_target_a_return_fnr();
4942
m_erased_target.set_hop(fn);
50-
} {
51-
// erased-return-erased-target (e_return_e_target)
43+
} { // erased-return-erased-target
5244
const auto& fn = aware_return_n_target<record_t, return_t, signature_t...>::e_return_e_target_fnr();
5345
m_erased_method.set_hop(fn);
5446
}

ReflectionTemplateLib/rtl/dispatch/method_ptr_const.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include "functor.h"
1515
#include "method_lambda.h"
16+
#include "function_lambda.h"
1617

1718
namespace rtl::dispatch
1819
{

ReflectionTemplateLib/rtl/dispatch/method_ptr_const.hpp

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#pragma once
1313

14-
#include "method_lambda.h"
1514
#include "method_ptr_const.h"
1615
#include "aware_return_n_target_const.h"
1716

@@ -22,32 +21,26 @@ namespace rtl::dispatch
2221
{
2322
if constexpr (fn_void_v == fn_void::yes)
2423
{
25-
{
26-
// erased-return-aware-target (e_return_a_target)
24+
{ // erased-return-aware-target
2725
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_return_a_target_fnv();
2826
m_erased_return.set_hop(fn);
29-
} {
30-
// erased-target-aware-return (e_target_a_return)
27+
} { // erased-target-aware-return
3128
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_target_a_return_fnv();
3229
m_erased_target.set_hop(fn);
33-
} {
34-
// erased-return-erased-target (e_return_e_target)
30+
} { // erased-return-erased-target
3531
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_return_e_target_fnv();
3632
m_erased_method.set_hop(fn);
3733
}
3834
}
3935
else
4036
{
41-
{
42-
// erased-return-aware-target (e_return_a_target)
37+
{ // erased-return-aware-target
4338
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_return_a_target_fnr();
4439
m_erased_return.set_hop(fn);
45-
} {
46-
// erased-target-aware-return (e_target_a_return)
40+
} { // erased-target-aware-return
4741
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_target_a_return_fnr();
4842
m_erased_target.set_hop(fn);
49-
} {
50-
// erased-return-erased-target (e_return_e_target)
43+
} { // erased-return-erased-target
5144
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_return_e_target_fnr();
5245
m_erased_method.set_hop(fn);
5346
}

0 commit comments

Comments
 (0)