1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
|
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) <paulliu@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
|
