diff options
author | Michael Meeks <michael.meeks@novell.com> | 2011-03-14 15:09:33 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-14 15:09:33 +0000 |
commit | de64ae3b93c9ded9dfdb938d696dcd1a7fa4b7a9 (patch) | |
tree | efd4a0db1e9235715cee9a03815f0f33d371a77c /writerfilter/inc | |
parent | 423ad850a986ea4cd28ea760eccdc574aee4108e (diff) |
make writerfilter compile cleanly
Diffstat (limited to 'writerfilter/inc')
-rw-r--r-- | writerfilter/inc/resourcemodel/TagLogger.hxx | 2 | ||||
-rw-r--r-- | writerfilter/inc/resourcemodel/XPathLogger.hxx | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/writerfilter/inc/resourcemodel/TagLogger.hxx b/writerfilter/inc/resourcemodel/TagLogger.hxx index ee3b3fdc1014..ffe3daca71e0 100644 --- a/writerfilter/inc/resourcemodel/TagLogger.hxx +++ b/writerfilter/inc/resourcemodel/TagLogger.hxx @@ -29,7 +29,6 @@ #ifndef INCLUDED_TAG_LOGGER_HXX #define INCLUDED_TAG_LOGGER_HXX -#if OSL_DEBUG_LEVEL > 1 #include <rtl/ustring.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <WriterFilterDllApi.hxx> @@ -84,7 +83,6 @@ namespace writerfilter }; } -#endif // DEBUG #endif // INCLUDED_TAG_LOGGER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/writerfilter/inc/resourcemodel/XPathLogger.hxx b/writerfilter/inc/resourcemodel/XPathLogger.hxx index bc0cc6d11c10..0173e9c8cdde 100644 --- a/writerfilter/inc/resourcemodel/XPathLogger.hxx +++ b/writerfilter/inc/resourcemodel/XPathLogger.hxx @@ -28,23 +28,22 @@ #ifndef INCLUDED_XPATH_LOGGER_HXX #define INCLUDED_XPATH_LOGGER_HXX -#include <hash_map> #include <stack> #include <string> #include <vector> #include <boost/shared_ptr.hpp> +#include <boost/unordered_map.hpp> #include <WriterFilterDllApi.hxx> namespace writerfilter { -using ::std::hash_map; using ::std::stack; using ::std::string; using ::std::vector; class WRITERFILTER_DLLPUBLIC XPathLogger { - typedef hash_map<string, unsigned int> TokenMap_t; + typedef boost::unordered_map<string, unsigned int> TokenMap_t; typedef boost::shared_ptr<TokenMap_t> TokenMapPointer_t; TokenMapPointer_t mp_tokenMap; |