Fix warning generating TypeObject from IDL file (#266)

* Refs #20003. Fix warnings. Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #20003: do not generate empty namespaces Signed-off-by: JLBuenoLopez-eProsima <[email protected]> * Refs #20003. Fix warnings and new ReturnCode_t Signed-off-by: Ricardo González Moreno <[email protected]> --------- Signed-off-by: Ricardo González Moreno <[email protected]> Signed-off-by: JLBuenoLopez-eProsima <[email protected]> Co-authored-by: JLBuenoLopez-eProsima <[email protected]>
eProsima · Feb 26, 2024 · ad7dd11 · ad7dd11
1 parent 7f6d32d
commit ad7dd11
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg b/src/main/java/com/eprosima/fastcdr/idl/templates/TypesHeader.stg
@@ -82,6 +82,7 @@ $definition_list$
 >>
 
 annotation(ctx, annotation) ::= <<
+$if(annotation.enums || annotation.typeDefs || annotation.constDecls)$
 namespace $annotation.name$ {
     $annotation.enums : { enum | $enum_type(ctx=ctx, parent=annotation, enum=enum)$}; separator="\n"$
 
@@ -90,6 +91,7 @@ namespace $annotation.name$ {
     $annotation.constDecls : { const | $const_decl(ctx=ctx, parent=annotation, const=const)$}; separator="\n"$
 
 } // namespace $annotation.name$
+$endif$
 >>
 
 interface(ctx, parent, interface, export_list) ::= <<
@@ -382,7 +384,9 @@ public:
             $union.members:{ member | $unionmember_compare(member)$}; separator="\n"$
             $unionmemberdefault_compare(union.defaultMember)$
         }
+        $if(!union.defaultMember)$
         return false;
+        $endif$
     }
 
     /*!

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberSource.stg b/src/main/java/com/eprosima/fastdds/idl/templates/DDSSubscriberSource.stg
@@ -127,7 +127,7 @@ void $ctx.filename$Subscriber::SubListener::on_data_available(
     $ctx.m_lastStructureScopedName$ st;
     SampleInfo info;
 
-    if (reader->take_next_sample(&st, &info) == ReturnCode_t::RETCODE_OK)
+    if (reader->take_next_sample(&st, &info) == RETCODE_OK)
     {
         if (info.valid_data)
         {

diff --git a/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg b/src/main/java/com/eprosima/fastdds/idl/templates/TypesCdrAuxHeaderImpl.stg
@@ -121,12 +121,10 @@ eProsima_user_DllExport void deserialize(
             $if(struct.annotationFinal || struct.annotationAppendable)$eprosima::fastcdr::EncodingAlgorithmFlag::PLAIN_CDR$elseif(struct.annotationMutable)$eprosima::fastcdr::EncodingAlgorithmFlag::PL_CDR$endif$,
             [&data](eprosima::fastcdr::Cdr& dcdr, const eprosima::fastcdr::MemberId& mid) -> bool
             {
+                $if(struct.allMembers)$
                 bool ret_value = true;
                 switch (mid.id)
                 {
-                    $if(!struct.allMembers)$
-                    static_cast<void>(dcdr);
-                    $endif$
                     $struct.allMembers : { member |
                     case $if(struct.annotationMutable)$$member.id$$else$$member.index$$endif$:
                         $if(!member.annotationNonSerialized)$
@@ -139,6 +137,11 @@ eProsima_user_DllExport void deserialize(
                         break;
                 }
                 return ret_value;
+                $else$
+                static_cast<void>(dcdr);
+                static_cast<void>(mid);
+                return false;
+                $endif$
             });
 }