Skip to content

Commit 4a1d4ad

Browse files
richiwaremergify[bot]
richiware
authored and
mergify[bot]
committed
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]> (cherry picked from commit 5c5a7c0)
1 parent 6dd8565 commit 4a1d4ad

File tree

91 files changed

+1880
-705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1880
-705
lines changed

‎include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp

+178-44
Large diffs are not rendered by default.

‎include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp

-34
Original file line numberDiff line numberDiff line change
@@ -433,26 +433,18 @@ eProsima_user_DllExport void serialize_key(
433433
eprosima::fastcdr::Cdr& scdr,
434434
const eprosima::fastdds::dds::xtypes::Dummy& data);
435435

436-
437-
438-
439-
440-
441436
eProsima_user_DllExport void serialize_key(
442437
eprosima::fastcdr::Cdr& scdr,
443438
const eprosima::fastdds::dds::xtypes::ExtendedAnnotationParameterValue& data);
444439

445-
446440
eProsima_user_DllExport void serialize_key(
447441
eprosima::fastcdr::Cdr& scdr,
448442
const eprosima::fastdds::dds::xtypes::AppliedAnnotationParameter& data);
449443

450-
451444
eProsima_user_DllExport void serialize_key(
452445
eprosima::fastcdr::Cdr& scdr,
453446
const eprosima::fastdds::dds::xtypes::AppliedAnnotation& data);
454447

455-
456448
eProsima_user_DllExport void serialize_key(
457449
eprosima::fastcdr::Cdr& scdr,
458450
const eprosima::fastdds::dds::xtypes::AppliedVerbatimAnnotation& data);
@@ -477,12 +469,10 @@ eProsima_user_DllExport void serialize_key(
477469
eprosima::fastcdr::Cdr& scdr,
478470
const eprosima::fastdds::dds::xtypes::CompleteStructMember& data);
479471

480-
481472
eProsima_user_DllExport void serialize_key(
482473
eprosima::fastcdr::Cdr& scdr,
483474
const eprosima::fastdds::dds::xtypes::MinimalStructMember& data);
484475

485-
486476
eProsima_user_DllExport void serialize_key(
487477
eprosima::fastcdr::Cdr& scdr,
488478
const eprosima::fastdds::dds::xtypes::AppliedBuiltinTypeAnnotations& data);
@@ -511,7 +501,6 @@ eProsima_user_DllExport void serialize_key(
511501
eprosima::fastcdr::Cdr& scdr,
512502
const eprosima::fastdds::dds::xtypes::MinimalStructType& data);
513503

514-
515504
eProsima_user_DllExport void serialize_key(
516505
eprosima::fastcdr::Cdr& scdr,
517506
const eprosima::fastdds::dds::xtypes::CommonUnionMember& data);
@@ -520,12 +509,10 @@ eProsima_user_DllExport void serialize_key(
520509
eprosima::fastcdr::Cdr& scdr,
521510
const eprosima::fastdds::dds::xtypes::CompleteUnionMember& data);
522511

523-
524512
eProsima_user_DllExport void serialize_key(
525513
eprosima::fastcdr::Cdr& scdr,
526514
const eprosima::fastdds::dds::xtypes::MinimalUnionMember& data);
527515

528-
529516
eProsima_user_DllExport void serialize_key(
530517
eprosima::fastcdr::Cdr& scdr,
531518
const eprosima::fastdds::dds::xtypes::CommonDiscriminatorMember& data);
@@ -562,12 +549,10 @@ eProsima_user_DllExport void serialize_key(
562549
eprosima::fastcdr::Cdr& scdr,
563550
const eprosima::fastdds::dds::xtypes::CompleteAnnotationParameter& data);
564551

565-
566552
eProsima_user_DllExport void serialize_key(
567553
eprosima::fastcdr::Cdr& scdr,
568554
const eprosima::fastdds::dds::xtypes::MinimalAnnotationParameter& data);
569555

570-
571556
eProsima_user_DllExport void serialize_key(
572557
eprosima::fastcdr::Cdr& scdr,
573558
const eprosima::fastdds::dds::xtypes::CompleteAnnotationHeader& data);
@@ -676,7 +661,6 @@ eProsima_user_DllExport void serialize_key(
676661
eprosima::fastcdr::Cdr& scdr,
677662
const eprosima::fastdds::dds::xtypes::MinimalMapType& data);
678663

