diff options
author | tymyjan <tymyjan@yahoo.co.uk> | 2016-04-29 21:51:16 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-05-01 10:09:11 +0000 |
commit | 3acbc64869877868d30f7e1b8e5254282aed27f7 (patch) | |
tree | a47328d57be05a6d8a6255e8552088adcc1d8e24 | |
parent | 8e4ee4bc68be0fd75636466864b3f6e2716b2748 (diff) |
tdf#97499 Fixed containers parameters clearing #8
Change-Id: I82ca89ac483e9742be0d38a3c6882a240c7c38d8
Reviewed-on: https://gerrit.libreoffice.org/24499
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
-rw-r--r-- | cppu/source/uno/lbmap.cxx | 2 | ||||
-rw-r--r-- | framework/inc/uifactory/configurationaccessfactorymanager.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 8a87c7fc1912..e5c3568e023a 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -129,7 +129,7 @@ struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t > typedef std::unordered_map< OUString, MappingEntry *, OUStringHash > t_OUString2Entry; typedef std::unordered_map< - uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > > t_Mapping2Entry; + uno_Mapping *, MappingEntry *, FctPtrHash > t_Mapping2Entry; typedef set< uno_getMappingFunc > t_CallbackSet; typedef set< OUString > t_OUStringSet; diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx index 24e61278aa48..917d3d4240a4 100644 --- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx +++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx @@ -59,8 +59,8 @@ namespace framework { private: class FactoryManagerMap : public std::unordered_map<OUString, OUString, - OUStringHash, - std::equal_to< OUString > > + OUStringHash + > { }; |