Skip to content

Commit e92d2eb

Browse files
committed
fix- gcc compile errors.
1 parent 00e393e commit e92d2eb

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

CxxTestRegistration/src/StrConstRegistration.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ namespace test_mirror
4444
*/
4545
fns.push_back(rtl::type().member<StrConst>()
4646
.methodConst<std::string&>(str_reverseString)
47-
.build(static_cast<std::string(StrConst::*)(std::string&)>(&StrConst::reverseString)));
47+
.build(static_cast<std::string(StrConst::*)(std::string&) const>(&StrConst::reverseString)));
4848

4949
fns.push_back(rtl::type().member<StrConst>()
5050
.methodConst<const std::string&>(str_reverseString)
51-
.build(static_cast<std::string(StrConst::*)(const std::string&)>(&StrConst::reverseString)));
51+
.build(static_cast<std::string(StrConst::*)(const std::string&) const>(&StrConst::reverseString)));
5252

5353
fns.push_back(rtl::type().member<StrConst>()
5454
.methodConst<std::string&&>(str_reverseString)
55-
.build(static_cast<std::string(StrConst::*)(std::string&&)>(&StrConst::reverseString)));
55+
.build(static_cast<std::string(StrConst::*)(std::string&&) const>(&StrConst::reverseString)));
5656
#else
5757
fns.push_back(rtl::type().member<StrConst>()
5858
.methodConst<std::string&>(str_reverseString)

CxxTestRegistration/src/StrFuncsRegistration.cpp

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,36 @@ using namespace test_utils;
99

1010
namespace test_mirror
1111
{
12-
void registerTypeStringFuncs(std::vector<rtl::Function>& fns)
13-
{
12+
void registerTypeStringFuncs(std::vector<rtl::Function>& fns)
13+
{
1414
// Function taking no arguments. '<void>' must be specified if other overload exists else not needed. compiler error otherwise.
1515
fns.push_back(rtl::type().function<void>(str_reverseString)
16-
.build(reverseString));
16+
.build(reverseString));
1717

1818
// Overloaded function, takes 'string' arguments. '<string>' must be specified as template parameter.
1919
fns.push_back(rtl::type().function<std::string>(str_reverseString)
20-
.build(reverseString));
20+
.build(reverseString));
2121

2222
// Overloaded function, takes 'const char*' arguments.
2323
fns.push_back(rtl::type().function<const char*>(str_reverseString)
24-
.build(reverseString));
25-
24+
.build(reverseString));
2625
// numereous other overloads.
2726
#if defined(__GNUC__) && !defined(__clang__)
28-
/*
29-
GCC here fails to automatically resolve the correct overloaded functor
30-
when both a lvalue reference and an rvalue overload exist.
31-
To disambiguate, explicitly cast the function pointer, e.g.:
27+
/*
28+
GCC here fails to automatically resolve the correct overloaded functor
29+
when both a lvalue reference and an rvalue overload exist.
30+
To disambiguate, explicitly cast the function pointer, e.g.:
3231
33-
static_cast<std::string(*)(std::string&&)>(reverseString)
34-
*/
32+
static_cast<std::string(*)(std::string&&)>(reverseString)
33+
*/
3534
fns.push_back(rtl::type().function<std::string&>(str_reverseString)
36-
.build(static_cast<std::string(StrMute::*)(std::string&)>(reverseString)));
35+
.build(static_cast<std::string(*)(std::string&)>(reverseString)));
3736

3837
fns.push_back(rtl::type().function<const std::string&>(str_reverseString)
39-
.build(static_cast<std::string(StrMute::*)(const std::string&)>(reverseString)));
38+
.build(static_cast<std::string(*)(const std::string&)>(reverseString)));
4039

4140
fns.push_back(rtl::type().function<std::string&&>(str_reverseString)
42-
.build(static_cast<std::string(StrMute::*)(std::string&&)>(reverseString)));
41+
.build(static_cast<std::string(*)(std::string&&)>(reverseString)));
4342
#else
4443
fns.push_back(rtl::type().function<std::string&>(str_reverseString)
4544
.build(reverseString));
@@ -82,5 +81,5 @@ namespace test_mirror
8281

8382
fns.push_back(rtl::type().function<const std::string_view&>(str_revStrOverloadValRefAndCRef)
8483
.build(revStrOverloadRefAndCRef));
85-
}
84+
}
8685
}

CxxTestRegistration/src/StrStaticRegistration.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ namespace test_mirror
4444
*/
4545
fns.push_back(rtl::type().member<StrStatic>()
4646
.methodStatic<std::string&>(str_reverseString)
47-
.build(static_cast<std::string(StrStatic::*)(std::string&)>(&StrStatic::reverseString)));
47+
.build(static_cast<std::string(*)(std::string&)>(&StrStatic::reverseString)));
4848

4949
fns.push_back(rtl::type().member<StrStatic>()
5050
.methodStatic<const std::string&>(str_reverseString)
51-
.build(static_cast<std::string(StrStatic::*)(const std::string&)>(&StrStatic::reverseString)));
51+
.build(static_cast<std::string(*)(const std::string&)>(&StrStatic::reverseString)));
5252

5353
fns.push_back(rtl::type().member<StrStatic>()
5454
.methodStatic<std::string&&>(str_reverseString)
55-
.build(static_cast<std::string(StrStatic::*)(std::string&&)>(&StrStatic::reverseString)));
55+
.build(static_cast<std::string(*)(std::string&&)>(&StrStatic::reverseString)));
5656
#else
5757
fns.push_back(rtl::type().member<StrStatic>()
5858
.methodStatic<std::string&>(str_reverseString)

0 commit comments

Comments
 (0)