From e14be1afacc2f6e0f22ca9fd9fbd14fb7d7aa1f4 Mon Sep 17 00:00:00 2001 From: Eduardo Ponz Segrelles Date: Tue, 30 Apr 2024 07:53:18 +0200 Subject: [PATCH 1/2] Document how to annotate member as key in XMl types (#746) Signed-off-by: eduponz (cherry picked from commit f95e5c960f5ac57e53b7f2bafb85292f2ba25333) # Conflicts: # code/XMLTester.xml --- code/XMLTester.xml | 43 +++++++++++++++++++ .../xml_configuration/dynamic_types.rst | 6 +++ 2 files changed, 49 insertions(+) diff --git a/code/XMLTester.xml b/code/XMLTester.xml index 31691445a..f4f4f1753 100644 --- a/code/XMLTester.xml +++ b/code/XMLTester.xml @@ -4389,6 +4389,7 @@ <--> +<<<<<<< HEAD XML_RELIABILITY<--> @@ -4401,6 +4402,48 @@ +======= +XML-GENERIC<--> + + + + + + + + + + + + + + + + + + + + +<--> + +XML-MEMBER_WITH_KEY<--> + +<--> +XML-BOUNDEDSTRINGS<--> + + +<--> +XML-SEQUENCES<--> + +<--> +XML-ARRAYS<--> + +<--> +XML-MAPS<--> + +<--> + +>>>>>>> f95e5c9 (Document how to annotate member as key in XMl types (#746)) diff --git a/docs/fastdds/xml_configuration/dynamic_types.rst b/docs/fastdds/xml_configuration/dynamic_types.rst index 1bc5cd40c..62a1936af 100644 --- a/docs/fastdds/xml_configuration/dynamic_types.rst +++ b/docs/fastdds/xml_configuration/dynamic_types.rst @@ -161,6 +161,12 @@ Member types Member types are defined as any type that can belong to a ```` or a ````, or be aliased by a ````. These can be defined by the ```` XML tag. +A member can be annotated as ``key`` (equivalent of the IDL's ``@key``) by setting the ``key`` attribute to ``"true"``. + +.. literalinclude:: /../code/XMLTester.xml + :language: xml + :start-after: XML-MEMBER_WITH_KEY<--> + :end-before: <--> Primitive types *************** From 4c622ed9732bbb51c5fec3f53517c1be90dcf52b Mon Sep 17 00:00:00 2001 From: Mario Dominguez Date: Thu, 27 Jun 2024 08:05:24 +0200 Subject: [PATCH 2/2] Refs #21244: Solve conflicts Signed-off-by: Mario Dominguez --- code/XMLTester.xml | 46 +++------------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/code/XMLTester.xml b/code/XMLTester.xml index f4f4f1753..7d437cecf 100644 --- a/code/XMLTester.xml +++ b/code/XMLTester.xml @@ -1441,6 +1441,9 @@ <--> +XML-MEMBER_WITH_KEY<--> + +<--> XML-BOUNDEDSTRINGS<--> @@ -4389,7 +4392,6 @@ <--> -<<<<<<< HEAD XML_RELIABILITY<--> @@ -4402,48 +4404,6 @@ -======= -XML-GENERIC<--> - - - - - - - - - - - - - - - - - - - - -<--> - -XML-MEMBER_WITH_KEY<--> - -<--> -XML-BOUNDEDSTRINGS<--> - - -<--> -XML-SEQUENCES<--> - -<--> -XML-ARRAYS<--> - -<--> -XML-MAPS<--> - -<--> - ->>>>>>> f95e5c9 (Document how to annotate member as key in XMl types (#746))