util/Macros: replace with std::size() (C++17)
This commit is contained in:
@@ -18,7 +18,6 @@
|
||||
*/
|
||||
|
||||
#include "util/ByteReverse.hxx"
|
||||
#include "util/Macros.hxx"
|
||||
#include "util/Compiler.h"
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
@@ -30,10 +29,10 @@ TEST(ByteReverse, A)
|
||||
{
|
||||
alignas(uint16_t) static const char src[] = "123456";
|
||||
static const char result[] = "214365";
|
||||
alignas(uint16_t)static uint8_t dest[ARRAY_SIZE(src)];
|
||||
alignas(uint16_t)static uint8_t dest[std::size(src)];
|
||||
|
||||
reverse_bytes(dest, (const uint8_t *)src,
|
||||
(const uint8_t *)(src + ARRAY_SIZE(src) - 1), 2);
|
||||
(const uint8_t *)(src + std::size(src) - 1), 2);
|
||||
EXPECT_STREQ(result, (const char *)dest);
|
||||
}
|
||||
|
||||
@@ -41,10 +40,10 @@ TEST(ByteReverse, B)
|
||||
{
|
||||
static const char src[] = "123456";
|
||||
static const char result[] = "321654";
|
||||
static uint8_t dest[ARRAY_SIZE(src)];
|
||||
static uint8_t dest[std::size(src)];
|
||||
|
||||
reverse_bytes(dest, (const uint8_t *)src,
|
||||
(const uint8_t *)(src + ARRAY_SIZE(src) - 1), 3);
|
||||
(const uint8_t *)(src + std::size(src) - 1), 3);
|
||||
EXPECT_STREQ(result, (const char *)dest);
|
||||
}
|
||||
|
||||
@@ -52,10 +51,10 @@ TEST(ByteReverse, C)
|
||||
{
|
||||
alignas(uint32_t) static const char src[] = "12345678";
|
||||
static const char result[] = "43218765";
|
||||
alignas(uint32_t) static uint8_t dest[ARRAY_SIZE(src)];
|
||||
alignas(uint32_t) static uint8_t dest[std::size(src)];
|
||||
|
||||
reverse_bytes(dest, (const uint8_t *)src,
|
||||
(const uint8_t *)(src + ARRAY_SIZE(src) - 1), 4);
|
||||
(const uint8_t *)(src + std::size(src) - 1), 4);
|
||||
EXPECT_STREQ(result, (const char *)dest);
|
||||
}
|
||||
|
||||
@@ -63,9 +62,9 @@ TEST(ByteReverse, D)
|
||||
{
|
||||
static const char src[] = "1234567890";
|
||||
static const char result[] = "5432109876";
|
||||
static uint8_t dest[ARRAY_SIZE(src)];
|
||||
static uint8_t dest[std::size(src)];
|
||||
|
||||
reverse_bytes(dest, (const uint8_t *)src,
|
||||
(const uint8_t *)(src + ARRAY_SIZE(src) - 1), 5);
|
||||
(const uint8_t *)(src + std::size(src) - 1), 5);
|
||||
EXPECT_STREQ(result, (const char *)dest);
|
||||
}
|
||||
|
Reference in New Issue
Block a user