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

Michael Stahl mstahl at redhat.com
Tue Jul 4 12:58:01 UTC 2017


 reportdesign/source/ui/misc/FunctionHelper.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4a77a818e0df010adcbefdcee0453ce0b16c0400
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jul 4 14:56:18 2017 +0200

    reportdesign: -Werror,-Wc++1z-extensions
    
    static_assert with no message is a C++1z extension
    
    Change-Id: I90750252a5c0b856d74ca0ef3f999d457a9bb8be

diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx
index 349bc8d48061..9c9c7450f03e 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -219,7 +219,8 @@ sal_uInt32 FunctionDescription::getVarArgsStart() const
     // stability, ie. old code using the old VAR_ARGS and PAIRED_VAR_ARGS
     // values must still be handled. It is *not* sufficient to simply change
     // the values here.
-    static_assert(nVarArgs30 == VAR_ARGS && nPairedVarArgs60 == PAIRED_VAR_ARGS);
+    static_assert(nVarArgs30 == VAR_ARGS && nPairedVarArgs60 == PAIRED_VAR_ARGS,
+            "VAR_ARGS or PAIRED_VAR_ARGS has unexpected value");
     if (nLen >= nPairedVarArgs60)
         nLen -= nPairedVarArgs60;
     else if (nLen >= nVarArgs30)


More information about the Libreoffice-commits mailing list