Skip to content

Commit b97efc2

Browse files
committed
organizing metadata: method_ptr_const.h, wip.
1 parent bcde3bb commit b97efc2

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

ReflectionTemplateLib/rtl/cache/cache_method_ptr_const.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace rtl::cache
3434
{
3535
m_cache.emplace_back(std::make_pair(method_t(fptr), lambda_index));
3636
method_t& fn = m_cache.back().first;
37-
//fn.init_lambda();
37+
fn.init_lambda();
3838
return fn;
3939
}
4040

ReflectionTemplateLib/rtl/dispatch/fn_signature.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#pragma once
1313

14-
#include <variant>
1514
#include "rtl_forward_decls.h"
1615

1716
namespace rtl::dispatch

ReflectionTemplateLib/rtl/dispatch/fn_signature_rec.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#pragma once
1313

14-
#include <variant>
1514
#include "rtl_forward_decls.h"
1615

1716
namespace rtl::dispatch

ReflectionTemplateLib/rtl/dispatch/function_ptr.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
#pragma once
1313

14+
#include <variant>
15+
1416
#include "functor.h"
1517
#include "fn_signature.h"
1618

ReflectionTemplateLib/rtl/dispatch/method_ptr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#pragma once
1313

14-
#include <tuple>
14+
#include <variant>
1515

1616
#include "functor.h"
1717
#include "fn_signature_rec.h"

ReflectionTemplateLib/rtl/dispatch/method_ptr.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace rtl::dispatch
2020
template<class record_t, class return_t, class ...signature_t>
2121
void method_ptr<record_t, return_t, signature_t...>::init_lambda()
2222
{
23-
if constexpr (std::is_void_v<return_t>)
23+
if constexpr (fn_void_v == fn_void::yes)
2424
{
2525
{
2626
const auto& fn = aware_return_n_target<record_t, return_t, signature_t...>::e_return_a_target_fnv();

ReflectionTemplateLib/rtl/dispatch/method_ptr_const.hpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,36 @@
1313

1414
#include "method_ptr_const.h"
1515
#include "fn_signature_rec.h"
16-
#include "aware_return_n_target.h"
16+
#include "aware_return_n_target_const.h"
1717

1818
namespace rtl::dispatch
1919
{
2020
template<class record_t, class return_t, class ...signature_t>
2121
void method_ptr<const record_t, return_t, signature_t...>::init_lambda()
2222
{
23-
if constexpr (std::is_void_v<return_t>)
24-
{
25-
{
26-
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_return_a_target_fnv();
27-
m_erased_return.set_vhop(fn);
28-
} {
29-
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_target_a_return_fnv();
30-
m_erased_target.set_vhop(fn);
31-
}
32-
}
33-
else
34-
{
35-
{
36-
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_return_a_target_fnr();
37-
m_erased_return.set_rhop(fn);
38-
} {
39-
const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_target_a_return_fnr();
40-
m_erased_target.set_rhop(fn);
41-
}
42-
}
23+
if constexpr (fn_void_v == fn_void::yes)
24+
{
25+
{
26+
//const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_return_a_target_fnv();
27+
//m_erased_return.set_hop(fn);
28+
} {
29+
//const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_target_a_return_fnv();
30+
//m_erased_target.set_hop(fn);
31+
}
32+
}
33+
else
34+
{
35+
{
36+
//const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_return_a_target_fnr();
37+
//m_erased_return.set_hop(fn);
38+
} {
39+
//const auto& fn = aware_return_n_target<const record_t, return_t, signature_t...>::e_target_a_return_fnr();
40+
//m_erased_target.set_hop(fn);
41+
}
42+
}
4343

44-
functor::m_lambdas = std::vector<lambda*>(2);
45-
functor::m_lambdas[index::erased_return] = (&m_erased_return);
46-
functor::m_lambdas[index::erased_target] = (&m_erased_target);
44+
functor::m_lambdas = std::vector<lambda*>(2);
45+
functor::m_lambdas[index::erased_return] = (&m_erased_return);
46+
functor::m_lambdas[index::erased_target] = (&m_erased_target);
4747
}
4848
}

0 commit comments

Comments
 (0)