[Libreoffice-commits] core.git: basic/source connectivity/source cui/source
tymyjan
tymyjan at yahoo.co.uk
Mon Apr 4 05:44:58 UTC 2016
basic/source/classes/sbunoobj.cxx | 2 +-
basic/source/inc/scriptcont.hxx | 2 +-
connectivity/source/drivers/postgresql/pq_statics.hxx | 3 +--
cui/source/inc/macropg.hxx | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 362ab03eb276fd7cf73a6882faa4e4f14fcab2a4
Author: tymyjan <tymyjan at yahoo.co.uk>
Date: Sun Apr 3 14:41:58 2016 +0200
tdf#97499 Fixed containers parameters clearing #2
Change-Id: I2e77c3b33ae3b8a49a7890cac77be566391972f2
Reviewed-on: https://gerrit.libreoffice.org/23751
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index e98b0d0..610622c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3269,7 +3269,7 @@ Reference< XTypeDescriptionEnumeration > getTypeDescriptorEnumeration( const OUS
return xEnum;
}
-typedef std::unordered_map< OUString, Any, OUStringHash, ::std::equal_to< OUString > > VBAConstantsHash;
+typedef std::unordered_map< OUString, Any, OUStringHash > VBAConstantsHash;
VBAConstantHelper&
VBAConstantHelper::instance()
diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx
index ef93b4a..0411527 100644
--- a/basic/source/inc/scriptcont.hxx
+++ b/basic/source/inc/scriptcont.hxx
@@ -120,7 +120,7 @@ public:
};
-typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash, ::std::equal_to< OUString > > ModuleInfoMap;
+typedef std::unordered_map< OUString, css::script::ModuleInfo, OUStringHash > ModuleInfoMap;
typedef ::cppu::ImplHelper1< css::script::vba::XVBAModuleInfo > SfxScriptLibrary_BASE;
diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx
index 3592502..afc2a56 100644
--- a/connectivity/source/drivers/postgresql/pq_statics.hxx
+++ b/connectivity/source/drivers/postgresql/pq_statics.hxx
@@ -92,8 +92,7 @@ typedef std::unordered_map
<
OUString,
sal_Int32,
- OUStringHash,
- ::std::equal_to< OUString >
+ OUStringHash
> BaseTypeMap;
struct ImplementationStatics
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 74eb46e..5036d4b 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -36,7 +36,7 @@
class SvTreeListBox;
typedef std::unordered_map< OUString, std::pair< OUString, OUString >,
- OUStringHash, std::equal_to< OUString > > EventsHash;
+ OUStringHash > EventsHash;
struct EventDisplayName
{
More information about the Libreoffice-commits
mailing list