Author: mhekkel-guest Date: 2012-05-21 08:02:03 +0000 (Mon, 21 May 2012) New Revision: 10917
Added: trunk/packages/dssp/trunk/debian/patches/src-matrix.h Modified: trunk/packages/dssp/trunk/debian/changelog trunk/packages/dssp/trunk/debian/patches/makefile trunk/packages/dssp/trunk/debian/patches/series Log: fix for missing algorithm include in matrix.h Modified: trunk/packages/dssp/trunk/debian/changelog =================================================================== --- trunk/packages/dssp/trunk/debian/changelog 2012-05-20 18:55:50 UTC (rev 10916) +++ trunk/packages/dssp/trunk/debian/changelog 2012-05-21 08:02:03 UTC (rev 10917) @@ -1,3 +1,9 @@ +dssp (2.0.4-2) unstable; urgency=low + + * Fix for compiling with gcc 4.7, std::min (Closes: #673434) + + -- Maarten L. Hekkelman <[email protected]> Mon, 21 May 2012 10:00:00 +0200 + dssp (2.0.4-1) unstable; urgency=low * Initial release. (Closes: #669259) Modified: trunk/packages/dssp/trunk/debian/patches/makefile =================================================================== --- trunk/packages/dssp/trunk/debian/patches/makefile 2012-05-20 18:55:50 UTC (rev 10916) +++ trunk/packages/dssp/trunk/debian/patches/makefile 2012-05-21 08:02:03 UTC (rev 10917) @@ -41,8 +41,8 @@ -CFLAGS = $(INC_DIR:%=-I%) -iquote src -g -Wall -Wno-multichar -pthread -LDOPTS = $(LIB_DIR:%=-L%) $(LIBS:%=-l%) -g -pthread -+CFLAGS += -iquote src -g -Wall -Wno-multichar -pthread -+LDOPTS += $(LIBS:%=-l%) -g -pthread ++CFLAGS += -I $(HOME)/projects/boost/include -iquote src -g -Wall -Wno-multichar -pthread ++LDOPTS += -L $(HOME)/projects/boost/lib $(LIBS:%=-l%) -g -pthread OBJ_DIR = obj Modified: trunk/packages/dssp/trunk/debian/patches/series =================================================================== --- trunk/packages/dssp/trunk/debian/patches/series 2012-05-20 18:55:50 UTC (rev 10916) +++ trunk/packages/dssp/trunk/debian/patches/series 2012-05-21 08:02:03 UTC (rev 10917) @@ -1 +1,2 @@ makefile +src-matrix.h Added: trunk/packages/dssp/trunk/debian/patches/src-matrix.h =================================================================== --- trunk/packages/dssp/trunk/debian/patches/src-matrix.h (rev 0) +++ trunk/packages/dssp/trunk/debian/patches/src-matrix.h 2012-05-21 08:02:03 UTC (rev 10917) @@ -0,0 +1,23 @@ +Description: fix for compiling with gcc 4.7 + [Julian Taylor <[email protected]>] + * Include algorithm and added std:: +Author: Julian Taylor <[email protected]> +--- a/src/matrix.h ++++ b/src/matrix.h +@@ -14,6 +14,7 @@ + #include <istream> + #include <cassert> + #include <stdexcept> ++#include <algorithm> + + // -------------------------------------------------------------------- + // uBlas compatible matrix types +@@ -310,7 +311,7 @@ matrix<T> operator*(const matrix_base<T> + template<typename T> + matrix<T> operator-(const matrix_base<T>& lhs, const matrix_base<T>& rhs) + { +- matrix<T> result(min(lhs.dim_m(), rhs.dim_m()), min(lhs.dim_n(), rhs.dim_n())); ++ matrix<T> result(std::min(lhs.dim_m(), rhs.dim_m()), std::min(lhs.dim_n(), rhs.dim_n())); + + for (uint32 i = 0; i < result.dim_m(); ++i) + { _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
