Kaydet (Commit) b87bfa57 authored tarafından Michael Stahl's avatar Michael Stahl

Revert "silence gcc4.8 warning"

This reverts commit a77ff844.

GCC does not like the pragma:
error: ‘-Werror’ is not an option that controls warnings [-Werror=pragmas]

Change-Id: I8b97f39056091df644bcfe570332738560cd5dc3
üst 0780e58e
...@@ -75,15 +75,7 @@ class ScFormulaResult ...@@ -75,15 +75,7 @@ class ScFormulaResult
bool mbToken :1; // whether content of union is a token bool mbToken :1; // whether content of union is a token
bool mbEmpty :1; // empty cell result bool mbEmpty :1; // empty cell result
bool mbEmptyDisplayedAsString :1; // only if mbEmpty 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 Multiline meMultiline :2; // result is multiline
#if defined __GNUC__ && !defined __clang__
#pragma GCC diagnostic pop
#endif
/** Reset mnError, mbEmpty and mbEmptyDisplayedAsString to their defaults /** Reset mnError, mbEmpty and mbEmptyDisplayedAsString to their defaults
prior to assigning other types */ prior to assigning other types */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment