[Libreoffice-commits] .: sal/inc sal/rtl

[Fridrich Strba]

 sal/inc/osl/diagnose.hxx     |    3 ++-
 sal/rtl/source/bootstrap.cxx |    4 +++-
 sal/rtl/source/unload.cxx    |   10 ++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit e6893ddd35fa0b4aafdec89d236f49ca2cd9ab95
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Thu Feb 3 02:56:27 2011 -0700

    Use rtl::Allocator in MSVC hash containers

diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index e97d0be..8904e75 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -106,7 +106,8 @@ namespace stdext
     }
 }
 
-typedef ::std::hash_set<void const*> VoidPointerSet;
+typedef ::std::hash_set<void const*, ::std::hash_compare<void const *>,
+                        ::rtl::Allocator<void const*> > VoidPointerSet;
 #else
 typedef ::std::hash_set<void const*, VoidPtrHash, ::std::equal_to<void const*>,
                         ::rtl::Allocator<void const*> > VoidPointerSet;
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 7e2265c..8bb7edf 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -608,7 +608,9 @@ struct bootstrap_map {
     // thus there is no need to link against the stlport:
 #ifdef USE_MSVC_HASH_MAP
     typedef std::hash_map<
-        rtl::OUString, Bootstrap_Impl *> t;
+        rtl::OUString, Bootstrap_Impl *,
+        std::hash_compare<rtl::OUString>,
+        rtl::Allocator< OUString> > t;
 #else
     typedef std::hash_map<
         rtl::OUString, Bootstrap_Impl *,
diff --git a/sal/rtl/source/unload.cxx b/sal/rtl/source/unload.cxx
index df7b243..883f3bf 100644
--- a/sal/rtl/source/unload.cxx
+++ b/sal/rtl/source/unload.cxx
@@ -168,7 +168,10 @@ namespace stdext
 
 typedef std::hash_map<
     oslModule,
-    std::pair<sal_uInt32, component_canUnloadFunc> > ModuleMap;
+    std::pair<sal_uInt32, component_canUnloadFunc>,
+    std::hash_compare<oslModule>,
+    rtl::Allocator<oslModule>
+> ModuleMap;
 #else
 typedef std::hash_map<
     oslModule,
@@ -323,7 +326,10 @@ struct hashListener
 #ifdef USE_MSVC_HASH_MAP
 typedef std::hash_map<
     sal_Int32,
-    std::pair<rtl_unloadingListenerFunc, void*> > ListenerMap;
+    std::pair<rtl_unloadingListenerFunc, void*>,
+    std::hash_compare<sal_Int32>,
+    rtl::Allocator<sal_Int32>
+> ListenerMap;
 #else
 typedef std::hash_map<
     sal_Int32,