cppu/source/uno/lbmap.cxx | 2 +-
framework/inc/uifactory/configurationaccessfactorymanager.hxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3acbc64869877868d30f7e1b8e5254282aed27f7
Author: tymyjan <tymy...@yahoo.co.uk>
Date: Fri Apr 29 21:51:16 2016 +0200
tdf#97499 Fixed containers parameters clearing #8
Change-Id: I82ca89ac483e9742be0d38a3c6882a240c7c38d8
Reviewed-on: https://gerrit.libreoffice.org/24499
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 8a87c7f..e5c3568 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 24e6127..917d3d4 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
+ >
{
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
