diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-05-11 21:28:09 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2016-05-12 05:03:38 +0000 |
| commit | 7d3b676ce1ec99c64ec3ad3a3f94cb9d42c2128c (patch) | |
| tree | 6a0b724206c1784c475f709309646ac5ee6f99ae /sw | |
| parent | cc63036369b29d7985e2e773470f6f9aa068f4e2 (diff) | |
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@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/txtfrm.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx index 5e47bf635835..2400c2b8de82 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: |