[dune-common] 01/02: Backport fix for build failure with GCC 5.

Ansgar Burchardt ansgar at moszumanska.debian.org
Tue Jul 7 19:14:44 UTC 2015


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

ansgar pushed a commit to annotated tag debian/2.3.1-2
in repository dune-common.

commit dce5f95cfe552ba8d8fe9a8960bcd8cbd0efc899
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Tue Jul 7 20:59:20 2015 +0200

    Backport fix for build failure with GCC 5.
    
    Bug-Debian: https://bugs.debian.org/777836
---
 .../0001-Fix-wrong-std-cerr-at-end-of-output.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/0001-Fix-wrong-std-cerr-at-end-of-output.patch b/debian/patches/0001-Fix-wrong-std-cerr-at-end-of-output.patch
new file mode 100644
index 0000000..7e54105
--- /dev/null
+++ b/debian/patches/0001-Fix-wrong-std-cerr-at-end-of-output.patch
@@ -0,0 +1,31 @@
+From 2498c25d2d4876ed8a27877d8cde62df6e7ec6c3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich at dune-project.org>
+Date: Fri, 28 Nov 2014 22:39:21 +0100
+Subject: [PATCH] Fix wrong std::cerr at end of output.
+
+It should be std::endl.
+Courtesy of GCC 5-svn, it refuses to compile these.
+---
+ dune/common/test/iteratortest.hh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/dune/common/test/iteratortest.hh
++++ b/dune/common/test/iteratortest.hh
+@@ -126,7 +126,7 @@
+     if(test != rand)
+     {
+       std::cerr << "i+=n should have the same result as applying the"
+-                << "increment ooperator n times!"<< std::cerr;
++                << "increment ooperator n times!"<< std::endl;
+       ret++;
+     }
+ 
+@@ -145,7 +145,7 @@
+     if(test != rand)
+     {
+       std::cerr << "i+=n should have the same result as applying the"
+-                << "increment ooperator n times!"<< std::cerr;
++                << "increment ooperator n times!"<< std::endl;
+       ret++;
+     }
+   }
diff --git a/debian/patches/series b/debian/patches/series
index ed2211d..afe5bb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ soname.patch
 dune-autogen.patch
 skip-dirs-starting-with-dot.patch
 rename-git-whitespace-hook.patch
+0001-Fix-wrong-std-cerr-at-end-of-output.patch

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



More information about the debian-science-commits mailing list