@@ -75,33 +75,22 @@ namespace rtl
7575
7676 namespace dispatch
7777 {
78- struct functor ;
79-
80- struct lambda_base ;
81-
82- struct erasure_base ;
83-
78+ // --- These can be removed.
8479 template <class ...signature_t >
8580 struct lambda_function ;
8681
8782 template <class record_t , class ...signature_t >
8883 struct lambda_method ;
8984
90- template <class return_t , class ...signature_t >
91- struct function_ptr ;
85+ struct functor ;
9286
93- template <class record_t , class return_t , class ...signature_t >
94- struct method_ptr ;
87+ struct lambda_base ;
9588
96- template <class record_t , class return_t , class ...signature_t >
97- struct const_method_ptr ;
89+ struct erasure_base ;
9890
9991 template <class ...signature_t >
10092 struct erase_return ;
10193
102- template <class return_t , class ...signature_t >
103- struct aware_return ;
104-
10594 template <class ...signature_t >
10695 struct erase_return_n_target ;
10796
@@ -111,6 +100,25 @@ namespace rtl
111100 template <class return_t , class ...signature_t >
112101 struct erase_target_aware_return ;
113102
103+
104+ // --- These should be enough for replacement.
105+ struct fn_meta ;
106+
107+ template <class ...args_t >
108+ struct fn_signature ;
109+
110+ template <class record_t , class ...args_t >
111+ struct fn_signature_rec ;
112+
113+ template <class return_t , class ...signature_t >
114+ struct function_ptr ;
115+
116+ template <class record_t , class return_t , class ...signature_t >
117+ struct method_ptr ;
118+
119+ template <class return_t , class ...signature_t >
120+ struct aware_return ;
121+
114122 template <class record_t , class return_t , class ...signature_t >
115123 struct aware_return_n_target ;
116124
0 commit comments