From d957948274f9c29dc1422541e177faf97283de03 Mon Sep 17 00:00:00 2001
From: Stanislav Angelovic <stanislav.angelovic@siemens.com>
Date: Wed, 16 Jan 2019 19:58:26 +0100
Subject: [PATCH] Transform constexpr member to a getter method because of
 different odr-usage rules in different compilers

---
 test/integrationtests/AdaptorAndProxy_test.cpp | 2 +-
 test/integrationtests/adaptor-glue.h           | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/integrationtests/AdaptorAndProxy_test.cpp b/test/integrationtests/AdaptorAndProxy_test.cpp
index 1132a5b..b904a5b 100644
--- a/test/integrationtests/AdaptorAndProxy_test.cpp
+++ b/test/integrationtests/AdaptorAndProxy_test.cpp
@@ -394,5 +394,5 @@ TEST_F(SdbusTestObject, CannotReadFromWriteProperty)
 
 TEST_F(SdbusTestObject, AnswersXmlApiDescriptionOnIntrospection)
 {
-    ASSERT_THAT(m_proxy->Introspect(), Eq(testing_adaptor::expectedXmlApiDescription));
+    ASSERT_THAT(m_proxy->Introspect(), Eq(m_adaptor->getExpectedXmlApiDescription()));
 }
diff --git a/test/integrationtests/adaptor-glue.h b/test/integrationtests/adaptor-glue.h
index 54b43c0..ce66a48 100644
--- a/test/integrationtests/adaptor-glue.h
+++ b/test/integrationtests/adaptor-glue.h
@@ -172,7 +172,9 @@ protected:
     virtual void blocking(const bool& value) = 0;
 
 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"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
@@ -303,6 +305,7 @@ R"delimiter(<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspectio
  </interface>
 </node>
 )delimiter";
+    }
 
 };