Skip to content

Commit 69eeded

Browse files
committed
header sanitization, minor bug fix, new ctor-apis:wip.
1 parent 975891d commit 69eeded

File tree

54 files changed

+340
-234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+340
-234
lines changed

CxxTestRegistration/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ADD_LIBRARY(${PROJECT_NAME} STATIC "")
1515
INCLUDE_DIRECTORIES(inc)
1616
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/CxxTestUtils/inc")
1717
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/CxxTestProps/inc")
18-
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/ReflectionTemplateLib/rtl/inc")
18+
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/ReflectionTemplateLib")
1919

2020
TARGET_LINK_LIBRARIES(${CXX_LIB_NAME} CxxTestProps)
2121
TARGET_LINK_LIBRARIES(${CXX_LIB_NAME} ReflectionTemplateLib)

CxxTestRegistration/src/BookRegistration.cpp

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

2-
#include <Reflect.hpp>
2+
#include <rtl/builder.h>
33

44
#include "Book.h"
55
#include "Registration.h"

CxxTestRegistration/src/TestMirrorProvider.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ namespace test_mirror
1515
static auto cxx_mirror = rtl::CxxMirror(
1616
[]() {
1717

18-
std::vector<rtl::Function> meta_fns;
18+
std::vector<rtl::Function> metaFns;
1919

20-
registerPodStdTypes(meta_fns);
20+
registerPodStdTypes(metaFns);
2121

22-
registerTypeBook(meta_fns);
23-
registerTypeDate(meta_fns);
24-
registerTypeEvent(meta_fns);
25-
registerTypePerson(meta_fns);
26-
registerTypeAnimal(meta_fns);
27-
registerTypeLibrary(meta_fns);
28-
registerTypeComplex(meta_fns);
29-
registerTypeCalender(meta_fns);
22+
registerTypeBook(metaFns);
23+
registerTypeDate(metaFns);
24+
registerTypeEvent(metaFns);
25+
registerTypePerson(metaFns);
26+
registerTypeAnimal(metaFns);
27+
registerTypeLibrary(metaFns);
28+
registerTypeComplex(metaFns);
29+
registerTypeCalender(metaFns);
3030

31-
registerTypeStringMute(meta_fns);
32-
registerTypeStringConst(meta_fns);
33-
registerTypeStringFuncs(meta_fns);
34-
registerTypeStringStatic(meta_fns);
31+
registerTypeStringMute(metaFns);
32+
registerTypeStringConst(metaFns);
33+
registerTypeStringFuncs(metaFns);
34+
registerTypeStringStatic(metaFns);
3535

36-
return meta_fns;
36+
return metaFns;
3737
}()
3838
);
3939

RTLBenchmarkApp/src/BenchMark.cpp

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

22

33
#include <optional>
4-
#include <rtl/rtl.h>
4+
#include <rtl/builder.h>
55

66
#include "BenchMark.h"
77

RTLBenchmarkApp/src/ReflectedCallKnownReturn.cpp

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

2+
#include <iostream>
23
#include <optional>
3-
#include <rtl/rtl.h>
4+
#include <rtl/access.h>
45
#include <benchmark/benchmark.h>
56

67
#include "BenchMark.h"

RTLBenchmarkApp/src/ReflectedCallUnknownReturn.cpp

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

2+
#include <iostream>
23
#include <benchmark/benchmark.h>
3-
#include <rtl/rtl.h>
4+
#include <rtl/access.h>
45

56
#include "BenchMark.h"
67
#include "ReflectedCallUnknownReturn.h"
@@ -237,7 +238,7 @@ namespace
237238

238239
static auto _test7 = []()
239240
{
240-
auto [err, returnOpt] = ErasedTargetAwareReturn_SendMessage(nodeObj)(bm::g_longStr);
241+
auto [err, returnOpt] = ErasedTargetAwareReturn_GetMessage(nodeObj)(bm::g_longStr);
241242
if (err != rtl::error::None) {
242243
std::cerr << "[07] error: " << rtl::to_string(err) << "\n";
243244
}
@@ -299,7 +300,7 @@ namespace bm_rtl
299300

300301
void method____ErasedTargetType::set_string(benchmark::State& state)
301302
{
302-
static auto _ = _test2();
303+
static auto _ = _test6();
303304
static bm::Node node;
304305
for (auto _ : state)
305306
{
@@ -309,7 +310,7 @@ namespace bm_rtl
309310

310311
void method____ErasedTargetType::get_string(benchmark::State& state)
311312
{
312-
static auto _ = _test3();
313+
static auto _ = _test7();
313314
static bm::Node node;
314315
for (auto _ : state)
315316
{
@@ -319,7 +320,7 @@ namespace bm_rtl
319320

320321
void method____ErasedTargetAndReturnType::set_string(benchmark::State& state)
321322
{
322-
static auto _ = _test2();
323+
static auto _ = _test4();
323324
static bm::Node node;
324325
for (auto _ : state)
325326
{
@@ -329,7 +330,7 @@ namespace bm_rtl
329330

330331
void method____ErasedTargetAndReturnType::get_string(benchmark::State& state)
331332
{
332-
static auto _ = _test3();
333+
static auto _ = _test5();
333334
static bm::Node node;
334335
for (auto _ : state)
335336
{

RTLTestRunApp/src/CxxMirrorTests/CxxMirrorObjectTest.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11

22
#include <gtest/gtest.h>
33
#include <cstring>
4-
#include <rtl/rtl.h>
4+
5+
#include <rtl/builder.h>
6+
#include <rtl/access.h>
57

68
#include "CxxMirrorToJson.h"
79

RTLTestRunApp/src/CxxMirrorTests/CxxMirrorThreadingTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <string>
44
#include <cstring>
55
#include <iostream>
6-
#include <rtl/rtl.h>
6+
#include <rtl/builder.h>
77

88
#include "../../CxxTestProps/inc/Date.h"
99
#include "../../CxxTestProps/inc/Book.h"

RTLTestRunApp/src/FunctionalityTests/ClassMethodsTests.cpp

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

2-
#include <rtl/rtl.h>
2+
#include <rtl/access.h>
33
#include <gtest/gtest.h>
44

55
#include "TestMirrorProvider.h"

RTLTestRunApp/src/FunctionalityTests/ConstMethodOverloadTests.cpp

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

2-
#include <rtl/rtl.h>
2+
#include <rtl/access.h>
33
#include <gtest/gtest.h>
44

55
#include "TestMirrorProvider.h"

0 commit comments

Comments
 (0)