1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
Author: Andreas Tille <tille@debian.org>
Date: Wed, 25 Apr 2012 14:20:16 +0200
Bug-Closed: http://bugs.debian.org/667270
Description: Build with g++ version 4.7
Just followed the hint of g++ itself which said:
note: use 'this->direct_insert_aux' instead
--- maq-0.7.1.orig/stdhash.hh
+++ maq-0.7.1/stdhash.hh
@@ -412,7 +412,7 @@
inline bool insert(const keytype_t &key) {
__lh3_hash_base_class<keytype_t>::rehash();
hashint_t i;
- int ret = direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i);
+ int ret = this->direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i);
if (ret == 0) return true;
if (ret == 1) { ++(this->n_size); ++(this->n_occupied); }
else ++(this->n_size); // then ret == 2
@@ -493,7 +493,7 @@
inline bool insert(const keytype_t &key, const valtype_t &val) {
rehash();
hashint_t i;
- int ret = direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i);
+ int ret = this->direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i);
vals[i] = val;
if (ret == 0) return true;
if (ret == 1) { ++(this->n_size); ++(this->n_occupied); }
@@ -503,7 +503,7 @@
inline bool insert(const keytype_t &key, valtype_t **q) {
rehash();
hashint_t i;
- int ret = direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i);
+ int ret = this->direct_insert_aux(key, this->n_capacity, this->keys, this->flags, &i);
*q = vals + i;
if (ret == 0) return true;
if (ret == 1) { ++(this->n_size); ++(this->n_occupied); }
|
