Skip to content
This repository was archived by the owner on Mar 29, 2023. It is now read-only.

Commit 3d1b177

Browse files
pablogs9pablogs9
authored
Release v2.0.1
2 parents 1c712a0 + ed4fd51 commit 3d1b177

File tree

9 files changed

+45
-25
lines changed

9 files changed

+45
-25
lines changed

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
###############################################################################
1616
# CMake build rules for Micro CDR
1717
###############################################################################
18-
cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
18+
cmake_minimum_required(VERSION 3.15)
1919

2020
###############################################################################
2121
# Build options
@@ -48,7 +48,7 @@ endif()
4848
###############################################################################
4949
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
5050
if(NOT UCDR_SUPERBUILD)
51-
project(microcdr VERSION "2.0.0" LANGUAGES C)
51+
project(microcdr VERSION "2.0.1" LANGUAGES C)
5252
else()
5353
project(ucdr_superbuild NONE)
5454
include(${PROJECT_SOURCE_DIR}/cmake/SuperBuild.cmake)

‎cmake/SuperBuild.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if(UCDR_BUILD_TESTS)
3131
GIT_REPOSITORY
3232
https://github.com/google/googletest.git
3333
GIT_TAG
34-
v1.10.x
34+
release-1.11.0
3535
PREFIX
3636
${PROJECT_BINARY_DIR}/googletest
3737
INSTALL_DIR

‎cmake/common/check_configuration.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,15 +120,11 @@ function(set_common_compile_options target)
120120
target_compile_options(${target} PRIVATE -Wall
121121
-Wextra
122122
-Wshadow
123-
$<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor>
124123
-pedantic
125124
-Wcast-align
126125
-Wunused
127-
$<$<COMPILE_LANGUAGE:CXX>:-Woverloaded-virtual>
128126
-Wconversion
129127
$<$<CXX_COMPILER_ID:GNU>:-Wlogical-op>
130-
$<$<AND:$<CXX_COMPILER_ID:GNU>,$<COMPILE_LANGUAGE:CXX>>:-Wuseless-cast>
131-
$<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
132128
$<$<OR:$<AND:$<CXX_COMPILER_ID:GNU>,$<NOT:$<VERSION_LESS:$<CXX_COMPILER_VERSION>,6.0.0>>>,$<AND:$<C_COMPILER_ID:GNU>,$<NOT:$<VERSION_LESS:$<C_COMPILER_VERSION>,6.0.0>>>>:-Wnull-dereference>
133129
$<$<OR:$<AND:$<CXX_COMPILER_ID:GNU>,$<NOT:$<VERSION_LESS:$<CXX_COMPILER_VERSION>,7.0.0>>>,$<AND:$<C_COMPILER_ID:GNU>,$<NOT:$<VERSION_LESS:$<C_COMPILER_VERSION>,7.0.0>>>>:-Wduplicated-branches>
134130
$<$<OR:$<AND:$<CXX_COMPILER_ID:GNU>,$<NOT:$<VERSION_LESS:$<CXX_COMPILER_VERSION>,6.0.0>>>,$<AND:$<C_COMPILER_ID:GNU>,$<NOT:$<VERSION_LESS:$<C_COMPILER_VERSION>,6.0.0>>>>:-Wduplicated-cond>

‎test/Alignment.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@ class Alignment : public BasicSerialization, public ::testing::WithParamInterfac
4040

4141
};
4242

43-
INSTANTIATE_TEST_SUITE_P(Offset, Alignment, ::testing::Range(0, 17), ::testing::PrintToStringParamName());
43+
#ifdef INSTANTIATE_TEST_SUITE_P
44+
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_SUITE_P(x, y, z, w)
45+
#else
46+
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_CASE_P(x, y, z, w)
47+
#endif // ifdef INSTANTIATE_TEST_SUITE_P
48+
49+
GTEST_INSTANTIATE_TEST_MACRO(Offset, Alignment, ::testing::Range(0, 17), ::testing::PrintToStringParamName());
4450

