[med-svn] [mia] 02/06: correct error that FTBFS with g++5

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository mia.

commit 7f73237134f75f741426cd788804b07b95c8ea63
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Fri May 29 12:15:30 2015 +0200

    correct error that FTBFS with g++5
---
 debian/patches/04_correct_flag_outstream.patch | 21 +++++++++++++++++++++
 debian/patches/series                          |  1 +
 mia/core/cmdlineparser.cc                      |  2 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/patches/04_correct_flag_outstream.patch b/debian/patches/04_correct_flag_outstream.patch
new file mode 100644
index 0000000..c1813c1
--- /dev/null
+++ b/debian/patches/04_correct_flag_outstream.patch
@@ -0,0 +1,21 @@
+Description: Remove the os from the stream chain. 
+ This was a bug anyway and with g++-5 it finally shows up as compile error
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Origin: upstream
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/778005 
+Last-Update: 2015-05-29
+
+diff --git a/mia/core/cmdlineparser.cc b/mia/core/cmdlineparser.cc
+index 452084c..33a6bcc 100644
+--- a/mia/core/cmdlineparser.cc
++++ b/mia/core/cmdlineparser.cc
+@@ -854,7 +854,7 @@ void CCmdFlagOption::do_write_value(std::ostream& os) const
+ 
+ void CCmdFlagOption::do_get_long_help(std::ostream& os) const
+ {
+-	os << " supported flags:(" <<m_map.get_flagnames() << os << ")";
++	os << " supported flags:(" <<m_map.get_flagnames() << ")";
+ }
+ 
+ const std::string CCmdFlagOption::do_get_value_as_string() const
diff --git a/debian/patches/series b/debian/patches/series
index 287fdd4..ab0b31f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_disable-treeview-for-jquery-compatibility.patch
 02-manpage-correction.patch
 03_correct_instaciation_of_default_3Dvectorfield_constructor.patch
+04_correct_flag_outstream.patch
diff --git a/mia/core/cmdlineparser.cc b/mia/core/cmdlineparser.cc
index 452084c..33a6bcc 100644
--- a/mia/core/cmdlineparser.cc
+++ b/mia/core/cmdlineparser.cc
@@ -854,7 +854,7 @@ void CCmdFlagOption::do_write_value(std::ostream& os) const
 
 void CCmdFlagOption::do_get_long_help(std::ostream& os) const
 {
-	os << " supported flags:(" <<m_map.get_flagnames() << os << ")";
+	os << " supported flags:(" <<m_map.get_flagnames() << ")";
 }
 
 const std::string CCmdFlagOption::do_get_value_as_string() const

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git