[Libreoffice-commits] .: 2 commits - binfilter/bf_svtools oox/inc oox/source

[Fridrich Strba]

 binfilter/bf_svtools/source/config/svt_pathoptions.cxx |    5 ++---
 oox/inc/oox/export/shapes.hxx                          |    2 +-
 oox/source/export/shapes.cxx                           |    4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit a2d5b2d8a0130cf7771610379347e09c74d37014
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sun Feb 6 14:45:40 2011 +0100

    use boost::hash instead of std::hash

diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index dd27a0e..cf9c9a3 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -121,7 +121,7 @@ class NameToHandleMap : public ::boost::unordered_map<	::rtl::OUString, sal_Int3
         inline void free() { NameToHandleMap().swap( *this ); }
 };
 
-class EnumToHandleMap : public ::boost::unordered_map< sal_Int32, sal_Int32, std::hash< sal_Int32 >, std::equal_to< sal_Int32 > >
+class EnumToHandleMap : public ::boost::unordered_map< sal_Int32, sal_Int32, boost::hash< sal_Int32 >, std::equal_to< sal_Int32 > >
 {
     public:
         inline void free() { EnumToHandleMap().swap( *this ); }
diff --git a/oox/inc/oox/export/shapes.hxx b/oox/inc/oox/export/shapes.hxx
index 040704e..abf00a7 100644
--- a/oox/inc/oox/export/shapes.hxx
+++ b/oox/inc/oox/export/shapes.hxx
@@ -61,7 +61,7 @@ private:
 
     struct ShapeHash
     {
-        std::hash<const char*> maHashFunction;
+        boost::hash<const char*> maHashFunction;
 
         size_t operator()( const ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShape > ) const;
     };
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 875234f..ed43ba3 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -326,7 +326,7 @@ struct StringCheck
     }
 };
 
-typedef boost::unordered_map< const char*, const char*, std::hash<const char*>, StringCheck> CustomShapeTypeTranslationHashMap;
+typedef boost::unordered_map< const char*, const char*, boost::hash<const char*>, StringCheck> CustomShapeTypeTranslationHashMap;
 static CustomShapeTypeTranslationHashMap* pCustomShapeTypeTranslationHashMap = NULL;
 
 static const char* lcl_GetPresetGeometry( const char* sShapeType )
@@ -869,7 +869,7 @@ ShapeExport& ShapeExport::WriteRectangleShape( Reference< XShape > xShape )
 }
 
 typedef ShapeExport& (ShapeExport::*ShapeConverter)( Reference< XShape > );
-typedef boost::unordered_map< const char*, ShapeConverter, std::hash<const char*>, StringCheck> NameToConvertMapType;
+typedef boost::unordered_map< const char*, ShapeConverter, boost::hash<const char*>, StringCheck> NameToConvertMapType;
 
 static const NameToConvertMapType& lcl_GetConverters()
 {
commit 92984f34150f577dbcf9875057e8a06ee4f9a74b
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sun Feb 6 14:43:15 2011 +0100

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

diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index f428d90..dd27a0e 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -62,7 +62,6 @@
 
 #include <vector>
 #include <boost/unordered_map.hpp>
-#include <hash_map>
 
 using namespace osl;
 using namespace utl;