[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - include/sal

Stephan Bergmann sbergman at redhat.com
Fri May 18 10:51:40 UTC 2018


 include/sal/types.h |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7528b03323f2b72b6495831d8bb1d983ac385e40
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 27 18:04:53 2017 +0100

    GCC 7 supports [[fallthrough]]
    
    Change-Id: Ic6fb995a76a30b60b597005e714de03d43c36a7c
    (cherry picked from commit 9ee0f108ca104ec76d2d73220686fb10c89e78e8)
    Reviewed-on: https://gerrit.libreoffice.org/54529
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/include/sal/types.h b/include/sal/types.h
index d72e9ee7df35..30820c6cd9ba 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -448,6 +448,8 @@ namespace css = ::com::sun::star;
 #if defined LIBO_INTERNAL_ONLY
 #if defined __clang__
 #define SAL_FALLTHROUGH [[clang::fallthrough]]
+#elif defined __GNUC__ && __GNUC__ >= 7
+#define SAL_FALLTHROUGH [[fallthrough]]
 #else
 #define SAL_FALLTHROUGH
 #endif


More information about the Libreoffice-commits mailing list