mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "silence gcc4.8 warning"

Browse Source 
This reverts commit a77ff8446e.

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

Change-Id: I8b97f39056091df644bcfe570332738560cd5dc3
This commit is contained in:
Michael Stahl
2016-10-12 13:47:29 +02:00
parent 0780e58e57
commit b87bfa5791
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sc/inc/formularesult.hxx
View File

@@ -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 */