[Libreoffice-commits] core.git: mysqlc/source

Stephan Bergmann sbergman at redhat.com
Tue Jan 31 09:58:03 UTC 2017


 mysqlc/source/mysqlc_preparedstatement.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit ccb1b1251cb7289f554df4cabe08b9ee4524a592
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 31 10:55:16 2017 +0100

    Work around GCC 7 -Werror=implicit-fallthrough=
    
    This is in !LIBO_INTERNAL_ONLY code, so cannot use SAL_FALLTHROUGH.  And even on
    current <https://github.com/boostorg/config> master, BOOST_FALLTHROUGH does not
    yet support [[fallthrough]] for GCC 7.
    
    Change-Id: I5306c3949b13c517fe8ef643cf98c2021147617e

diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
index eff5040..39edb3e 100644
--- a/mysqlc/source/mysqlc_preparedstatement.cxx
+++ b/mysqlc/source/mysqlc_preparedstatement.cxx
@@ -490,7 +490,11 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
             setDouble( _parameterIndex, nValue );
             break;
         }
+#if defined __GNUC__ && __GNUC__ >= 7
+        [[fallthrough]];
+#else
         BOOST_FALLTHROUGH;
+#endif
     }
 
     case DataType::CHAR:
@@ -517,7 +521,11 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
             setFloat(_parameterIndex,nValue);
             break;
         }
+#if defined __GNUC__ && __GNUC__ >= 7
+        [[fallthrough]];
+#else
         BOOST_FALLTHROUGH;
+#endif
     }
 
     case DataType::DOUBLE:


More information about the Libreoffice-commits mailing list