[Libreoffice-commits] .: slideshow/source

[Stephan Bergmann]

 slideshow/source/inc/tools.hxx |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit a08df51f64757e5c785d89b9fdd55a9dbe32bd6d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 29 14:01:20 2011 +0200

    Reverted std::hash map part of previous "fix trunk gcc compile errors."

diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index ad3e79a..0293fb8 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -78,6 +78,13 @@ namespace slideshow
 
         // xxx todo: remove with boost::hash when 1.33 is available
         template <typename T>
+        struct hash : ::std::unary_function<T, ::std::size_t>
+        {
+            ::std::size_t operator()( T const& val ) const {
+                return hash_value(val);
+            }
+        };
+        template <typename T>
         inline ::std::size_t hash_value( T * const& p )
         {
             ::std::size_t d = static_cast< ::std::size_t >(
@@ -96,17 +103,9 @@ namespace slideshow
             ::com::sun::star::uno::Reference<
                   ::com::sun::star::uno::XInterface> const xRoot(
                       x, ::com::sun::star::uno::UNO_QUERY );
-            return ::std::hash<void *>()(xRoot.get());
+            return hash<void *>()(xRoot.get());
         }
 
-        template <typename T>
-        struct hash : ::std::unary_function<T, ::std::size_t>
-        {
-            ::std::size_t operator()( T const& val ) const {
-                return hash_value(val);
-            }
-        };
-
         /** Cycle mode of intrinsic animations
          */
         enum CycleMode