Merge lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba

[Paul J. Lucas]

Added the missing specialization for hash<unique_ptr<T,D>>.

Added the missing specialization for hash<unique_ptr<T,D>>.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-unordered_map-2012-06-29T02-17-56.706Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job feature-unordered_map-2012-06-29T02-17-56.706Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-unordered_map-2012-06-29T03-29-54.186Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job feature-unordered_map-2012-06-29T03-29-54.186Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/util/hash/hash.h'
--- src/util/hash/hash.h	2012-06-07 02:45:07 +0000
+++ src/util/hash/hash.h	2012-06-29 01:45:24 +0000
@@ -19,10 +19,15 @@
 
 // zorba
 #include <zorba/config.h>
+#ifndef ZORBA_HAVE_UNORDERED_MAP
+#include <zorba/internal/unique_ptr.h>
+#endif /* ZORBA_HAVE_UNORDERED_MAP */
 
 // standard
 #include <functional>
+#ifndef ZORBA_HAVE_UNORDERED_MAP
 #include <string>
+#endif /* ZORBA_HAVE_UNORDERED_MAP */
 #include <sys/types.h>
 
 // Exactly ONE of these should be defined.
@@ -145,6 +150,16 @@
   }
 };
 
+/** Specialization for \c unique_ptr. */
+template<typename T,class D>
+struct hash< unique_ptr<T,D> > :
+  unary_function<unique_ptr<T,D> const&,size_t>
+{
+  size_t operator()( unique_ptr<T,D> const &p ) const {
+    return reinterpret_cast<size_t>( p.get() );
+  }
+};
+
 #endif /* ZORBA_HAVE_UNORDERED_MAP */
 
 /** Specialization for \c rstring. */