diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-08-31 16:13:18 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-08-31 20:14:40 +0200 |
| commit | d9998186d37c58751f45dd7cb97d6c72f901a346 (patch) | |
| tree | 01e31bd159062beaecc62edfc01b77220f87d7a1 /registry | |
| parent | b5f081e1ac14f60497f62a27be86b07b0baa42f7 (diff) | |
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>
Diffstat (limited to 'registry')
| -rw-r--r-- | registry/source/regimpl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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 |