Tags: patch Hi, I make a patch to address these 2 bugs. Please see the attachment.
I've also tested build with repsnapper.
repsnapper needs another patch to use libpolyclipping-dev, but it builds
well after this patch applied to vmmlib.
Yours,
Paul
--
PaulLiu (劉穎駿)
E-mail: Ying-Chun Liu (PaulLiu) <paul...@debian.org>
Description: Fix FTBFS on gcc-8 There are several build failed due to min/max/abs defined somewhere. We have to undef it to let it uses those from <algorithm> Author: Ying-Chun Liu (PaulLiu) <paul...@debian.org> Bug-Debian: https://bugs.debian.org/834472 Last-Update: 2018-10-25 Index: vmmlib-1.0/include/vmmlib/vector.hpp =================================================================== --- vmmlib-1.0.orig/include/vmmlib/vector.hpp +++ vmmlib-1.0/include/vmmlib/vector.hpp @@ -1,6 +1,10 @@ #ifndef __VMML__VECTOR__HPP__ #define __VMML__VECTOR__HPP__ +#undef min +#undef max +#undef abs + #include <vmmlib/vmmlib_config.hpp> #include <vmmlib/math.hpp> #include <vmmlib/enable_if.hpp> Index: vmmlib-1.0/include/vmmlib/quaternion.hpp =================================================================== --- vmmlib-1.0.orig/include/vmmlib/quaternion.hpp +++ vmmlib-1.0/include/vmmlib/quaternion.hpp @@ -757,7 +757,7 @@ quaternion< T >::operator-=( const vecto x() -= xyz.x(); y() -= xyz.y(); z() -= xyz.z(); - return *this; + //return *this; } Index: vmmlib-1.0/tests/tensor3_test.cpp =================================================================== --- vmmlib-1.0.orig/tests/tensor3_test.cpp +++ vmmlib-1.0/tests/tensor3_test.cpp @@ -1,5 +1,9 @@ #include "tensor3_test.hpp" +#undef max +#undef min +#undef abs + #include <vmmlib/tensor3.hpp> #include <sstream> Index: vmmlib-1.0/tests/tucker3_tensor_test.cpp =================================================================== --- vmmlib-1.0.orig/tests/tucker3_tensor_test.cpp +++ vmmlib-1.0/tests/tucker3_tensor_test.cpp @@ -1,5 +1,9 @@ #include "tucker3_tensor_test.hpp" +#undef min +#undef max +#undef abs + #include <vmmlib/tucker3_tensor.hpp> #include <sstream> Index: vmmlib-1.0/tests/qtucker3_tensor_test.cpp =================================================================== --- vmmlib-1.0.orig/tests/qtucker3_tensor_test.cpp +++ vmmlib-1.0/tests/qtucker3_tensor_test.cpp @@ -1,4 +1,6 @@ #include "qtucker3_tensor_test.hpp" +#undef min + #include <vmmlib/qtucker3_tensor.hpp> #include <sstream> Index: vmmlib-1.0/tests/tucker3_exporter_importer_test.cpp =================================================================== --- vmmlib-1.0.orig/tests/tucker3_exporter_importer_test.cpp +++ vmmlib-1.0/tests/tucker3_exporter_importer_test.cpp @@ -1,4 +1,5 @@ #include "tucker3_exporter_importer_test.hpp" +#undef min #include <vmmlib/tucker3_exporter.hpp> #include <vmmlib/tucker3_importer.hpp> #include <sstream> Index: vmmlib-1.0/tests/cp3_tensor_test.cpp =================================================================== --- vmmlib-1.0.orig/tests/cp3_tensor_test.cpp +++ vmmlib-1.0/tests/cp3_tensor_test.cpp @@ -1,4 +1,5 @@ #include "cp3_tensor_test.hpp" +#undef min #include <vmmlib/cp3_tensor.hpp> #include <vmmlib/t3_hopm.hpp> #include <sstream> Index: vmmlib-1.0/tests/t3_hosvd_test.cpp =================================================================== --- vmmlib-1.0.orig/tests/t3_hosvd_test.cpp +++ vmmlib-1.0/tests/t3_hosvd_test.cpp @@ -1,3 +1,4 @@ +#undef min #include "t3_hosvd_test.hpp" #include "vmmlib/t3_hosvd.hpp" Index: vmmlib-1.0/tests/t3_hooi_test.cpp =================================================================== --- vmmlib-1.0.orig/tests/t3_hooi_test.cpp +++ vmmlib-1.0/tests/t3_hooi_test.cpp @@ -1,3 +1,4 @@ +#undef min #include "t3_hooi_test.hpp" #include "vmmlib/t3_hooi.hpp" Index: vmmlib-1.0/tests/t3_hopm_test.cpp =================================================================== --- vmmlib-1.0.orig/tests/t3_hopm_test.cpp +++ vmmlib-1.0/tests/t3_hopm_test.cpp @@ -1,3 +1,4 @@ +#undef min #include "t3_hopm_test.hpp" #include "vmmlib/t3_hopm.hpp" #include <sstream> Index: vmmlib-1.0/tests/t3_ihopm_test.cpp =================================================================== --- vmmlib-1.0.orig/tests/t3_ihopm_test.cpp +++ vmmlib-1.0/tests/t3_ihopm_test.cpp @@ -1,3 +1,4 @@ +#undef min #include "t3_ihopm_test.hpp" #include "vmmlib/t3_ihopm.hpp" #include <sstream> Index: vmmlib-1.0/Makefile =================================================================== --- vmmlib-1.0.orig/Makefile +++ vmmlib-1.0/Makefile @@ -27,7 +27,7 @@ VMMLIB_UNIT_TESTS =\ VMMLIB_UNIT_TESTS_OBJECTS = ${VMMLIB_UNIT_TESTS:%.cpp=%.o} -CXXFLAGS += -I. -Iinclude -Itests -include stdint.h +CXXFLAGS += -I. -Iinclude -Itests -include cstdint -include algorithm -include string -include iostream # Mac OS X specific stuff # on mac we want to use the frameworks, not the unix style libs
signature.asc
Description: OpenPGP digital signature
