diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-09 15:44:29 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-09 15:44:29 +0100 |
| commit | a1ecce3ad7df6a82191c4956cec986dc50503dde (patch) | |
| tree | 903dba300ef322f6d2607ffc6775b445c36dc135 /include/formula | |
| parent | Work around -fsanitize=null (diff) | |
| download | core-a1ecce3ad7df6a82191c4956cec986dc50503dde.tar.gz core-a1ecce3ad7df6a82191c4956cec986dc50503dde.zip | |
One more place to work around missing std::underlying_type for GCC 4.6
Change-Id: I46225e30f6326e0af5a8ac3bebe9847f4dbe50d0
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/tokenarray.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index d9c02da3c0e9..639f8fa8f9ed 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -23,6 +23,8 @@ #include <com/sun/star/sheet/FormulaToken.hpp> #include <formula/token.hxx> #include <formula/ExternalReferenceHelper.hxx> +#include <o3tl/underlying_type.hxx> + #include <limits.h> #include <type_traits> #include <unordered_set> @@ -90,7 +92,7 @@ public: inline bool isRewriteNeeded( OpCode eOp ) const; }; -typedef std::unordered_set<OpCode, std::hash<std::underlying_type<OpCode>::type> > unordered_opcode_set; +typedef std::unordered_set<OpCode, std::hash<o3tl::underlying_type<OpCode>::type> > unordered_opcode_set; class FORMULA_DLLPUBLIC FormulaTokenArray { |