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 /forms | |
parent | c48b928acab9f226ad5ad816fe773c21051431e8 (diff) |
boost::unordered_map->std::unordered_map
you can get debug stl this way
Change-Id: Ia70a3e7c7c452390e8bee34975d296c9318e4a19
Diffstat (limited to 'forms')
-rw-r--r-- | forms/inc/pch/precompiled_frm.hxx | 2 | ||||
-rw-r--r-- | forms/source/component/DatabaseForm.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/Filter.hxx | 4 | ||||
-rw-r--r-- | forms/source/inc/InterfaceContainer.hxx | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx index 173b0b9e74ab..829ed3b3568d 100644 --- a/forms/inc/pch/precompiled_frm.hxx +++ b/forms/inc/pch/precompiled_frm.hxx @@ -25,7 +25,6 @@ #include <algorithm> #include <boost/optional.hpp> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <com/sun/star/awt/ActionEvent.hpp> #include <com/sun/star/awt/FontEmphasisMark.hpp> #include <com/sun/star/awt/FontRelief.hpp> @@ -339,6 +338,7 @@ #include <ucbhelper/activedatasink.hxx> #include <ucbhelper/content.hxx> #include <uno/mapping.hxx> +#include <unordered_map> #include <unotools/datetime.hxx> #include <unotools/desktopterminationobserver.hxx> #include <unotools/lingucfg.hxx> diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index f1b97365785a..fe0c0d6176f4 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -82,7 +82,7 @@ #include <osl/mutex.hxx> #include <ctype.h> -#include <boost/unordered_map.hpp> +#include <unordered_map> // compatibility: DatabaseCursorType is dead, but for compatibility reasons we still have to write it ... namespace com { diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index 4ea3502077de..cf979d4111ae 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -38,7 +38,7 @@ #include <connectivity/sqlparse.hxx> #include <svx/ParseContext.hxx> -#include <boost/unordered_map.hpp> +#include <unordered_map> namespace frm @@ -68,7 +68,7 @@ namespace frm ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent; - typedef ::boost::unordered_map< OUString, OUString, OUStringHash > MapString2String; + typedef std::unordered_map< OUString, OUString, OUStringHash > MapString2String; MapString2String m_aDisplayItemToValueItem; OUString m_aText; diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 36a219a38bab..d04c020e9238 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX #define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX -#include <boost/unordered_map.hpp> #include <comphelper/types.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/container/XNameReplace.hpp> @@ -45,6 +44,7 @@ #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/component.hxx> #include <cppuhelper/implbase8.hxx> +#include <unordered_map> namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; @@ -76,8 +76,8 @@ namespace frm ElementDescription& operator=( const ElementDescription& ); // never implemented }; -typedef ::std::vector<InterfaceRef> OInterfaceArray; -typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap; +typedef std::vector<InterfaceRef> OInterfaceArray; +typedef std::unordered_multimap< OUString, InterfaceRef, OUStringHash > OInterfaceMap; // OInterfaceContainer |