From d9998186d37c58751f45dd7cb97d6c72f901a346 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 31 Aug 2018 16:13:18 +0200
Subject: GCC only supports inline variables since GCC 7

(see also discussion at <https://gerrit.libreoffice.org/#/c/59204/11> "new
loplugin:conststringfield" about its changes to registry/source/regimpl.cxx)

Change-Id: Id2743adbfeb4d7c42105a65ba8400d7051da2f03
Reviewed-on: https://gerrit.libreoffice.org/59873
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 registry/source/regimpl.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'registry/source')

diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index d8a58141fce7..a7647b9d512f 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -41,6 +41,7 @@
 #include "reflcnst.hxx"
 #include "keyimpl.hxx"
 
+#include <config_global.h>
 #include <osl/thread.h>
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
@@ -420,7 +421,7 @@ void dumpType(typereg::Reader const & reader, OString const & indent) {
 
 }
 
-#if __cplusplus <= 201402
+#if !HAVE_CPP_INLINE_VARIABLES
 constexpr OUStringLiteral ORegistry::ROOT;
 #endif
 
-- 
cgit