Kaydet (Commit) 5742868c authored tarafından Stephan Bergmann's avatar Stephan Bergmann

[API CHANGE] Remove SAL_CONSTEXPR again

...now that LIBO_INTERNAL_ONLY always has constexpr support.

It had been added for LO 5.0 (effectively always expanding to nothing for
!LIBO_INTERNAL_ONLY), not wrapped in '#if LIBO_INTERNAL_ONLY' presumably because
it was assumed to be used freely in URE include files, but turned out to be only
used in LIBO_INTERNAL_ONLY code.  It is unlikely that any 3rd party code made
use of it.

Change-Id: I68970c5a2e2d7ef68ac5b79efc8dc1de54c43198
üst 1cfedbc9
......@@ -418,16 +418,6 @@ namespace css = ::com::sun::star;
#define SAL_FINAL
#endif
/** C++11 "constexpr" feature.
@since LibreOffice 5.0
*/
#if defined LIBO_INTERNAL_ONLY
#define SAL_CONSTEXPR constexpr
#else
#define SAL_CONSTEXPR
#endif
#if defined LIBO_INTERNAL_ONLY
#if defined __clang__
#define SAL_FALLTHROUGH [[clang::fallthrough]]
......
......@@ -12,7 +12,7 @@ if test "$1" = "-e"; then
ctags=etags
fi
saloptions="-ISAL_DELETED_FUNCTION -ISAL_OVERRIDE -ISAL_FINAL -ISAL_CONSTEXPR"
saloptions="-ISAL_DELETED_FUNCTION -ISAL_OVERRIDE -ISAL_FINAL"
omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
$ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $saloptions $omnicppoptions \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment