diff options
| author | tymyjan <tymyjan@yahoo.co.uk> | 2016-04-03 15:53:23 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-04 05:46:34 +0000 |
| commit | bfb9612226314cd037c8eda30cc6ebbb46dc8512 (patch) | |
| tree | 9cb3d9d1bf9ec134adb0ec9d7e4eae67979f8347 /include | |
| parent | 362ab03eb276fd7cf73a6882faa4e4f14fcab2a4 (diff) | |
tdf#97499 Fixed containers parameters clearing #3
Change-Id: I1c105de7e1df251533179fba77e3797ef1c4e2d4
Reviewed-on: https://gerrit.libreoffice.org/23752
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/osl/diagnose.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/framestatuslistener.hxx | 3 | ||||
| -rw-r--r-- | include/svtools/statusbarcontroller.hxx | 3 | ||||
| -rw-r--r-- | include/vcl/CommandImageResolver.hxx | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx index ece1e160a2bf..facccf929950 100644 --- a/include/osl/diagnose.hxx +++ b/include/osl/diagnose.hxx @@ -93,7 +93,7 @@ struct VoidPtrHash : ::std::unary_function<void const*, ::std::size_t> { } }; -typedef ::std::unordered_set<void const*, VoidPtrHash, ::std::equal_to<void const*> > VoidPointerSet; +typedef ::std::unordered_set<void const*, VoidPtrHash > VoidPointerSet; struct ObjectRegistryData { ObjectRegistryData( ::std::type_info const& rTypeInfo ) diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx index dbf22189a4cf..5597f7dfebed 100644 --- a/include/svtools/framestatuslistener.hxx +++ b/include/svtools/framestatuslistener.hxx @@ -83,8 +83,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public css::frame::XStatusListener, typedef std::unordered_map< OUString, css::uno::Reference< css::frame::XDispatch >, - OUStringHash, - std::equal_to< OUString > > URLToDispatchMap; + OUStringHash > URLToDispatchMap; bool m_bInitialized : 1, m_bDisposed : 1; diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index 2ae4481f0899..f7f16d9232f3 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -103,8 +103,7 @@ class SVT_DLLPUBLIC StatusbarController : typedef std::unordered_map< OUString, css::uno::Reference< css::frame::XDispatch >, - OUStringHash, - std::equal_to< OUString > > URLToDispatchMap; + OUStringHash > URLToDispatchMap; // methods to support status forwarder, known by the old sfx2 toolbox controller implementation void addStatusListener( const OUString& aCommandURL ); diff --git a/include/vcl/CommandImageResolver.hxx b/include/vcl/CommandImageResolver.hxx index ad09df1bcebd..875f658e5f35 100644 --- a/include/vcl/CommandImageResolver.hxx +++ b/include/vcl/CommandImageResolver.hxx @@ -31,7 +31,7 @@ enum ImageType class VCL_DLLPUBLIC CommandImageResolver { private: - typedef std::unordered_map<OUString, OUString, OUStringHash, std::equal_to<OUString>> CommandToImageNameMap; + typedef std::unordered_map<OUString, OUString, OUStringHash > CommandToImageNameMap; CommandToImageNameMap m_aCommandToImageNameMap; std::vector<OUString> m_aImageCommandNameVector; |