[Libreoffice-commits] core.git: include/sal solenv/bin

[Stephan Bergmann]

 include/sal/types.h    |   10 ----------
 solenv/bin/create-tags |    2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 5742868ccf030b2c0f03538d030bd18bd5666bdb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Mar 3 13:27:04 2017 +0100

    [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

diff --git a/include/sal/types.h b/include/sal/types.h
index 9da283b..6616670 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 639111c..47400f5 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 \