summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/sal/types.h10
-rwxr-xr-xsolenv/bin/create-tags2
2 files changed, 1 insertions, 11 deletions
diff --git a/include/sal/types.h b/include/sal/types.h
index 9da283b383fe..6616670fcb01 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -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]]
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index 639111cb1f77..47400f55c68d 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -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 \