From b87bfa5791c4ad7e9ea013ce93b26d18dd53b974 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 12 Oct 2016 13:47:29 +0200 Subject: [PATCH] Revert "silence gcc4.8 warning" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a77ff8446e7ed2255b11406b4ccce7ec742d7c67. GCC does not like the pragma: error: ‘-Werror’ is not an option that controls warnings [-Werror=pragmas] Change-Id: I8b97f39056091df644bcfe570332738560cd5dc3 --- sc/inc/formularesult.hxx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index b19b001640a1..0a977dcf043a 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" -#endif Multiline meMultiline :2; // result is multiline -#if defined __GNUC__ && !defined __clang__ -#pragma GCC diagnostic pop -#endif /** Reset mnError, mbEmpty and mbEmptyDisplayedAsString to their defaults prior to assigning other types */