Skip to content

Commit cf73d9a

Browse files
jwellbelovejwellbelove
committed
Merge branch 'pull-request/#978-fix-build-and-test-failures-on-arm64-linux-platform' into development
2 parents d368972 + 275a3f1 commit cf73d9a

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

‎test/test_bit_stream.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -930,8 +930,8 @@ namespace
930930
//*************************************************************************
931931
TEST(put_get_multiple_variable_size)
932932
{
933-
char c1 = 26; // 6 bits
934-
char c2 = -10; // 7 bits
933+
int8_t c1 = 26; // 6 bits
934+
int8_t c2 = -10; // 7 bits
935935
unsigned short s1 = 6742; // 13 bits
936936
unsigned short s2 = 1878; // 11 bits
937937
int32_t i1 = 2448037L; // 23 bits
@@ -983,8 +983,8 @@ namespace
983983

984984
bit_stream.restart();
985985

986-
char rc1 = 0;
987-
char rc2 = 0;
986+
int8_t rc1 = 0;
987+
int8_t rc2 = 0;
988988
unsigned short rs1 = 0;
989989
unsigned short rs2 = 0;
990990
int32_t ri1 = 0;

‎test/test_bit_stream_reader_big_endian.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ namespace
210210
TEST(test_read_int8_t)
211211
{
212212
std::array<char, 4U> storage = { char(0x01), char(0x5A), char(0xA5), char(0xFF) };
213-
std::array<char, 4U> expected = { int8_t(0x01), int8_t(0x5A), int8_t(0xA5), int8_t(0xFF) };
213+
std::array<int8_t, 4U> expected = { int8_t(0x01), int8_t(0x5A), int8_t(0xA5), int8_t(0xFF) };
214214

215215
etl::bit_stream_reader bit_stream(storage.data(), storage.size(), etl::endian::big);
216216

@@ -246,7 +246,7 @@ namespace
246246
TEST(test_read_checked_int8_t_using_non_member_function)
247247
{
248248
std::array<char, 4U> storage = { char(0x01), char(0x5A), char(0xA5), char(0xFF) };
249-
std::array<char, 4U> expected = { int8_t(0x01), int8_t(0x5A), int8_t(0xA5), int8_t(0xFF) };
249+
std::array<int8_t, 4U> expected = { int8_t(0x01), int8_t(0x5A), int8_t(0xA5), int8_t(0xFF) };
250250

251251
etl::bit_stream_reader bit_stream(storage.data(), storage.size(), etl::endian::big);
252252

@@ -282,7 +282,7 @@ namespace
282282
TEST(test_read_unchecked_int8_t_using_non_member_function)
283283
{
284284
std::array<char, 4U> storage = { char(0x01), char(0x5A), char(0xA5), char(0xFF) };
285-
std::array<char, 4U> expected = { int8_t(0x01), int8_t(0x5A), int8_t(0xA5), int8_t(0xFF) };
285+
std::array<int8_t, 4U> expected = { int8_t(0x01), int8_t(0x5A), int8_t(0xA5), int8_t(0xFF) };
286286

287287
etl::bit_stream_reader bit_stream(storage.data(), storage.size(), etl::endian::big);
288288

@@ -307,7 +307,7 @@ namespace
307307
TEST(test_read_int8_t_5bits)
308308
{
309309
std::array<char, 3U> storage = { char(0x0E), char(0x8B), char(0xF0) };
310-
std::array<char, 4U> expected = { int8_t(0x01), int8_t(0xFA), int8_t(0x05), int8_t(0xFF) };
310+
std::array<int8_t, 4U> expected = { int8_t(0x01), int8_t(0xFA), int8_t(0x05), int8_t(0xFF) };
311311

312312
etl::bit_stream_reader bit_stream(storage.data(), storage.size(), etl::endian::big);
313313

‎test/test_bresenham_line.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace etl
4444

4545
namespace
4646
{
47-
using Value = char;
47+
using Value = int8_t;
4848

4949
using Point = etl::coordinate_2d<Value>;
5050

‎test/test_correlation.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ SOFTWARE.
3434

3535
namespace
3636
{
37-
std::array<char, 10> input_c
37+
std::array<int8_t, 10> input_c
3838
{
3939
0, 1, 2, 3, 4, 5, 6, 7, 8, 9
4040
};
4141

42-
std::array<char, 10> input_c_flat
42+
std::array<int8_t, 10> input_c_flat
4343
{
4444
0, 0, 0, 0, 0, 0, 0, 0, 0, 0
4545
};
4646

47-
std::array<char, 10> input_c_inv
47+
std::array<int8_t, 10> input_c_inv
4848
{
4949
0, -1, -2, -3, -4, -5, -6, -7, -8, -9
5050
};
@@ -120,21 +120,21 @@ namespace
120120
double covariance_result;
121121

122122
// Negative correlation.
123-
etl::correlation<etl::correlation_type::Population, char, int32_t> correlation1(input_c.begin(), input_c.end(), input_c_inv.begin());
123+
etl::correlation<etl::correlation_type::Population, int8_t, int32_t> correlation1(input_c.begin(), input_c.end(), input_c_inv.begin());
124124
correlation_result = correlation1;
125125
CHECK_CLOSE(-1.0, correlation_result, 0.1);
126126
covariance_result = correlation1.get_covariance();
127127
CHECK_CLOSE(-8.25, covariance_result, 0.1);
128128

129129
// Zero correlation
130-
etl::correlation<etl::correlation_type::Population, char, int32_t> correlation2(input_c.begin(), input_c.end(), input_c_flat.begin());
130+
etl::correlation<etl::correlation_type::Population, int8_t, int32_t> correlation2(input_c.begin(), input_c.end(), input_c_flat.begin());
131131
correlation_result = correlation2;
132132
CHECK_CLOSE(0.0, correlation_result, 0.1);
133133
covariance_result = correlation2.get_covariance();
134134
CHECK_CLOSE(0.0, covariance_result, 0.1);
135135

136136
// Positive correlation.
137-
etl::correlation<etl::correlation_type::Population, char, int32_t> correlation3(input_c.begin(), input_c.end(), input_c.begin());
137+
etl::correlation<etl::correlation_type::Population, int8_t, int32_t> correlation3(input_c.begin(), input_c.end(), input_c.begin());
138138
correlation_result = correlation3;
139139
CHECK_CLOSE(1.0, correlation_result, 0.1);
140140
covariance_result = correlation3.get_covariance();
@@ -148,21 +148,21 @@ namespace
148148
double covariance_result;
149149

150150
// Negative correlation.
151-
etl::correlation<etl::correlation_type::Sample, char, int32_t> correlation1(input_c.begin(), input_c.end(), input_c_inv.begin());
151+
etl::correlation<etl::correlation_type::Sample, int8_t, int32_t> correlation1(input_c.begin(), input_c.end(), input_c_inv.begin());
152152
correlation_result = correlation1;
153153
CHECK_CLOSE(-1.0, correlation_result, 0.1);
154154
covariance_result = correlation1.get_covariance();
155155
CHECK_CLOSE(-9.17, covariance_result, 0.1);
156156

157157
// Zero correlation
158-
etl::correlation<etl::correlation_type::Sample, char, int32_t> correlation2(input_c.begin(), input_c.end(), input_c_flat.begin());
158+
etl::correlation<etl::correlation_type::Sample, int8_t, int32_t> correlation2(input_c.begin(), input_c.end(), input_c_flat.begin());
159159
correlation_result = correlation2;
160160
CHECK_CLOSE(0.0, correlation_result, 0.1);
161161
covariance_result = correlation2.get_covariance();
162162
CHECK_CLOSE(0.0, covariance_result, 0.1);
163163

164164
// Positive correlation.
165-
etl::correlation<etl::correlation_type::Sample, char, int32_t> correlation3(input_c.begin(), input_c.end(), input_c.begin());
165+
etl::correlation<etl::correlation_type::Sample, int8_t, int32_t> correlation3(input_c.begin(), input_c.end(), input_c.begin());
166166
correlation_result = correlation3;
167167
CHECK_CLOSE(1.0, correlation_result, 0.1);
168168
covariance_result = correlation3.get_covariance();

‎test/test_covariance.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ SOFTWARE.
3434

3535
namespace
3636
{
37-
std::array<char, 10> input_c
37+
std::array<int8_t, 10> input_c
3838
{
3939
0, 1, 2, 3, 4, 5, 6, 7, 8, 9
4040
};
4141

42-
std::array<char, 10> input_c_flat
42+
std::array<int8_t, 10> input_c_flat
4343
{
4444
0, 0, 0, 0, 0, 0, 0, 0, 0, 0
4545
};
4646

47-
std::array<char, 10> input_c_inv
47+
std::array<int8_t, 10> input_c_inv
4848
{
4949
0, -1, -2, -3, -4, -5, -6, -7, -8, -9
5050
};
@@ -119,17 +119,17 @@ namespace
119119
double covariance_result;
120120

121121
// Negative covariance.
122-
etl::covariance<etl::covariance_type::Population, char, int32_t> covariance1(input_c.begin(), input_c.end(), input_c_inv.begin());
122+
etl::covariance<etl::covariance_type::Population, int8_t, int32_t> covariance1(input_c.begin(), input_c.end(), input_c_inv.begin());
123123
covariance_result = covariance1.get_covariance();
124124
CHECK_CLOSE(-8.25, covariance_result, 0.1);
125125

126126
// Zero covariance
127-
etl::covariance<etl::covariance_type::Population, char, int32_t> covariance2(input_c.begin(), input_c.end(), input_c_flat.begin());
127+
etl::covariance<etl::covariance_type::Population, int8_t, int32_t> covariance2(input_c.begin(), input_c.end(), input_c_flat.begin());
128128
covariance_result = covariance2.get_covariance();
129129
CHECK_CLOSE(0.0, covariance_result, 0.1);
130130

131131
// Positive covariance.
132-
etl::covariance<etl::covariance_type::Population, char, int32_t> covariance3(input_c.begin(), input_c.end(), input_c.begin());
132+
etl::covariance<etl::covariance_type::Population, int8_t, int32_t> covariance3(input_c.begin(), input_c.end(), input_c.begin());
133133
covariance_result = covariance3.get_covariance();
134134
CHECK_CLOSE(8.25, covariance_result, 0.1);
135135
}
@@ -140,17 +140,17 @@ namespace
140140
double covariance_result;
141141

142142
// Negative covariance.
143-
etl::covariance<etl::covariance_type::Sample, char, int32_t> covariance1(input_c.begin(), input_c.end(), input_c_inv.begin());
143+
etl::covariance<etl::covariance_type::Sample, int8_t, int32_t> covariance1(input_c.begin(), input_c.end(), input_c_inv.begin());
144144
covariance_result = covariance1.get_covariance();
145145
CHECK_CLOSE(-9.17, covariance_result, 0.1);
146146

147147
// Zero covariance
148-
etl::covariance<etl::covariance_type::Sample, char, int32_t> covariance2(input_c.begin(), input_c.end(), input_c_flat.begin());
148+
etl::covariance<etl::covariance_type::Sample, int8_t, int32_t> covariance2(input_c.begin(), input_c.end(), input_c_flat.begin());
149149
covariance_result = covariance2.get_covariance();
150150
CHECK_CLOSE(0.0, covariance_result, 0.1);
151151

152152
// Positive covariance.
153-
etl::covariance<etl::covariance_type::Sample, char, int32_t> covariance3(input_c.begin(), input_c.end(), input_c.begin());
153+
etl::covariance<etl::covariance_type::Sample, int8_t, int32_t> covariance3(input_c.begin(), input_c.end(), input_c.begin());
154154
covariance_result = covariance3.get_covariance();
155155
CHECK_CLOSE(9.17, covariance_result, 0.1);
156156
}

‎test/test_rms.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SOFTWARE.
3434

3535
namespace
3636
{
37-
std::array<char, 18> input_c
37+
std::array<int8_t, 18> input_c
3838
{
3939
// Sawtooth wave
4040
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, -8, -7, -6, -5, -4, -3, -2, -1
@@ -52,7 +52,7 @@ namespace
5252
//*************************************************************************
5353
TEST(test_char_rms)
5454
{
55-
etl::rms<char, int> rms(input_c.begin(), input_c.end());
55+
etl::rms<int8_t, int> rms(input_c.begin(), input_c.end());
5656
double result = rms.get_rms();
5757

5858
CHECK_CLOSE(5.21, result, 0.05);

0 commit comments

Comments
 (0)