[dune-istl] 01/02: patch: Use correct type for second template argument of `std::array`

Ansgar Burchardt ansgar at moszumanska.debian.org
Thu Apr 20 17:42:45 UTC 2017


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

ansgar pushed a commit to annotated tag debian/2.5.0-2
in repository dune-istl.

commit ad9532091b431b15eec0cff54a55f2b90c376c5c
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu Apr 20 19:34:19 2017 +0200

    patch: Use correct type for second template argument of `std::array`
    
    Bug-Debian: https://bugs.debian.org/860666
---
 ...h-bugfix-build-failure-on-i386-into-maste.patch | 28 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/0001-Merge-branch-bugfix-build-failure-on-i386-into-maste.patch b/debian/patches/0001-Merge-branch-bugfix-build-failure-on-i386-into-maste.patch
new file mode 100644
index 0000000..5677e0f
--- /dev/null
+++ b/debian/patches/0001-Merge-branch-bugfix-build-failure-on-i386-into-maste.patch
@@ -0,0 +1,28 @@
+From 81a4487be978ea350ca581bfc77a7eefb11bb7ee Mon Sep 17 00:00:00 2001
+From: Ansgar Burchardt <ansgar.burchardt at tu-dresden.de>
+Date: Thu, 20 Apr 2017 12:04:36 +0000
+Subject: [PATCH] Merge branch 'bugfix/build-failure-on-i386' into 'master'
+
+Use correct type for second template argument of `std::array`
+
+See merge request !90
+---
+ dune/istl/io.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dune/istl/io.hh b/dune/istl/io.hh
+index 37842597..abac62f5 100644
+--- a/dune/istl/io.hh
++++ b/dune/istl/io.hh
+@@ -599,7 +599,7 @@ namespace Dune {
+   }
+ 
+   // Recursively print all the blocks -- specialization for std::array
+-  template<class K, unsigned long n>
++  template<class K, std::size_t n>
+   void writeVectorToMatlabHelper (const std::array<K,n>& v, std::ostream& s)
+   {
+     for (const auto& entry : v)
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bd2b2eb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Merge-branch-bugfix-build-failure-on-i386-into-maste.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-istl.git



More information about the debian-science-commits mailing list