zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #11909
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/feature-unordered_map/+merge/114013
Fixed warnings.
--
https://code.launchpad.net/~paul-lucas/zorba/feature-unordered_map/+merge/114013
Your team Zorba Coders is subscribed to branch lp:zorba.
=== 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 ),
Follow ups
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: noreply, 2012-07-09
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Zorba Build Bot, 2012-07-09
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Zorba Build Bot, 2012-07-09
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Paul J. Lucas, 2012-07-09
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Zorba Build Bot, 2012-07-09
-
Re: [Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Zorba Build Bot, 2012-07-09
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Zorba Build Bot, 2012-07-09
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Paul J. Lucas, 2012-07-09
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Zorba Build Bot, 2012-07-09
-
Re: [Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Zorba Build Bot, 2012-07-09
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Zorba Build Bot, 2012-07-09
-
[Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Paul J. Lucas, 2012-07-09
-
Re: [Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Matthias Brantner, 2012-07-09
-
Re: [Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
From: Paul J. Lucas, 2012-07-09