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

[Paul J. Lucas]

Fixed warnings.

Fixed warnings.

[Paul J. Lucas (paul-lucas)]

review: Approve

[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-07-09T17-45-03.094Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job feature-unordered_map-2012-07-09T17-45-03.094Z is
  finished. The final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-unordered_map-2012-07-09T22-27-55.487Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job feature-unordered_map-2012-07-09T22-27-55.487Z is
  finished. The final status was:

  Undetermined, probably an error - please email <email address hidden> with the
  number of this job!

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-unordered_map-2012-07-09T23-13-58.367Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job feature-unordered_map-2012-07-09T23-13-58.367Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/unit_tests/instantiate_unordered_map.cpp'
--- src/unit_tests/instantiate_unordered_map.cpp	2012-06-26 01:08:10 +0000
+++ src/unit_tests/instantiate_unordered_map.cpp	2012-07-09 17:31:25 +0000
@@ -22,6 +22,7 @@
 
 static void instantiate() {
   return;
+  instantiate(); // eliminates "defined but not used" warning
 
   typedef unordered_map<string,int> map_type;
 

=== modified file 'src/util/hash/hashtable.h'
--- src/util/hash/hashtable.h	2012-06-05 14:16:41 +0000
+++ src/util/hash/hashtable.h	2012-07-09 17:31:25 +0000
@@ -609,8 +609,8 @@
   void rehash_impl( size_type new_n_bkt );
 
   node **buckets_;
+  KeyEqual equal_;
   hasher hasher_;
-  KeyEqual equal_;
   KeyExtract key_of;
   size_type n_bkt_;
   size_type n_elt_;

=== modified file 'src/util/hash/hashtable.tcc'
--- src/util/hash/hashtable.tcc	2012-06-05 14:16:41 +0000
+++ src/util/hash/hashtable.tcc	2012-07-09 17:31:25 +0000
@@ -84,9 +84,9 @@
 
 ZORBA_HASHTABLE_TEMPLATE
 ZORBA_HASHTABLE_CLASS::hashtable_base( size_type bucket_count,
-                                  hasher const &hash,
-                                  key_equal const &equal,
-                                  allocator_type const &alloc ) :
+                                       hasher const &hash,
+                                       key_equal const &equal,
+                                       allocator_type const &alloc ) :
   equal_( equal ),
   hasher_( hash ),
   n_bkt_( bucket_count ),