[Libreoffice-commits] .: dbaccess/source

[Fridrich Strba]

 dbaccess/source/core/inc/column.hxx              |    4 ++--
 dbaccess/source/core/recovery/subcomponents.hxx  |    4 ++--
 dbaccess/source/ui/app/subcomponentmanager.cxx   |    1 -
 dbaccess/source/ui/browser/genericcontroller.cxx |    4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 07a0a4bcdda453dc5fc760ebbc27bb7b19863cc0
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sat Feb 5 18:31:11 2011 +0100

    move to unordered containers

diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index 72bd63e..fa96f0a 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -62,7 +62,7 @@
 #include <cppuhelper/propshlp.hxx>
 #include <osl/diagnose.h>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 
 namespace dbaccess
 {
@@ -157,7 +157,7 @@ namespace dbaccess
     //= general columns map, could be used for readonly access
     //= no appending and dropping is supported
     //============================================================
-    typedef ::std::hash_map<rtl::OUString, OColumn*, ::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap;
+    typedef ::boost::unordered_map<rtl::OUString, OColumn*, ::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap;
     typedef ::std::vector<OColumn*> OColumnArray;
 
     class OContainerMediator;
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index 77446b7..43b7fa8 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -35,7 +35,7 @@
 
 #include <rtl/ustring.hxx>
 
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <map>
 
 //........................................................................
@@ -78,7 +78,7 @@ namespace dbaccess
     };
 
     // -------------------------------------------------------------------
-    typedef ::std::hash_map< ::rtl::OUString, SubComponentDescriptor, ::rtl::OUStringHash > MapStringToCompDesc;
+    typedef ::boost::unordered_map< ::rtl::OUString, SubComponentDescriptor, ::rtl::OUStringHash > MapStringToCompDesc;
     typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs;
 
 
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index e8efda6..4a56bbe 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -45,7 +45,6 @@
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
-#include <hash_map>
 #include <algorithm>
 #include <functional>
 
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 8e57341..b66ded2 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -64,7 +64,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/logfile.hxx>
 #include <algorithm>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <limits>
 
@@ -90,7 +90,7 @@ using namespace ::comphelper;
 #define LAST_USER_DEFINED_FEATURE   ( ::std::numeric_limits< sal_uInt16 >::max()        )
 
 // -------------------------------------------------------------------------
-typedef ::std::hash_map< sal_Int16, sal_Int16 > CommandHashMap;
+typedef ::boost::unordered_map< sal_Int16, sal_Int16 > CommandHashMap;
 typedef ::std::list< DispatchInformation > DispatchInfoList;