From 8de6948e4f67b65d0320f7ec08ab9ad8328b2411 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Thu, 29 Sep 2011 13:11:26 +0200
Subject: fix trunk gcc compile errors

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

(limited to 'slideshow')

diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index 0293fb8a9abe..ad3e79aacccc 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -78,13 +78,6 @@ 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 >(
@@ -103,9 +96,17 @@ namespace slideshow
             ::com::sun::star::uno::Reference<
                   ::com::sun::star::uno::XInterface> const xRoot(
                       x, ::com::sun::star::uno::UNO_QUERY );
-            return hash<void *>()(xRoot.get());
+            return ::std::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
-- 
cgit