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

[Julien Nabet]

 sw/source/core/text/txtfrm.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 7d3b676ce1ec99c64ec3ad3a3f94cb9d42c2128c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed May 11 21:28:09 2016 +0200

    Silence bogus GCC 5.3 -Werror=strict-overflow
    
    Thank you Stephan for the hint!
    
    Change-Id: I22b5a9c9e65297cba5a2894e46d2fee59825a045
    Reviewed-on: https://gerrit.libreoffice.org/24900
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 5e47bf6..2400c2b 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1444,6 +1444,12 @@ static bool lcl_ErgoVadis( SwTextFrame* pFrame, sal_Int32 &rPos, const PrepareHi
     return true;
 }
 
+// Silence over-eager warning emitted at least by GCC 5.3.1 in certain
+// instantiations:
+#if defined __GNUC__ && !defined __clang__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wstrict-overflow"
+#endif
 bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid,
                         bool bNotify )
 {
@@ -1820,6 +1826,9 @@ bool SwTextFrame::Prepare( const PrepareHint ePrep, const void* pVoid,
 
     return bParaPossiblyInvalid;
 }
+#if defined __GNUC__ && !defined __clang__
+# pragma GCC diagnostic pop
+#endif
 
 /**
  * Small Helper class: