Skip to content

Commit

Permalink
Refs #17287: fix Windows warning
Browse files Browse the repository at this point in the history 
Signed-off-by: JLBuenoLopez-eProsima <joseluisbueno@eprosima.com>
  • Loading branch information
@JLBuenoLopez
JLBuenoLopez committed Feb 22, 2023
1 parent 4fa546a commit 380a43f
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 166 deletions.
5 changes: 1 addition & 4 deletions examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,7 @@ size_t HelloWorld::getCdrSerializedSize(
current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


if ((20) > 0)
{
current_alignment += ((20) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((20) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);


return current_alignment - initial_alignment;
Expand Down
5 changes: 1 addition & 4 deletions examples/cpp/dds/BasicConfigurationExample/HelloWorld.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,7 @@ size_t HelloWorld::getCdrSerializedSize(
current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


if ((20) > 0)
{
current_alignment += ((20) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((20) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);


return current_alignment - initial_alignment;
Expand Down
5 changes: 1 addition & 4 deletions examples/cpp/dds/Benchmark/Benchmark_big.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,7 @@ size_t BenchMarkBig::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((8388608) > 0)
{
current_alignment += ((8388608) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((8388608) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

Expand Down
5 changes: 1 addition & 4 deletions examples/cpp/dds/Benchmark/Benchmark_medium.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,7 @@ size_t BenchMarkMedium::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((524288) > 0)
{
current_alignment += ((524288) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((524288) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

Expand Down
5 changes: 1 addition & 4 deletions examples/cpp/dds/Benchmark/Benchmark_small.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,7 @@ size_t BenchMarkSmall::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((16384) > 0)
{
current_alignment += ((16384) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((16384) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

Expand Down
5 changes: 1 addition & 4 deletions examples/cpp/dds/FlowControlExample/FlowControlExample.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,7 @@ size_t FlowControlExample::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((600000) > 0)
{
current_alignment += ((600000) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((600000) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

current_alignment += 1 + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

Expand Down
5 changes: 1 addition & 4 deletions examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,7 @@ size_t HelloWorld::getCdrSerializedSize(

current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.message().size() + 1;

if ((1048576) > 0)
{
current_alignment += ((1048576) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((1048576) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);


return current_alignment - initial_alignment;
Expand Down
5 changes: 1 addition & 4 deletions examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,7 @@ size_t LoanableHelloWorld::getCdrSerializedSize(
current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


if ((256) > 0)
{
current_alignment += ((256) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((256) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);


return current_alignment - initial_alignment;
Expand Down
5 changes: 1 addition & 4 deletions examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,7 @@ size_t LoanableHelloWorld::getCdrSerializedSize(
current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


if ((256) > 0)
{
current_alignment += ((256) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((256) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);


return current_alignment - initial_alignment;
Expand Down
15 changes: 3 additions & 12 deletions src/cpp/statistics/types/types.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,7 @@ size_t eprosima::fastdds::statistics::detail::EntityId_s::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((4) > 0)
{
current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

return current_alignment - initial_alignment;
}
Expand Down Expand Up @@ -287,10 +284,7 @@ size_t eprosima::fastdds::statistics::detail::GuidPrefix_s::getCdrSerializedSize
size_t initial_alignment = current_alignment;


if ((12) > 0)
{
current_alignment += ((12) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((12) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

return current_alignment - initial_alignment;
}
Expand Down Expand Up @@ -1027,10 +1021,7 @@ size_t eprosima::fastdds::statistics::detail::Locator_s::getCdrSerializedSize(
current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);


if ((16) > 0)
{
current_alignment += ((16) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((16) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);


return current_alignment - initial_alignment;
Expand Down
70 changes: 14 additions & 56 deletions test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1319,82 +1319,40 @@ size_t ContentFilterTestType::getCdrSerializedSize(


current_alignment += StructType::getCdrSerializedSize(data.struct_field(), current_alignment);
if ((3) > 0)
{
current_alignment += ((3) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}

if ((3) > 0)
{
current_alignment += ((3) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((3) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

if ((3) > 0)
{
current_alignment += ((3) * 2) + eprosima::fastcdr::Cdr::alignment(current_alignment, 2);
}
current_alignment += ((3) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

if ((3) > 0)
{
current_alignment += ((3) * 2) + eprosima::fastcdr::Cdr::alignment(current_alignment, 2);
}
current_alignment += ((3) * 2) + eprosima::fastcdr::Cdr::alignment(current_alignment, 2);

if ((3) > 0)
{
current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((3) * 2) + eprosima::fastcdr::Cdr::alignment(current_alignment, 2);

if ((3) > 0)
{
current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

if ((3) > 0)
{
current_alignment += ((3) * 8) + eprosima::fastcdr::Cdr::alignment(current_alignment, 8);
}
current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

if ((3) > 0)
{
current_alignment += ((3) * 8) + eprosima::fastcdr::Cdr::alignment(current_alignment, 8);
}
current_alignment += ((3) * 8) + eprosima::fastcdr::Cdr::alignment(current_alignment, 8);

if ((3) > 0)
{
current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((3) * 8) + eprosima::fastcdr::Cdr::alignment(current_alignment, 8);

if ((3) > 0)
{
current_alignment += ((3) * 8) + eprosima::fastcdr::Cdr::alignment(current_alignment, 8);
}
current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

if ((3) > 0)
{
current_alignment += ((3) * 16) + eprosima::fastcdr::Cdr::alignment(current_alignment, 16);
}
current_alignment += ((3) * 8) + eprosima::fastcdr::Cdr::alignment(current_alignment, 8);

if ((3) > 0)
{
current_alignment += ((3) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((3) * 16) + eprosima::fastcdr::Cdr::alignment(current_alignment, 16);

current_alignment += ((3) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

for(size_t a = 0; a < data.array_string_field().size(); ++a)
{
current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4) + data.array_string_field().at(a).size() + 1;

}
if ((3) > 0)
{
current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}

if ((3) > 0)
{
current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

current_alignment += ((3) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

for(size_t a = 0; a < data.array_struct_field().size(); ++a)
{
Expand Down
6 changes: 1 addition & 5 deletions test/unittest/dynamic_types/idl/Basic.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3038,11 +3038,7 @@ size_t ArraytStruct::getCdrSerializedSize(
(void)data;
size_t initial_alignment = current_alignment;


if ((2 * 2 * 2) > 0)
{
current_alignment += ((2 * 2 * 2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((2 * 2 * 2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

return current_alignment - initial_alignment;
}
Expand Down
21 changes: 4 additions & 17 deletions test/unittest/dynamic_types/idl/Test.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1037,16 +1037,9 @@ size_t ComplexStruct::getCdrSerializedSize(
{
current_alignment += BasicStruct::getCdrSerializedSize(data.my_sequence_struct().at(a), current_alignment);}

if ((500 * 5 * 4) > 0)
{
current_alignment += ((500 * 5 * 4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}

if ((500) > 0)
{
current_alignment += ((500) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((500 * 5 * 4) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

current_alignment += ((500) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

for(size_t a = 0; a < data.my_array_struct().size(); ++a)
{
Expand Down Expand Up @@ -1107,10 +1100,7 @@ size_t ComplexStruct::getCdrSerializedSize(

current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

if ((500) > 0)
{
current_alignment += ((500) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((500) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}

current_alignment += 4 + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
Expand Down Expand Up @@ -1162,10 +1152,7 @@ size_t ComplexStruct::getCdrSerializedSize(

for(size_t a = 0; a < data.my_array_arrays().size(); ++a)
{
if ((2) > 0)
{
current_alignment += ((2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}

for(size_t a = 0; a < data.my_sequences_array().size(); ++a)
Expand Down
25 changes: 5 additions & 20 deletions test/unittest/xtypes/idl/Types.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2553,10 +2553,7 @@ size_t ArrayStruct::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((2) > 0)
{
current_alignment += ((2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

return current_alignment - initial_alignment;
}
Expand Down Expand Up @@ -2706,10 +2703,7 @@ size_t ArrayStructEqual::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((2) > 0)
{
current_alignment += ((2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

return current_alignment - initial_alignment;
}
Expand Down Expand Up @@ -2859,10 +2853,7 @@ size_t ArrayBadStruct::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((2) > 0)
{
current_alignment += ((2) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);
}
current_alignment += ((2) * 1) + eprosima::fastcdr::Cdr::alignment(current_alignment, 1);

return current_alignment - initial_alignment;
}
Expand Down Expand Up @@ -3012,10 +3003,7 @@ size_t ArrayDimensionsStruct::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((2 * 2) > 0)
{
current_alignment += ((2 * 2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((2 * 2) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

return current_alignment - initial_alignment;
}
Expand Down Expand Up @@ -3165,10 +3153,7 @@ size_t ArraySizeStruct::getCdrSerializedSize(
size_t initial_alignment = current_alignment;


if ((5) > 0)
{
current_alignment += ((5) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);
}
current_alignment += ((5) * 4) + eprosima::fastcdr::Cdr::alignment(current_alignment, 4);

return current_alignment - initial_alignment;
}
Expand Down
Loading

0 comments on commit 380a43f

Please sign in to comment.