some std::hash_map/set -> boost::unordered_map/set changes

2 files changed, 5 insertions, 40 deletions

diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index 92c77365b5c6..8f64eca9b7a9 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -50,7 +50,7 @@
 
 #include "macro.hxx"
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <list>
 
 #define MY_STRING_(x) # x
@@ -604,19 +604,10 @@ void Bootstrap_Impl::expandValue(
 namespace {
 
 struct bootstrap_map {
-    // map<> may be preferred here, but hash_map<> is implemented fully inline,
-    // thus there is no need to link against the stlport:
-#ifdef USE_MSVC_HASH_MAP
-    typedef std::hash_map<
-        rtl::OUString, Bootstrap_Impl *,
-        std::hash_compare<rtl::OUString>,
-        rtl::Allocator< OUString> > t;
-#else
-    typedef std::hash_map<
+    typedef boost::unordered_map<
         rtl::OUString, Bootstrap_Impl *,
         rtl::OUStringHash, std::equal_to< rtl::OUString >,
         rtl::Allocator< OUString > > t;
-#endif
 
     // get and release must only be called properly synchronized via some mutex
     // (e.g., osl::Mutex::getGlobalMutex()):
diff --git a/sal/rtl/source/unload.cxx b/sal/rtl/source/unload.cxx
index 7d64d5fc5f6c..d33de1a4ee66 100644
--- a/sal/rtl/source/unload.cxx
+++ b/sal/rtl/source/unload.cxx
@@ -32,7 +32,7 @@
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include "rtl/allocator.hxx"
 
 #include <functional>
@@ -157,30 +157,13 @@ struct hashModule
     }
 };
 
-#ifdef USE_MSVC_HASH_MAP
-namespace stdext
-{
-    inline size_t hash_value( const oslModule& rkey)
-    {
-        return (size_t)rkey;
-    }
-}
-
-typedef std::hash_map<
-    oslModule,
-    std::pair<sal_uInt32, component_canUnloadFunc>,
-    std::hash_compare<oslModule>,
-    rtl::Allocator<oslModule>
-> ModuleMap;
-#else
-typedef std::hash_map<
+typedef boost::unordered_map<
     oslModule,
     std::pair<sal_uInt32, component_canUnloadFunc>,
     hashModule,
     std::equal_to<oslModule>,
     rtl::Allocator<oslModule>
 > ModuleMap;
-#endif
 
 typedef ModuleMap::iterator Mod_IT;
 
@@ -323,22 +306,13 @@ struct hashListener
     }
 };
 
-#ifdef USE_MSVC_HASH_MAP
-typedef std::hash_map<
-    sal_Int32,
-    std::pair<rtl_unloadingListenerFunc, void*>,
-    std::hash_compare<sal_Int32>,
-    rtl::Allocator<sal_Int32>
-> ListenerMap;
-#else
-typedef std::hash_map<
+typedef boost::unordered_map<
     sal_Int32,
     std::pair<rtl_unloadingListenerFunc, void*>,
     hashListener,
     std::equal_to<sal_Int32>,
     rtl::Allocator<sal_Int32>
 > ListenerMap;
-#endif
 
 typedef ListenerMap::iterator Lis_IT;