Skip to content

Commit

Permalink
Merge branch 'pull-request/#1006-Fix-arm64-signed-char' into development
Browse files Browse the repository at this point in the history
# Conflicts:
#	test/test_bit_stream.cpp
#	test/test_bresenham_line.cpp
#	test/test_correlation.cpp
#	test/test_covariance.cpp
#	test/test_rms.cpp
  • Loading branch information
jwellbelove committed Jan 8, 2025
2 parents 39e2394 + ef6f878 commit 2979648
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion test/test_bit_stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1075,4 +1075,4 @@ namespace
};
}

#include "etl/private/diagnostic_pop.h"
#include "etl/private/diagnostic_pop.h"
2 changes: 1 addition & 1 deletion test/test_bit_stream_reader_little_endian.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ namespace
TEST(test_read_int8_t)
{
std::array<char, 4U> storage = { char(0x80), char(0x5A), char(0xA5), char(0xFF) };
std::array<char, 4U> expected = { int8_t(0x01), int8_t(0x5A), int8_t(0xA5), int8_t(0xFF) };
std::array<int8_t, 4U> expected = { int8_t(0x01), int8_t(0x5A), int8_t(0xA5), int8_t(0xFF) };

etl::bit_stream_reader bit_stream(storage.data(), storage.size(), etl::endian::little);

Expand Down
2 changes: 1 addition & 1 deletion test/test_correlation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace
//*************************************************************************
TEST(test_char_correlation_default_constructor)
{
etl::correlation<etl::correlation_type::Population, char, int32_t> correlation;
etl::correlation<etl::correlation_type::Population, signed char, int32_t> correlation;

double correlation_result = correlation;

Expand Down
2 changes: 1 addition & 1 deletion test/test_covariance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace
//*************************************************************************
TEST(test_char_covariance_default_constructor)
{
etl::covariance<etl::covariance_type::Population, char, int32_t> covariance;
etl::covariance<etl::covariance_type::Population, signed char, int32_t> covariance;

double covariance_result = covariance;

Expand Down

0 comments on commit 2979648

Please sign in to comment.