679-
680664
eProsima_user_DllExport void serialize_key(
681665
eprosima::fastcdr::Cdr& scdr,
682666
const eprosima::fastdds::dds::xtypes::CommonEnumeratedLiteral& data);
@@ -685,12 +669,10 @@ eProsima_user_DllExport void serialize_key(
685669
eprosima::fastcdr::Cdr& scdr,
686670
const eprosima::fastdds::dds::xtypes::CompleteEnumeratedLiteral& data);
687671

688-
689672
eProsima_user_DllExport void serialize_key(
690673
eprosima::fastcdr::Cdr& scdr,
691674
const eprosima::fastdds::dds::xtypes::MinimalEnumeratedLiteral& data);
692675

693-
694676
eProsima_user_DllExport void serialize_key(
695677
eprosima::fastcdr::Cdr& scdr,
696678
const eprosima::fastdds::dds::xtypes::CommonEnumeratedHeader& data);
@@ -719,18 +701,14 @@ eProsima_user_DllExport void serialize_key(
719701
eprosima::fastcdr::Cdr& scdr,
720702
const eprosima::fastdds::dds::xtypes::CompleteBitflag& data);
721703

722-
723704
eProsima_user_DllExport void serialize_key(
724705
eprosima::fastcdr::Cdr& scdr,
725706
const eprosima::fastdds::dds::xtypes::MinimalBitflag& data);
726707

727-
728708
eProsima_user_DllExport void serialize_key(
729709
eprosima::fastcdr::Cdr& scdr,
730710
const eprosima::fastdds::dds::xtypes::CommonBitmaskHeader& data);
731711

732-
733-
734712
eProsima_user_DllExport void serialize_key(
735713
eprosima::fastcdr::Cdr& scdr,
736714
const eprosima::fastdds::dds::xtypes::CompleteBitmaskType& data);
@@ -747,12 +725,10 @@ eProsima_user_DllExport void serialize_key(
747725
eprosima::fastcdr::Cdr& scdr,
748726
const eprosima::fastdds::dds::xtypes::CompleteBitfield& data);
749727

750-
751728
eProsima_user_DllExport void serialize_key(
752729
eprosima::fastcdr::Cdr& scdr,
753730
const eprosima::fastdds::dds::xtypes::MinimalBitfield& data);
754731

755-
756732
eProsima_user_DllExport void serialize_key(
757733
eprosima::fastcdr::Cdr& scdr,
758734
const eprosima::fastdds::dds::xtypes::CompleteBitsetHeader& data);
@@ -773,41 +749,31 @@ eProsima_user_DllExport void serialize_key(
773749
eprosima::fastcdr::Cdr& scdr,
774750
const eprosima::fastdds::dds::xtypes::CompleteExtendedType& data);
775751

776-
777752
eProsima_user_DllExport void serialize_key(
778753
eprosima::fastcdr::Cdr& scdr,
779754
const eprosima::fastdds::dds::xtypes::MinimalExtendedType& data);
780755

781-
782-
783-
784-
785756
eProsima_user_DllExport void serialize_key(
786757
eprosima::fastcdr::Cdr& scdr,
787758
const eprosima::fastdds::dds::xtypes::TypeIdentifierTypeObjectPair& data);
788759

789-
790760
eProsima_user_DllExport void serialize_key(
791761
eprosima::fastcdr::Cdr& scdr,
792762
const eprosima::fastdds::dds::xtypes::TypeIdentifierPair& data);
793763

794-
795764
eProsima_user_DllExport void serialize_key(
796765
eprosima::fastcdr::Cdr& scdr,
797766
const eprosima::fastdds::dds::xtypes::TypeIdentfierWithSize& data);
798767

799-
800768
eProsima_user_DllExport void serialize_key(
801769
eprosima::fastcdr::Cdr& scdr,
802770
const eprosima::fastdds::dds::xtypes::TypeIdentifierWithDependencies& data);
803771

804-
805772
eProsima_user_DllExport void serialize_key(
806773
eprosima::fastcdr::Cdr& scdr,
807774
const eprosima::fastdds::dds::xtypes::TypeInformation& data);
808775

809776

810-
811777
} // namespace fastcdr
812778
} // namespace eprosima
813779

‎include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp

-59
Original file line numberDiff line numberDiff line change
@@ -48,65 +48,17 @@ namespace xtypes {
4848

4949

5050
typedef uint8_t EquivalenceKind;
51-
52-
53-
5451
typedef uint8_t TypeKind;
55-
56-
57-
58-
59-
60-
61-
62-
63-
64-
65-
66-
67-
68-
69-
70-
71-
72-
73-
74-
75-
76-
77-
78-
79-
80-
81-
82-
8352
typedef uint8_t TypeIdentiferKind;
84-
85-
86-
87-
88-
89-
90-
91-
92-
93-
94-
95-
9653
typedef eprosima::fastcdr::fixed_string<MEMBER_NAME_MAX_LENGTH> MemberName;
97-
9854
typedef eprosima::fastcdr::fixed_string<TYPE_NAME_MAX_LENGTH> QualifiedTypeName;
9955
typedef uint8_t PrimitiveTypeId;
10056
typedef std::array<uint8_t, 14> EquivalenceHash;
10157
typedef std::array<uint8_t, 4> NameHash;
10258
typedef uint32_t LBound;
10359
typedef std::vector<eprosima::fastdds::dds::xtypes::LBound> LBoundSeq;
104-
10560
typedef uint8_t SBound;
10661
typedef std::vector<eprosima::fastdds::dds::xtypes::SBound> SBoundSeq;
107-
108-
109-
11062
typedef eprosima::fastdds::dds::xtypes::MemberFlag CollectionElementFlag;
11163
typedef eprosima::fastdds::dds::xtypes::MemberFlag StructMemberFlag;
11264
typedef eprosima::fastdds::dds::xtypes::MemberFlag UnionMemberFlag;
@@ -116,8 +68,6 @@ typedef eprosima::fastdds::dds::xtypes::MemberFlag AnnotationParameterFlag;
11668
typedef eprosima::fastdds::dds::xtypes::MemberFlag AliasMemberFlag;
11769
typedef eprosima::fastdds::dds::xtypes::MemberFlag BitflagFlag;
11870
typedef eprosima::fastdds::dds::xtypes::MemberFlag BitsetMemberFlag;
119-
120-
12171
typedef eprosima::fastdds::dds::xtypes::TypeFlag StructTypeFlag;
12272
typedef eprosima::fastdds::dds::xtypes::TypeFlag UnionTypeFlag;
12373
typedef eprosima::fastdds::dds::xtypes::TypeFlag CollectionTypeFlag;
@@ -127,8 +77,6 @@ typedef eprosima::fastdds::dds::xtypes::TypeFlag EnumTypeFlag;
12777
typedef eprosima::fastdds::dds::xtypes::TypeFlag BitmaskTypeFlag;
12878
typedef eprosima::fastdds::dds::xtypes::TypeFlag BitsetTypeFlag;
12979

130-
131-
13280
#ifndef SWIG
13381
namespace detail {
13482

@@ -1225,12 +1173,9 @@ class DummyPubSubType : public eprosima::fastdds::dds::TopicDataType
12251173
}
12261174

12271175
};
1228-
12291176
typedef std::vector<eprosima::fastdds::dds::xtypes::TypeIdentifier> TypeIdentifierSeq;
12301177
typedef uint32_t MemberId;
12311178

