feedc0de/sdbus-cpp
1
0
Fork 0
forked from Kistler-Group/sdbus-cpp
Code Pull Requests Activity

Transform constexpr member to a getter method because of different odr-usage rules in different compilers

Browse Source
This commit is contained in:
Stanislav Angelovic
2019-01-16 19:58:26 +01:00
parent 47fad7dd63
commit d957948274
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integrationtests/AdaptorAndProxy_test.cpp
View File

@@ -394,5 +394,5 @@ TEST_F(SdbusTestObject, CannotReadFromWriteProperty)
TEST_F(SdbusTestObject, AnswersXmlApiDescriptionOnIntrospection) TEST_F(SdbusTestObject, AnswersXmlApiDescriptionOnIntrospection)
{ {
ASSERT_THAT(m_proxy->Introspect(), Eq(testing_adaptor::expectedXmlApiDescription)); ASSERT_THAT(m_proxy->Introspect(), Eq(m_adaptor->getExpectedXmlApiDescription()));
} }

5
test/integrationtests/adaptor-glue.h
View File

@@ -172,7 +172,9 @@ protected:
virtual void blocking(const bool& value) = 0; virtual void blocking(const bool& value) = 0;
public: // For testing purposes public: // For testing purposes
static constexpr char expectedXmlApiDescription[] = std::string getExpectedXmlApiDescription()
{
return
R"delimiter(<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" R"delimiter(<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node> <node>
@@ -303,6 +305,7 @@ R"delimiter(<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspectio
</interface> </interface>
</node> </node>
)delimiter"; )delimiter";
}
}; };