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 /include/sal | |
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 'include/sal')
-rw-r--r-- | include/sal/types.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/sal/types.h b/include/sal/types.h index 6e20a854861f..c4e472cc4210 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -677,20 +677,6 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) { #endif /// @endcond -/// @cond INTERNAL -/** Inline variables, where supported. - - @since LibreOffice 6.2 -*/ -#if defined LIBO_INTERNAL_ONLY -#if HAVE_CPP_INLINE_VARIABLES -#define SAL_INLINE_VARIABLE inline -#else -#define SAL_INLINE_VARIABLE -#endif -#endif -/// @endcond - #endif // INCLUDED_SAL_TYPES_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |