summaryrefslogtreecommitdiff
path: root/include/formula
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2017-04-01 10:05:30 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-03 06:33:51 +0000
commitb7b2c95fbc376ecea60b91e3e04fd52428258137 (patch)
tree081877af774e8939bd90781db3a80081dd072f7a /include/formula
parentd7869e561100efee7e4bd747934d6757e67dc0d9 (diff)
remove hack for non DBG_UTIL builds
always use a 8bit enum for StackVar correct StackVar types for opcode opSep and opClose in unit test and test them. Change-Id: I89fac97d791eb12667ce5218ff31e798c8711e10 Reviewed-on: https://gerrit.libreoffice.org/36000 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/formula')
-rw-r--r--include/formula/token.hxx10
1 files changed, 1 insertions, 9 deletions
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index 2de988e551b6..19d1b1bb5bdf 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -44,7 +44,7 @@ enum class FormulaError : sal_uInt16;
namespace formula
{
-enum StackVarEnum
+enum StackVar : sal_uInt8
{
svByte,
svDouble,
@@ -80,14 +80,6 @@ enum StackVarEnum
svUnknown // unknown StackType
};
-#ifndef DBG_UTIL
-// save memory since compilers tend to int an enum
-typedef sal_uInt8 StackVar;
-#else
-// have enum names in debugger
-typedef StackVarEnum StackVar;
-#endif
-
// Only to be used for debugging output. No guarantee of stability of the
// return value.
inline std::string StackVarEnumToString(StackVar const e)