[med-svn] r10590 - in trunk/packages/maq/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2012-04-25 13:38:24 +0000 (Wed, 25 Apr 2012)
New Revision: 10590

Added:
   trunk/packages/maq/trunk/debian/patches/gcc-4.7.patch
Modified:
   trunk/packages/maq/trunk/debian/changelog
   trunk/packages/maq/trunk/debian/patches/series
Log:
Fix gcc-4.7 issue


Modified: trunk/packages/maq/trunk/debian/changelog
===================================================================
--- trunk/packages/maq/trunk/debian/changelog	2012-04-25 12:46:34 UTC (rev 10589)
+++ trunk/packages/maq/trunk/debian/changelog	2012-04-25 13:38:24 UTC (rev 10590)
@@ -19,6 +19,8 @@
     of using dh-autoreconf
   * debian/rules: converted to dh
   * debian/copyright: cme fix dpkg-copyright
+  * debian/patches/gcc-4.7.patch: Enable building with g++-4.7
+     Closes: #667270
 
  -- Andreas Tille <tille at debian.org>  Wed, 25 Apr 2012 14:20:16 +0200
 

Added: trunk/packages/maq/trunk/debian/patches/gcc-4.7.patch
===================================================================
--- trunk/packages/maq/trunk/debian/patches/gcc-4.7.patch	                        (rev 0)
+++ trunk/packages/maq/trunk/debian/patches/gcc-4.7.patch	2012-04-25 13:38:24 UTC (rev 10590)
@@ -0,0 +1,36 @@
+Author: Andreas Tille <tille at 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); }

Modified: trunk/packages/maq/trunk/debian/patches/series
===================================================================
--- trunk/packages/maq/trunk/debian/patches/series	2012-04-25 12:46:34 UTC (rev 10589)
+++ trunk/packages/maq/trunk/debian/patches/series	2012-04-25 13:38:24 UTC (rev 10590)
@@ -1 +1,2 @@
 10_prevent_-64_option.patch
+gcc-4.7.patch