diff --git a/examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.cxx b/examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.cxx
index 1b4bbd7548a..a418f049a9b 100644
--- a/examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.cxx
+++ b/examples/cpp/dds/AdvancedConfigurationExample/HelloWorld.cxx
@@ -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;
diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorld.cxx b/examples/cpp/dds/BasicConfigurationExample/HelloWorld.cxx
index 1b4bbd7548a..a418f049a9b 100644
--- a/examples/cpp/dds/BasicConfigurationExample/HelloWorld.cxx
+++ b/examples/cpp/dds/BasicConfigurationExample/HelloWorld.cxx
@@ -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;
diff --git a/examples/cpp/dds/Benchmark/Benchmark_big.cxx b/examples/cpp/dds/Benchmark/Benchmark_big.cxx
index 985e7d40e24..e9b231cb77b 100644
--- a/examples/cpp/dds/Benchmark/Benchmark_big.cxx
+++ b/examples/cpp/dds/Benchmark/Benchmark_big.cxx
@@ -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);
 
diff --git a/examples/cpp/dds/Benchmark/Benchmark_medium.cxx b/examples/cpp/dds/Benchmark/Benchmark_medium.cxx
index cbe577f164f..66f7c261f16 100644
--- a/examples/cpp/dds/Benchmark/Benchmark_medium.cxx
+++ b/examples/cpp/dds/Benchmark/Benchmark_medium.cxx
@@ -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);
 
diff --git a/examples/cpp/dds/Benchmark/Benchmark_small.cxx b/examples/cpp/dds/Benchmark/Benchmark_small.cxx
index 4fbab4cd937..a5845b17a97 100644
--- a/examples/cpp/dds/Benchmark/Benchmark_small.cxx
+++ b/examples/cpp/dds/Benchmark/Benchmark_small.cxx
@@ -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);
 
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExample.cxx b/examples/cpp/dds/FlowControlExample/FlowControlExample.cxx
index 41026e5d278..60dec03784c 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExample.cxx
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExample.cxx
@@ -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);
 
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.cxx b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.cxx
index 1beed47ba92..deed1d61701 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.cxx
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.cxx
@@ -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;
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.cxx
index 00e8c68d5d6..b548f4d0103 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.cxx
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.cxx
@@ -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;
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.cxx
index 00e8c68d5d6..b548f4d0103 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.cxx
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.cxx
@@ -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;
diff --git a/src/cpp/statistics/types/types.cxx b/src/cpp/statistics/types/types.cxx
index 9d59f440697..5a91c4242cd 100644
--- a/src/cpp/statistics/types/types.cxx
+++ b/src/cpp/statistics/types/types.cxx
@@ -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;
 }
@@ -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;
 }
@@ -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;
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.cxx b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.cxx
index dd2d60ab726..abeea0e69e4 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.cxx
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.cxx
@@ -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)
     {
diff --git a/test/unittest/dynamic_types/idl/Basic.cxx b/test/unittest/dynamic_types/idl/Basic.cxx
index 7619832692c..be026cd635e 100644
--- a/test/unittest/dynamic_types/idl/Basic.cxx
+++ b/test/unittest/dynamic_types/idl/Basic.cxx
@@ -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;
 }
diff --git a/test/unittest/dynamic_types/idl/Test.cxx b/test/unittest/dynamic_types/idl/Test.cxx
index 2f577da13e9..f2e16ff1c4a 100644
--- a/test/unittest/dynamic_types/idl/Test.cxx
+++ b/test/unittest/dynamic_types/idl/Test.cxx
@@ -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)
     {
@@ -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);
@@ -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)
diff --git a/test/unittest/xtypes/idl/Types.cxx b/test/unittest/xtypes/idl/Types.cxx
index c37e6391de8..f98c6d86141 100644
--- a/test/unittest/xtypes/idl/Types.cxx
+++ b/test/unittest/xtypes/idl/Types.cxx
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
diff --git a/test/xtypes/idl/Types.cxx b/test/xtypes/idl/Types.cxx
index c37e6391de8..f98c6d86141 100644
--- a/test/xtypes/idl/Types.cxx
+++ b/test/xtypes/idl/Types.cxx
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }
@@ -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;
 }