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

Proposed by Paul J. Lucas on 2012-07-09
Status: Merged
Approved by: Paul J. Lucas on 2012-07-09
Approved revision: 10902
Merged at revision: 10921
Proposed branch: lp:~paul-lucas/zorba/feature-unordered_map
Merge into: lp:zorba
Diff against target: 42 lines (+5/-4)
3 files modified
src/unit_tests/instantiate_unordered_map.cpp (+1/-0)
src/util/hash/hashtable.h (+1/-1)
src/util/hash/hashtable.tcc (+3/-3)
To merge this branch: bzr merge lp:~paul-lucas/zorba/feature-unordered_map
Reviewer Review Type Date Requested Status
Matthias Brantner 2012-07-09 Approve on 2012-07-09
Paul J. Lucas Approve on 2012-07-09
Review via email: mp+114013@code.launchpad.net

Commit Message

Fixed warnings.

Description of the Change

Fixed warnings.

To post a comment you must log in.
Paul J. Lucas (paul-lucas) :
review: Approve
review: Approve
Zorba Build Bot (zorba-buildbot) wrote :

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) wrote :

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) wrote :

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

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/unit_tests/instantiate_unordered_map.cpp'
2--- src/unit_tests/instantiate_unordered_map.cpp 2012-06-26 01:08:10 +0000
3+++ src/unit_tests/instantiate_unordered_map.cpp 2012-07-09 17:31:25 +0000
4@@ -22,6 +22,7 @@
5
6 static void instantiate() {
7 return;
8+ instantiate(); // eliminates "defined but not used" warning
9
10 typedef unordered_map<string,int> map_type;
11
12
13=== modified file 'src/util/hash/hashtable.h'
14--- src/util/hash/hashtable.h 2012-06-05 14:16:41 +0000
15+++ src/util/hash/hashtable.h 2012-07-09 17:31:25 +0000
16@@ -609,8 +609,8 @@
17 void rehash_impl( size_type new_n_bkt );
18
19 node **buckets_;
20+ KeyEqual equal_;
21 hasher hasher_;
22- KeyEqual equal_;
23 KeyExtract key_of;
24 size_type n_bkt_;
25 size_type n_elt_;
26
27=== modified file 'src/util/hash/hashtable.tcc'
28--- src/util/hash/hashtable.tcc 2012-06-05 14:16:41 +0000
29+++ src/util/hash/hashtable.tcc 2012-07-09 17:31:25 +0000
30@@ -84,9 +84,9 @@
31
32 ZORBA_HASHTABLE_TEMPLATE
33 ZORBA_HASHTABLE_CLASS::hashtable_base( size_type bucket_count,
34- hasher const &hash,
35- key_equal const &equal,
36- allocator_type const &alloc ) :
37+ hasher const &hash,
38+ key_equal const &equal,
39+ allocator_type const &alloc ) :
40 equal_( equal ),
41 hasher_( hash ),
42 n_bkt_( bucket_count ),

Subscribers

People subscribed via source and target branches