diff options
| author | tymyjan <tymyjan@yahoo.co.uk> | 2016-04-03 14:41:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-04 05:44:36 +0000 |
| commit | 362ab03eb276fd7cf73a6882faa4e4f14fcab2a4 (patch) | |
| tree | 220a6fae1568dfa94bd5a3cd50ce619309d5e2af | |
| parent | e860d1ebaf5d009d2b73784a400539f8902c06b0 (diff) | |
tdf#97499 Fixed containers parameters clearing #2
Change-Id: I2e77c3b33ae3b8a49a7890cac77be566391972f2
Reviewed-on: https://gerrit.libreoffice.org/23751
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | basic/source/classes/sbunoobj.cxx | 2 | ||||
| -rw-r--r-- | basic/source/inc/scriptcont.hxx | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/postgresql/pq_statics.hxx | 3 | ||||
| -rw-r--r-- | cui/source/inc/macropg.hxx | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index e98b0d069449..610622cf4984 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 ef93b4a385a0..04115270894b 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 3592502e257d..afc2a56301b4 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 74eb46e54a67..5036d4b8f5e2 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 { |