diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-27 21:01:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-27 23:00:45 +0000 |
| commit | 7f476fea47f06a7f8cc961dd4f6595a524346fa5 (patch) | |
| tree | 52d16713e5a2a5203b041f9ec82742617bd33b1c /comphelper | |
| parent | fc95782eb39cf4974ac4b3096695eeb89008937c (diff) | |
boost::unordered_map -> c++11 std::unordered_map
Change-Id: I28438000c2b0a8e6ce4f5640f861f572c0cb83c8
Diffstat (limited to 'comphelper')
4 files changed, 6 insertions, 10 deletions
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx index 5acedfda2c50..fdbc176a4e7b 100644 --- a/comphelper/inc/pch/precompiled_comphelper.hxx +++ b/comphelper/inc/pch/precompiled_comphelper.hxx @@ -23,7 +23,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/static_assert.hpp> -#include <boost/unordered_map.hpp> #include <cassert> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index e3696f1e4403..376ba358bb1f 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -41,15 +41,15 @@ #include <comphelper/embeddedobjectcontainer.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/weakref.hxx> -#include <boost/unordered_map.hpp> #include <algorithm> +#include <unordered_map> using namespace ::com::sun::star; namespace comphelper { -typedef boost::unordered_map<OUString, uno::Reference <embed::XEmbeddedObject>, OUStringHash> +typedef std::unordered_map<OUString, uno::Reference <embed::XEmbeddedObject>, OUStringHash> EmbeddedObjectContainerNameMap; struct EmbedImpl diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 090357995b59..e38223535241 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -26,10 +26,9 @@ #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> -#include <boost/unordered_map.hpp> -#include <functional> #include <algorithm> - +#include <functional> +#include <unordered_map> namespace comphelper { @@ -49,7 +48,7 @@ namespace comphelper //= NamedValueCollection_Impl - typedef ::boost::unordered_map< OUString, Any, OUStringHash > NamedValueRepository; + typedef std::unordered_map< OUString, Any, OUStringHash > NamedValueRepository; struct NamedValueCollection_Impl { diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index e927475df95b..1056a5e566ab 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - +#include <algorithm> #include <comphelper/numberedcollection.hxx> - #include <com/sun/star/frame/UntitledNumbersConst.hpp> - namespace comphelper{ static const char ERRMSG_INVALID_COMPONENT_PARAM[] = "NULL as component reference not allowed."; |