4551
TEST_P(Alignment, Block_8)
4652
{

‎test/CommonFunctions.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <ucdr/microcdr.h>
1717
#include <cstring>
1818

19-
#define BUFFER_LENGTH 1024
19+
#define BUFFER_LENGTH 1024UL
2020

2121
bool operator ==(
2222
const ucdrBuffer& rhs,
@@ -56,7 +56,7 @@ TEST_F(CommonFunctions, ucdr_init_buffer)
5656
EXPECT_EQ(ub.init, buffer);
5757
EXPECT_EQ(ub.final, ub.init + BUFFER_LENGTH);
5858
EXPECT_EQ(ub.iterator, ub.init);
59-
EXPECT_EQ(ub.origin, 0);
59+
EXPECT_EQ(ub.origin, 0UL);
6060
EXPECT_EQ(ub.offset, ub.origin);
6161
EXPECT_EQ(ub.endianness, UCDR_MACHINE_ENDIANNESS);
6262
EXPECT_EQ(ub.last_data_size, 0);
@@ -145,29 +145,29 @@ TEST_F(CommonFunctions, ucdr_align)
145145
size_t offset = 1;
146146

147147
ucdr_init_buffer_origin_offset(&ub, buffer, BUFFER_LENGTH, origin, offset);
148-
EXPECT_EQ(ucdr_alignment(offset, 1), 0);
149-
EXPECT_EQ(ucdr_buffer_alignment(&ub, 1), 0);
148+
EXPECT_EQ(ucdr_alignment(offset, 1), 0UL);
149+
EXPECT_EQ(ucdr_buffer_alignment(&ub, 1), 0UL);
150150
ucdr_align_to(&ub, 1);
151151
EXPECT_EQ(ub.iterator, ub.init + 1);
152152
EXPECT_EQ(ub.offset, ub.origin + 1);
153153

154154
ucdr_reset_buffer_offset(&ub, offset);
155-
EXPECT_EQ(ucdr_alignment(offset, 2), 1);
156-
EXPECT_EQ(ucdr_buffer_alignment(&ub, 2), 0);
155+
EXPECT_EQ(ucdr_alignment(offset, 2), 1UL);
156+
EXPECT_EQ(ucdr_buffer_alignment(&ub, 2), 0UL);
157157
ucdr_align_to(&ub, 2);
158158
EXPECT_EQ(ub.iterator, ub.init + 1);
159159
EXPECT_EQ(ub.offset, ub.origin + 1);
160160

161161
ucdr_reset_buffer_offset(&ub, offset);
162-
EXPECT_EQ(ucdr_alignment(offset, 4), 3);
163-
EXPECT_EQ(ucdr_buffer_alignment(&ub, 4), 2);
162+
EXPECT_EQ(ucdr_alignment(offset, 4), 3UL);
163+
EXPECT_EQ(ucdr_buffer_alignment(&ub, 4), 2UL);
164164
ucdr_align_to(&ub, 4);
165165
EXPECT_EQ(ub.iterator, ub.init + 3);
166166
EXPECT_EQ(ub.offset, ub.origin + 3);
167167

168168
ucdr_reset_buffer_offset(&ub, offset);
169-
EXPECT_EQ(ucdr_alignment(offset, 8), 7);
170-
EXPECT_EQ(ucdr_buffer_alignment(&ub, 8), 6);
169+
EXPECT_EQ(ucdr_alignment(offset, 8), 7UL);
170+
EXPECT_EQ(ucdr_buffer_alignment(&ub, 8), 6UL);
171171
ucdr_align_to(&ub, 8);
172172
EXPECT_EQ(ub.iterator, ub.init + 7);
173173
EXPECT_EQ(ub.offset, ub.origin + 7);

‎test/SequenceOverflow.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class SequenceOverflow : public SequenceSerialization
3939

4040
TEST_F(SequenceOverflow, Block1)
4141
{
42-
uint8_t input[SEQUENCE_SIZE_OVERFLOW];
42+
uint8_t input[SEQUENCE_SIZE_OVERFLOW] = {0};
4343
uint8_t output[ARRAY_CAPACITY] = {0};
4444

4545
EXPECT_TRUE(ucdr_serialize_sequence_uint8_t(&writer, input, SEQUENCE_SIZE_OVERFLOW));
@@ -48,7 +48,7 @@ TEST_F(SequenceOverflow, Block1)
4848

4949
TEST_F(SequenceOverflow, Block2)
5050
{
51-
uint16_t input[SEQUENCE_SIZE_OVERFLOW];
51+
uint16_t input[SEQUENCE_SIZE_OVERFLOW] = {0};
5252
uint16_t output[ARRAY_CAPACITY] = {0};
5353

5454
EXPECT_TRUE(ucdr_serialize_sequence_uint16_t(&writer, input, SEQUENCE_SIZE_OVERFLOW));
@@ -57,7 +57,7 @@ TEST_F(SequenceOverflow, Block2)
5757

5858
TEST_F(SequenceOverflow, Block4)
5959
{
60-
uint32_t input[SEQUENCE_SIZE_OVERFLOW];
60+
uint32_t input[SEQUENCE_SIZE_OVERFLOW] = {0};
6161
uint32_t output[ARRAY_CAPACITY] = {0};
6262

6363
EXPECT_TRUE(ucdr_serialize_sequence_uint32_t(&writer, input, SEQUENCE_SIZE_OVERFLOW));
@@ -66,7 +66,7 @@ TEST_F(SequenceOverflow, Block4)
6666

6767
TEST_F(SequenceOverflow, Block8)
6868
{
69-
uint64_t input[SEQUENCE_SIZE_OVERFLOW];
69+
uint64_t input[SEQUENCE_SIZE_OVERFLOW] = {0};
7070
uint64_t output[ARRAY_CAPACITY] = {0};
7171

7272
EXPECT_TRUE(ucdr_serialize_sequence_uint64_t(&writer, input, SEQUENCE_SIZE_OVERFLOW));

‎test/endianness/ArrayEndianness.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,11 @@ TEST_P(ArrayEndianness, Double)
128128
EXPECT_TRUE(0 == std::memcmp(input, output, ARRAY_SIZE * sizeof(input[0])));
129129
}
130130

131-
INSTANTIATE_TEST_SUITE_P(ucdrEndianness, ArrayEndianness,
131+
#ifdef INSTANTIATE_TEST_SUITE_P
132+
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z)
133+
#else
134+
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z)
135+
#endif // ifdef INSTANTIATE_TEST_SUITE_P
136+
137+
GTEST_INSTANTIATE_TEST_MACRO(ucdrEndianness, ArrayEndianness,
132138
::testing::Values(UCDR_LITTLE_ENDIANNESS, UCDR_BIG_ENDIANNESS));

‎test/endianness/BasicEndianness.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,11 @@ TEST_P(BasicEndianness, Double)
120120
EXPECT_EQ(input, output);
121121
}
122122

123-
INSTANTIATE_TEST_SUITE_P(ucdrEndianness, BasicEndianness,
123+
#ifdef INSTANTIATE_TEST_SUITE_P
124+
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z)
125+
#else
126+
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z)
127+
#endif // ifdef INSTANTIATE_TEST_SUITE_P
128+
//
129+
GTEST_INSTANTIATE_TEST_MACRO(ucdrEndianness, BasicEndianness,
124130
::testing::Values(UCDR_LITTLE_ENDIANNESS, UCDR_BIG_ENDIANNESS));

‎test/endianness/SequenceEndianness.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,5 +176,11 @@ TEST_P(SequenceEndianness, Double)
176176
EXPECT_TRUE(0 == std::memcmp(input, output, SEQUENCE_SIZE * sizeof(input[0])));
177177
}
178178

179-
INSTANTIATE_TEST_SUITE_P(ucdrEndianness, SequenceEndianness,
179+
#ifdef INSTANTIATE_TEST_SUITE_P
180+
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z)
181+
#else
182+
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z)
183+
#endif // ifdef INSTANTIATE_TEST_SUITE_P
184+
//
185+
GTEST_INSTANTIATE_TEST_MACRO(ucdrEndianness, SequenceEndianness,
180186
::testing::Values(UCDR_LITTLE_ENDIANNESS, UCDR_BIG_ENDIANNESS));

0 commit comments

Comments
 (0)