[r-cran-mcmcpack] 64/90: Imported Debian patch 1.2-2-1.1

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-mcmcpack.

commit 10c9446eccca1e4c9c920ee5296a1ed92f6b904e
Author: gregor herrmann <gregoa at debian.org>
Date:   Tue May 8 17:06:03 2012 +0200

    Imported Debian patch 1.2-2-1.1
---
 debian/changelog             |  8 ++++++++
 debian/patches/gcc-4.7.patch | 33 +++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f1940e9..8eb07f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mcmcpack (1.2-2-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-4.7": add patch gcc-4.7.patch ("this->" qualifier).
+    (Closes: #667272)
+
+ -- gregor herrmann <gregoa at debian.org>  Tue, 08 May 2012 17:06:03 +0200
+
 mcmcpack (1.2-2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/gcc-4.7.patch b/debian/patches/gcc-4.7.patch
new file mode 100644
index 0000000..976e2fd
--- /dev/null
+++ b/debian/patches/gcc-4.7.patch
@@ -0,0 +1,33 @@
+Description: add this-> qualifier to avoid FTBFS with gcc 4.7
+Author: gregor herrmann <gregoa at debian.org>
+Bug-Debian: http://bugs.debian.org/667272
+Forwarded: no
+
+--- mcmcpack-1.2-2.orig/src/matrix.h
++++ mcmcpack-1.2-2/src/matrix.h
+@@ -1276,10 +1276,10 @@ namespace scythe {
+ 					DBRef ()
+ 			{
+         if (STYLE == Concrete) {
+-          referenceNew(M.size());
++          this->referenceNew(M.size());
+           scythe::copy<ORDER,ORDER>(M, *this);
+         } else // STYLE == View
+-          referenceOther(M);
++          this->referenceOther(M);
+ 			}
+ 
+       /*! \brief Cross order and/or style copy constructor.
+@@ -1323,10 +1323,10 @@ namespace scythe {
+ 					DBRef ()
+ 			{
+         if (STYLE == Concrete) {
+-          referenceNew(M.size());
++          this->referenceNew(M.size());
+           scythe::copy<ORDER,ORDER> (M, *this);
+         } else // STYLE == View
+-          referenceOther(M);
++          this->referenceOther(M);
+ 			}
+ 
+       /*! \brief Cross type copy constructor
diff --git a/debian/patches/series b/debian/patches/series
index d403531..7ac928e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian-changes-1.0-5-1
+gcc-4.7.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-mcmcpack.git