Refs #20733: Apply Miguel's suggestions

Signed-off-by: eduponz <eduardoponz@eprosima.com>
eProsima · Apr 30, 2024 · 2519f21 · 2519f21
1 parent b76cfdc
commit 2519f21
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/cpp/dynamic-types/AnnotationDescriptor.cpp b/src/cpp/dynamic-types/AnnotationDescriptor.cpp
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <fastdds/dds/log/Log.hpp>
 #include <fastrtps/types/AnnotationDescriptor.h>
 #include <fastrtps/types/DynamicType.h>
 #include <fastrtps/types/DynamicTypeBuilderFactory.h>
-#include <fastdds/dds/log/Log.hpp>
+#include <fastrtps/types/TypesBase.h>
 
 namespace eprosima {
 namespace fastrtps {
@@ -96,9 +97,9 @@ bool AnnotationDescriptor::key_annotation() const
     if (type_ && (type_->get_name() == ANNOTATION_KEY_ID || type_->get_name() == ANNOTATION_EPKEY_ID))
     {
         // When an annotation is a key annotation, there is only one entry in value_.
-        // Its map key is "value" and its value is either "true" of "false".
+        // Its map key is ANNOTATION_VALUE_ID and its value is either "true" of "false".
         // We cannot call get_value() directly because it is not const-qualified
-        auto it = value_.find("value");
+        auto it = value_.find(ANNOTATION_VALUE_ID);
 
         if (it != value_.end())
         {
@@ -112,7 +113,7 @@ bool AnnotationDescriptor::key_annotation() const
 ReturnCode_t AnnotationDescriptor::get_value(
         std::string& value)
 {
-    return get_value(value, "value");
+    return get_value(value, ANNOTATION_VALUE_ID);
 }
 
 ReturnCode_t AnnotationDescriptor::get_value(

diff --git a/src/cpp/dynamic-types/MemberDescriptor.cpp b/src/cpp/dynamic-types/MemberDescriptor.cpp
@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fastrtps/types/MemberDescriptor.h>
-#include <fastrtps/types/DynamicType.h>
-#include <fastrtps/types/TypeDescriptor.h>
+#include <fastdds/dds/log/Log.hpp>
 #include <fastrtps/types/AnnotationDescriptor.h>
+#include <fastrtps/types/DynamicType.h>
 #include <fastrtps/types/DynamicTypeBuilderFactory.h>
-#include <fastdds/dds/log/Log.hpp>
+#include <fastrtps/types/MemberDescriptor.h>
+#include <fastrtps/types/TypeDescriptor.h>
+#include <fastrtps/types/TypesBase.h>
 
 namespace eprosima {
 namespace fastrtps {
@@ -421,7 +422,7 @@ void MemberDescriptor::copy_annotations_from_type(
 {
     if (type)
     {
-        // Copy annotation from type
+        // Copy annotations from type
         uint32_t num_annotations = type->get_annotation_count();
         for (uint32_t i = 0; i < num_annotations; ++i)
         {