This is an automated email from the git hooks/post-receive script. jdutheil-guest pushed a commit to branch master in repository libbpp-phyl.
commit 811e7570545356fceef7c8eee046894037e6f1b7 Author: Julien Y. Dutheil <duth...@evolbio.mpg.de> Date: Fri Feb 9 09:34:02 2018 +0100 Fixed covariant return error on 32bits arch. --- debian/changelog | 7 +++++++ debian/patches/fix_covariant_return.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+) diff --git a/debian/changelog b/debian/changelog index f6e47cb..1577db0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libbpp-phyl (2.3.2-2) UNRELEASED; urgency=medium + + [ Julien Dutheil ] + * Fixed covariant return type on 32bits arch. + + -- Julien Dutheil <julien.duth...@univ-montp2.fr> Fri, 09 Feb 2018 09:10:11 +0200 + libbpp-phyl (2.3.2-1) UNRELEASED; urgency=medium [ Julien Dutheil ] diff --git a/debian/patches/fix_covariant_return.patch b/debian/patches/fix_covariant_return.patch new file mode 100644 index 0000000..7f7f43b --- /dev/null +++ b/debian/patches/fix_covariant_return.patch @@ -0,0 +1,19 @@ +diff --git a/src/Bpp/Phyl/Model/RegisterRatesSubstitutionModel.h b/src/Bpp/Phyl/Model/RegisterRatesSubstitutionModel.h +index 9d20298..fe0bc51 100644 +--- a/src/Bpp/Phyl/Model/RegisterRatesSubstitutionModel.h ++++ b/src/Bpp/Phyl/Model/RegisterRatesSubstitutionModel.h +@@ -151,12 +151,12 @@ namespace bpp + return AbstractWrappedSubstitutionModel::getAlphabetStates(); + } + +- std::vector<long unsigned int> getModelStates(int i) const ++ std::vector<size_t> getModelStates(int i) const + { + return AbstractWrappedSubstitutionModel::getModelStates(i); + } + +- std::vector<long unsigned int> getModelStates(const std::string& s) const ++ std::vector<size_t> getModelStates(const std::string& s) const + { + return AbstractWrappedSubstitutionModel::getModelStates(s); + } diff --git a/debian/patches/series b/debian/patches/series index 305f256..bb8e66d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ unforce-cxxflags.patch correct_constructors_inheritance.patch +fix_covariant_return.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-phyl.git _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit