sc/inc/formularesult.hxx |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit b87bfa5791c4ad7e9ea013ce93b26d18dd53b974
Author: Michael Stahl <>
Date:   Wed Oct 12 13:47:29 2016 +0200

    Revert "silence gcc4.8 warning"
    This reverts commit a77ff8446e7ed2255b11406b4ccce7ec742d7c67.
    GCC does not like the pragma:
    error: ‘-Werror’ is not an option that controls warnings 
    Change-Id: I8b97f39056091df644bcfe570332738560cd5dc3

diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index b19b001..0a977dc 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -75,15 +75,7 @@ class ScFormulaResult
     bool                mbToken :1; // whether content of union is a token
     bool                mbEmpty :1; // empty cell result
     bool                mbEmptyDisplayedAsString :1;    // only if mbEmpty
-// GCC4.8 complains about 'ScFormulaResult::meMultiline is too small to hold 
all values of enum class ScFormulaResult::Multiline'
-#if defined __GNUC__ && !defined __clang__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Werror"
     Multiline           meMultiline :2; // result is multiline
-#if defined __GNUC__ && !defined __clang__
-#pragma GCC diagnostic pop
     /** Reset mnError, mbEmpty and mbEmptyDisplayedAsString to their defaults
         prior to assigning other types */
Libreoffice-commits mailing list

Reply via email to