diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-26 17:28:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-26 17:31:14 +0200 |
| commit | 3a68a7dcf49f7be95086b747c8426aa310307e49 (patch) | |
| tree | 5c5ded4a7b69d4eaff886e7ee35caebf275eb738 /include/formula | |
| parent | b15019d84f52f546294c0336382ea6217f833ed2 (diff) | |
Remove workarounds for no longer supported GCC 4.6
In bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx, the #if also covered
Clang, which actually needs these declarations (for now; the right fix will
probably be to #include <cxxabi.h>).
Change-Id: I1eebd59e2371f3498d740ab78244927358c4f23f
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/tokenarray.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index 58bb092f3a7a..6d577ea01555 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -23,10 +23,10 @@ #include <com/sun/star/sheet/FormulaToken.hpp> #include <formula/token.hxx> #include <formula/ExternalReferenceHelper.hxx> -#include <o3tl/underlying_type.hxx> #include <o3tl/typed_flags_set.hxx> #include <limits.h> +#include <type_traits> #include <unordered_set> namespace svl { @@ -98,7 +98,7 @@ public: static inline bool isRewriteNeeded( OpCode eOp ); }; -typedef std::unordered_set<OpCode, std::hash<o3tl::underlying_type<OpCode>::type> > unordered_opcode_set; +typedef std::unordered_set<OpCode, std::hash<std::underlying_type<OpCode>::type> > unordered_opcode_set; class FORMULA_DLLPUBLIC FormulaTokenArray { |