This is an automated email from the git hooks/post-receive script. gert-guest pushed a commit to branch master in repository fastml.
commit 8e2261d1196ab6dcde2464de73f026d4eb7491f0 Author: Gert Wollny <[email protected]> Date: Tue May 10 09:28:19 2016 +0000 Add patch to really compile with g++-6 --- debian/changelog | 5 +-- debian/patches/g++-6.patch | 78 ++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8b9604e..a59dfef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ fastml (3.1-3) UNRELEASED; urgency=medium * Team upload [Gert Wollny] - * d/b/remove-template-depth.patch add patch to not restrict template - depth. (Default with g++-6 is 900). Closes: #811944 + * d/p/remove-template-depth.patch add patch to not restrict template + depth. (Default with g++-6 is 900) + * d/p/g++-6.patch: fix compilation with g++-6, Closes: +811944 * d/control: Update standards version to 3.9.8 -- Gert Wollny <[email protected]> Tue, 10 May 2016 08:50:34 +0000 diff --git a/debian/patches/g++-6.patch b/debian/patches/g++-6.patch new file mode 100644 index 0000000..23c1b51 --- /dev/null +++ b/debian/patches/g++-6.patch @@ -0,0 +1,78 @@ +Author: Gert Wollny <[email protected]> +Last-Update: Tue, 10 May 2016 +Bug: https://bugs.debian.org/811944 +Forwarded-Upstream: no +Description: Replace comparisons of std::*stream + It is no longer possible to compare std::*stream to NULL or + to each other, hence use .good() in the first case and compare + the pointers in the second one. + +--- a/libs/phylogeny/errorMsg.cpp ++++ b/libs/phylogeny/errorMsg.cpp +@@ -16,7 +16,7 @@ + for (int i =0 ; i < textToPrint.size() ; ++i) { + LOG(1,<<textToPrint[i]<<endl); + cerr<<textToPrint[i]<<endl; +- if (_errorOut != NULL && *_errorOut != cerr) { ++ if (_errorOut != NULL && _errorOut != &cerr) { + (*_errorOut)<<textToPrint[i]<<endl; + } + } +@@ -31,7 +31,7 @@ + void errorMsg::reportError(const string& textToPrint, const int exitCode) { + LOG(1,<<endl<<textToPrint<<endl); + cerr<<endl<<textToPrint<<endl; +- if (_errorOut != NULL && *_errorOut != cerr) { ++ if (_errorOut != NULL && _errorOut != &cerr) { + (*_errorOut)<<textToPrint<<endl; + } + if (errno!=0){ +--- a/libs/phylogeny/someUtil.cpp ++++ b/libs/phylogeny/someUtil.cpp +@@ -353,7 +353,7 @@ + + bool checkThatFileExist(const string& fileName) { + ifstream file1(fileName.c_str()); +- if (file1==NULL) return false; ++ if (!file1.good()) return false; + file1.close(); + return true; + } +@@ -401,7 +401,7 @@ + const string& inFileName) { + ifstream f; + f.open(inFileName.c_str()); +- if (f==NULL) { ++ if (!f.good()) { + string tmp = "Unable to open file name: "+inFileName+" in function searchStringInFile"; + errorMsg::reportError(tmp); + } +@@ -428,7 +428,7 @@ + const string& inFileName) {// return the string that is AFTER the string to search. + ifstream f; + f.open(inFileName.c_str()); +- if (f==NULL) { ++ if (!f.good()) { + string tmp = "Unable to open file name: "+inFileName+" in function searchStringInFile"; + errorMsg::reportError(tmp); + } +@@ -452,7 +452,7 @@ + bool doesWordExistInFile(const string& string2find,const string& inFileName) { + ifstream f; + f.open(inFileName.c_str()); +- if (f==NULL) { ++ if (!f.good()) { + string tmp = "Unable to open file name: "+inFileName+" in function searchStringInFile"; + errorMsg::reportError(tmp); + } +--- a/programs/fastml/bbReport.cpp ++++ b/programs/fastml/bbReport.cpp +@@ -47,7 +47,7 @@ + //} + out<<" position is: "<<_position<<endl; + // cerr<<"reportFileIs: "<<_reportFileName<<endl; +- if (out == NULL) { ++ if (!out.good()) { + errorMsg::reportError("unable to open output file for reporting"); + } + // exit(555); diff --git a/debian/patches/series b/debian/patches/series index 87327f2..52f9e6e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ spelling.patch change_to_tests_dir_only_if_existing.patch skip_failing_tests.patch remove-template-depth.patch +g++-6.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fastml.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
