diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-01-01 19:58:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-02 16:14:36 +0000 |
| commit | fd1372ba8b1c3eb3c7fad6d9c623176c8071f31b (patch) | |
| tree | 448f0d04f780007b3eeeb76b7c4c8c54cbfd6d9b /writerfilter | |
| parent | c48b928acab9f226ad5ad816fe773c21051431e8 (diff) | |
boost::unordered_map->std::unordered_map
you can get debug stl this way
Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/inc/pch/precompiled_writerfilter.hxx | 2 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 5 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/TagLogger.cxx | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index ded05d08b239..be50d59520cd 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -20,7 +20,6 @@ #include <boost/optional.hpp> #include <memory> #include <boost/tuple/tuple.hpp> -#include <boost/unordered_map.hpp> #include <com/sun/star/awt/FontPitch.hpp> #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/awt/FontSlant.hpp> @@ -227,6 +226,7 @@ #include <tools/mapunit.hxx> #include <tools/resmgr.hxx> #include <tools/stream.hxx> +#include <unordered_map> #include <unotools/datetime.hxx> #include <unotools/fontdefs.hxx> #include <unotools/localfilehelper.hxx> diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 69a8c7d755cc..5f1cd198a351 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -31,7 +31,8 @@ #include <stack> #include <queue> #include <boost/optional.hpp> -#include <boost/unordered_map.hpp> +#include <boost/tuple/tuple.hpp> +#include <unordered_map> #include <ooxml/resourceids.hxx> @@ -269,7 +270,7 @@ struct AnnotationPosition ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xStart; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > m_xEnd; }; -typedef boost::unordered_map< sal_Int32, AnnotationPosition > AnnotationPositions_t; +typedef std::unordered_map< sal_Int32, AnnotationPosition > AnnotationPositions_t; struct LineNumberSettings { diff --git a/writerfilter/source/dmapper/TagLogger.cxx b/writerfilter/source/dmapper/TagLogger.cxx index 5865e32a025b..e67b44772270 100644 --- a/writerfilter/source/dmapper/TagLogger.cxx +++ b/writerfilter/source/dmapper/TagLogger.cxx @@ -21,7 +21,7 @@ #include <string.h> #include "TagLogger.hxx" #include <ooxml/QNameToString.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> using namespace css; @@ -92,7 +92,7 @@ namespace writerfilter TagLogger::Pointer_t TagLogger::getInstance(const char * name) { - typedef boost::unordered_map<std::string, TagLogger::Pointer_t> TagLoggerHashMap_t; + typedef std::unordered_map<std::string, TagLogger::Pointer_t> TagLoggerHashMap_t; static TagLoggerHashMap_t tagLoggers; TagLoggerHashMap_t::iterator aIt = tagLoggers.end(); |