[Libreoffice-commits] .: 2 commits - svx/source ucb/source xmloff/source

[Fridrich Strba]

 svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx |    3 +--
 ucb/source/ucp/file/filtask.hxx                          |    3 +--
 xmloff/source/draw/EnhancedCustomShapeToken.cxx          |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit b9c023c361918bc4a472fbcfe26b5b086f5db614
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sun Feb 6 15:00:32 2011 +0100

    std::hash -> boost::hash

diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 2bc5b7e..dcab177 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -39,7 +39,7 @@ struct TCheck
         return strcmp( s1, s2 ) == 0;
     }
 };
-typedef boost::unordered_map< const char*, MSO_SPT, std::hash<const char*>, TCheck> TypeNameHashMap;
+typedef boost::unordered_map< const char*, MSO_SPT, boost::hash<const char*>, TCheck> TypeNameHashMap;
 static TypeNameHashMap* pHashMap = NULL;
 static ::osl::Mutex& getHashMapMutex()
 {
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 668e55b..f34ef10 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -147,7 +147,7 @@ namespace fileaccess
         };  // end class TaskHandling
 
 
-        typedef boost::unordered_map< sal_Int32,TaskHandling,std::hash< sal_Int32 > > TaskMap;
+        typedef boost::unordered_map< sal_Int32,TaskHandling,boost::hash< sal_Int32 > > TaskMap;
 
 
     private:
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 4e38c47..42b3cec 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -42,7 +42,7 @@ struct TCheck
         return strcmp( s1, s2 ) == 0;
     }
 };
-typedef boost::unordered_map< const char*, EnhancedCustomShapeTokenEnum, std::hash<const char*>, TCheck> TypeNameHashMap;
+typedef boost::unordered_map< const char*, EnhancedCustomShapeTokenEnum, boost::hash<const char*>, TCheck> TypeNameHashMap;
 static TypeNameHashMap* pHashMap = NULL;
 static ::osl::Mutex& getHashMapMutex()
 {
commit cecc0ae657234adf4abfae989e4ccd0df8838574
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sun Feb 6 14:57:06 2011 +0100

    Revert "Add #include <hash_map> again, we still use std::hash"
    
    This reverts commit e1c6c40659d7970bbc2fd30d49055f33c82381db.

diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index a1218df..2bc5b7e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -31,7 +31,6 @@
 #include "EnhancedCustomShapeTypeNames.hxx"
 #include <osl/mutex.hxx>
 #include <boost/unordered_map.hpp>
-#include <hash_map>
 
 struct TCheck
 {
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index 282f070..668e55b 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -30,7 +30,6 @@
 #endif
 
 #include <boost/unordered_map.hpp>
-#include <hash_map>
 #include <rtl/ustring.hxx>
 
 #include "osl/mutex.hxx"
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index a830dab..4e38c47 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -31,7 +31,6 @@
 #include "EnhancedCustomShapeToken.hxx"
 #include <osl/mutex.hxx>
 #include <boost/unordered_map.hpp>
-#include <hash_map>
 #include <string.h>
 
 namespace xmloff { namespace EnhancedCustomShapeToken {