1232-
1233-
12341179
/*!
12351180
* @brief This class represents the TopicDataType of the type ExtendedAnnotationParameterValue defined by the user in the IDL file.
12361181
* @ingroup dds_xtypes_typeobject
@@ -1312,7 +1257,6 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds
13121257

13131258
};
13141259

1315-
13161260
/*!
13171261
* @brief This class represents the TopicDataType of the type AppliedAnnotationParameter defined by the user in the IDL file.
13181262
* @ingroup dds_xtypes_typeobject
@@ -7882,7 +7826,6 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT
78827826

78837827
};
78847828

7885-
78867829
/*!
78877830
* @brief This class represents the TopicDataType of the type MinimalExtendedType defined by the user in the IDL file.
78887831
* @ingroup dds_xtypes_typeobject
@@ -7963,8 +7906,6 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy
79637906
unsigned char* key_buffer_;
79647907

79657908
};
7966-
7967-
79687909
typedef std::vector<eprosima::fastdds::dds::xtypes::TypeObject> TypeObjectSeq;
79697910
typedef eprosima::fastdds::dds::xtypes::TypeObjectSeq StronglyConnectedComponent;
79707911

‎src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp

+24-6
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,10 @@ class TypeLookup_getTypes_Result
640640
}
641641

642642
selected_member_ = 0x00000001;
643-
member_destructor_ = [&]() {m_result.~TypeLookup_getTypes_Out();};
643+
member_destructor_ = [&]()
644+
{
645+
m_result.~TypeLookup_getTypes_Out();
646+
};
644647
new(&m_result) TypeLookup_getTypes_Out();
645648

646649
}
@@ -1279,7 +1282,10 @@ class TypeLookup_getTypeDependencies_Result
12791282
}
12801283

12811284
selected_member_ = 0x00000001;
1282-
member_destructor_ = [&]() {m_result.~TypeLookup_getTypeDependencies_Out();};
1285+
member_destructor_ = [&]()
1286+
{
1287+
m_result.~TypeLookup_getTypeDependencies_Out();
1288+
};
12831289
new(&m_result) TypeLookup_getTypeDependencies_Out();
12841290

12851291
}
@@ -1638,7 +1644,10 @@ class TypeLookup_Call
16381644
}
16391645

16401646
selected_member_ = 0x00000001;
1641-
member_destructor_ = [&]() {m_getTypes.~TypeLookup_getTypes_In();};
1647+
member_destructor_ = [&]()
1648+
{
1649+
m_getTypes.~TypeLookup_getTypes_In();
1650+
};
16421651
new(&m_getTypes) TypeLookup_getTypes_In();
16431652

16441653
}
@@ -1656,7 +1665,10 @@ class TypeLookup_Call
16561665
}
16571666

16581667
selected_member_ = 0x00000002;
1659-
member_destructor_ = [&]() {m_getTypeDependencies.~TypeLookup_getTypeDependencies_In();};
1668+
member_destructor_ = [&]()
1669+
{
1670+
m_getTypeDependencies.~TypeLookup_getTypeDependencies_In();
1671+
};
16601672
new(&m_getTypeDependencies) TypeLookup_getTypeDependencies_In();
16611673

16621674
}
@@ -2196,7 +2208,10 @@ class TypeLookup_Return
21962208
}
21972209

21982210
selected_member_ = 0x00000001;
2199-
member_destructor_ = [&]() {m_getType.~TypeLookup_getTypes_Result();};
2211+
member_destructor_ = [&]()
2212+
{
2213+
m_getType.~TypeLookup_getTypes_Result();
2214+
};
22002215
new(&m_getType) TypeLookup_getTypes_Result();
22012216

22022217
}
@@ -2214,7 +2229,10 @@ class TypeLookup_Return
22142229
}
22152230

22162231
selected_member_ = 0x00000002;
2217-
member_destructor_ = [&]() {m_getTypeDependencies.~TypeLookup_getTypeDependencies_Result();};
2232+
member_destructor_ = [&]()
2233+
{
2234+
m_getTypeDependencies.~TypeLookup_getTypeDependencies_Result();
2235+
};
22182236
new(&m_getTypeDependencies) TypeLookup_getTypeDependencies_Result();
22192237

22202238
}

‎src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.hpp

-4
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ eProsima_user_DllExport void serialize_key(
180180
eprosima::fastcdr::Cdr& scdr,
181181
const eprosima::fastdds::dds::builtin::TypeLookup_getTypes_Out& data);
182182

183-
184183
eProsima_user_DllExport void serialize_key(
185184
eprosima::fastcdr::Cdr& scdr,
186185
const eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_In& data);
@@ -189,13 +188,10 @@ eProsima_user_DllExport void serialize_key(
189188
eprosima::fastcdr::Cdr& scdr,
190189
const eprosima::fastdds::dds::builtin::TypeLookup_getTypeDependencies_Out& data);
191190

192-
193-
194191
eProsima_user_DllExport void serialize_key(
195192
eprosima::fastcdr::Cdr& scdr,
196193
const eprosima::fastdds::dds::builtin::TypeLookup_Request& data);
197194

198-
199195
eProsima_user_DllExport void serialize_key(
200196
eprosima::fastcdr::Cdr& scdr,
201197
const eprosima::fastdds::dds::builtin::TypeLookup_Reply& data);

0 commit comments

Comments
 (0)