diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 12:24:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 22:47:49 +0100 |
| commit | 66ef8ca217680095d8aaae025d82c2cbcd8ec1d2 (patch) | |
| tree | 2a7f4d2b5892c5fea9b89f0f27ccd6f771af5769 /registry | |
| parent | 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b (diff) | |
HAVE_CPP_INLINE_VARIABLES is always true now
...but for safety, leave the configure.ac check in for some longer.
Also remove now-redundant SAL_INLINE_VARIABLE again (which was
LIBO_INTERNAL_ONLY).
Change-Id: Id049e0cb84b4f97f5859f1b16b867b39b448dec0
Reviewed-on: https://gerrit.libreoffice.org/64772
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'registry')
| -rw-r--r-- | registry/source/regimpl.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index a7647b9d512f..9f01788b0f4b 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -41,7 +41,6 @@ #include "reflcnst.hxx" #include "keyimpl.hxx" -#include <config_global.h> #include <osl/thread.h> #include <rtl/alloc.h> #include <rtl/ustring.hxx> @@ -421,10 +420,6 @@ void dumpType(typereg::Reader const & reader, OString const & indent) { } -#if !HAVE_CPP_INLINE_VARIABLES -constexpr OUStringLiteral ORegistry::ROOT; -#endif - ORegistry::ORegistry() : m_refCount(1) , m_readOnly(false) |