Add test for a union using an alias with scope (#5330)

* Refs #21823. Update submodule and regenerate code Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #21823. Add dynamic types test. Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #21823. Regenerate TypeLookupService tests Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #21823. Apply suggestions Signed-off-by: Ricardo González Moreno <[email protected]> --------- Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Oct 25, 2024 · 5c5a7c0 · 5c5a7c0
1 parent 4b00904
commit 5c5a7c0
Show file tree

Hide file tree

Showing 91 changed files with 1,880 additions and 705 deletions.
diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp
diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp
@@ -433,26 +433,18 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::Dummy& data);
 
-
-
-
-
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::ExtendedAnnotationParameterValue& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::AppliedAnnotationParameter& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::AppliedAnnotation& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::AppliedVerbatimAnnotation& data);
@@ -477,12 +469,10 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteStructMember& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::MinimalStructMember& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::AppliedBuiltinTypeAnnotations& data);
@@ -511,7 +501,6 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::MinimalStructType& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CommonUnionMember& data);
@@ -520,12 +509,10 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteUnionMember& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::MinimalUnionMember& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CommonDiscriminatorMember& data);
@@ -562,12 +549,10 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteAnnotationParameter& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::MinimalAnnotationParameter& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteAnnotationHeader& data);
@@ -676,7 +661,6 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::MinimalMapType& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CommonEnumeratedLiteral& data);
@@ -685,12 +669,10 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteEnumeratedLiteral& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::MinimalEnumeratedLiteral& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CommonEnumeratedHeader& data);
@@ -719,18 +701,14 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteBitflag& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::MinimalBitflag& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CommonBitmaskHeader& data);
 
-
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteBitmaskType& data);
@@ -747,12 +725,10 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteBitfield& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::MinimalBitfield& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteBitsetHeader& data);
@@ -773,41 +749,31 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::CompleteExtendedType& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::MinimalExtendedType& data);
 
-
-
-
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::TypeIdentifierTypeObjectPair& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::TypeIdentifierPair& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::TypeIdentfierWithSize& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::TypeIdentifierWithDependencies& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::xtypes::TypeInformation& data);
 
 
-
 } // namespace fastcdr
 } // namespace eprosima
 

diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp
@@ -48,65 +48,17 @@ namespace xtypes {
 
 
 typedef uint8_t EquivalenceKind;
-
-
-
 typedef uint8_t TypeKind;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 typedef uint8_t TypeIdentiferKind;
-
-
-
-
-
-
-
-
-
-
-
-
 typedef eprosima::fastcdr::fixed_string<MEMBER_NAME_MAX_LENGTH> MemberName;
-
 typedef eprosima::fastcdr::fixed_string<TYPE_NAME_MAX_LENGTH> QualifiedTypeName;
 typedef uint8_t PrimitiveTypeId;
 typedef std::array<uint8_t, 14> EquivalenceHash;
 typedef std::array<uint8_t, 4> NameHash;
 typedef uint32_t LBound;
 typedef std::vector<eprosima::fastdds::dds::xtypes::LBound> LBoundSeq;
-
 typedef uint8_t SBound;
 typedef std::vector<eprosima::fastdds::dds::xtypes::SBound> SBoundSeq;
-
-
-
 typedef eprosima::fastdds::dds::xtypes::MemberFlag CollectionElementFlag;
 typedef eprosima::fastdds::dds::xtypes::MemberFlag StructMemberFlag;
 typedef eprosima::fastdds::dds::xtypes::MemberFlag UnionMemberFlag;
@@ -116,8 +68,6 @@ typedef eprosima::fastdds::dds::xtypes::MemberFlag AnnotationParameterFlag;
 typedef eprosima::fastdds::dds::xtypes::MemberFlag AliasMemberFlag;
 typedef eprosima::fastdds::dds::xtypes::MemberFlag BitflagFlag;
 typedef eprosima::fastdds::dds::xtypes::MemberFlag BitsetMemberFlag;
-
-
 typedef eprosima::fastdds::dds::xtypes::TypeFlag StructTypeFlag;
 typedef eprosima::fastdds::dds::xtypes::TypeFlag UnionTypeFlag;
 typedef eprosima::fastdds::dds::xtypes::TypeFlag CollectionTypeFlag;
@@ -127,8 +77,6 @@ typedef eprosima::fastdds::dds::xtypes::TypeFlag EnumTypeFlag;
 typedef eprosima::fastdds::dds::xtypes::TypeFlag BitmaskTypeFlag;
 typedef eprosima::fastdds::dds::xtypes::TypeFlag BitsetTypeFlag;
 
-
-
 #ifndef SWIG
 namespace detail {
 
@@ -1225,12 +1173,9 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
 };
-
 typedef std::vector<eprosima::fastdds::dds::xtypes::TypeIdentifier> TypeIdentifierSeq;
 typedef uint32_t MemberId;
 
-
-
 /*!
  * @brief This class represents the TopicDataType of the type ExtendedAnnotationParameterValue defined by the user in the IDL file.
  * @ingroup dds_xtypes_typeobject
@@ -1312,7 +1257,6 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds
 
 };
 
-
 /*!
  * @brief This class represents the TopicDataType of the type AppliedAnnotationParameter defined by the user in the IDL file.
  * @ingroup dds_xtypes_typeobject
@@ -7882,7 +7826,6 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT
 
 };
 
-
 /*!
  * @brief This class represents the TopicDataType of the type MinimalExtendedType defined by the user in the IDL file.
  * @ingroup dds_xtypes_typeobject
@@ -7963,8 +7906,6 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy
     unsigned char* key_buffer_;
 
 };
-
-
 typedef std::vector<eprosima::fastdds::dds::xtypes::TypeObject> TypeObjectSeq;
 typedef eprosima::fastdds::dds::xtypes::TypeObjectSeq StronglyConnectedComponent;
 

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp
@@ -640,7 +640,10 @@ class TypeLookup_getTypes_Result
                     }
 
                     selected_member_ = 0x00000001;
-                    member_destructor_ = [&]() {m_result.~TypeLookup_getTypes_Out();};
+                    member_destructor_ = [&]()
+                    {
+                        m_result.~TypeLookup_getTypes_Out();
+                    };
                     new(&m_result) TypeLookup_getTypes_Out();
 
                 }
@@ -1279,7 +1282,10 @@ class TypeLookup_getTypeDependencies_Result
                     }
 
                     selected_member_ = 0x00000001;
-                    member_destructor_ = [&]() {m_result.~TypeLookup_getTypeDependencies_Out();};
+                    member_destructor_ = [&]()
+                    {
+                        m_result.~TypeLookup_getTypeDependencies_Out();
+                    };
                     new(&m_result) TypeLookup_getTypeDependencies_Out();
 
                 }
@@ -1638,7 +1644,10 @@ class TypeLookup_Call
                     }
 
                     selected_member_ = 0x00000001;
-                    member_destructor_ = [&]() {m_getTypes.~TypeLookup_getTypes_In();};
+                    member_destructor_ = [&]()
+                    {
+                        m_getTypes.~TypeLookup_getTypes_In();
+                    };
                     new(&m_getTypes) TypeLookup_getTypes_In();
 
                 }
@@ -1656,7 +1665,10 @@ class TypeLookup_Call
                     }
 
                     selected_member_ = 0x00000002;
-                    member_destructor_ = [&]() {m_getTypeDependencies.~TypeLookup_getTypeDependencies_In();};
+                    member_destructor_ = [&]()
+                    {
+                        m_getTypeDependencies.~TypeLookup_getTypeDependencies_In();
+                    };
                     new(&m_getTypeDependencies) TypeLookup_getTypeDependencies_In();
 
                 }
@@ -2196,7 +2208,10 @@ class TypeLookup_Return
                     }
 
                     selected_member_ = 0x00000001;
-                    member_destructor_ = [&]() {m_getType.~TypeLookup_getTypes_Result();};
+                    member_destructor_ = [&]()
+                    {
+                        m_getType.~TypeLookup_getTypes_Result();
+                    };
                     new(&m_getType) TypeLookup_getTypes_Result();
 
                 }
@@ -2214,7 +2229,10 @@ class TypeLookup_Return
                     }
 
                     selected_member_ = 0x00000002;
-                    member_destructor_ = [&]() {m_getTypeDependencies.~TypeLookup_getTypeDependencies_Result();};
+                    member_destructor_ = [&]()
+                    {
+                        m_getTypeDependencies.~TypeLookup_getTypeDependencies_Result();
+                    };
                     new(&m_getTypeDependencies) TypeLookup_getTypeDependencies_Result();
 
                 }

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.hpp
@@ -180,7 +180,6 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Out& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_In& data);
@@ -189,13 +188,10 @@ eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Out& data);
 
-
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::builtin::TypeLookup_Request& data);
 
-
 eProsima_user_DllExport void serialize_key(
         eprosima::fastcdr::Cdr& scdr,
         const eprosima::fastdds::dds::builtin::TypeLookup_Reply& data);