Refs #20335: apply review suggestions

Signed-off-by: JLBuenoLopez-eProsima <[email protected]>
eProsima · Mar 26, 2024 · e49f544 · e49f544
1 parent b211b4f
commit e49f544
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterFactory.cpp
@@ -202,7 +202,7 @@ static DDSFilterPredicate::OperationKind get_predicate_op(
 
 struct ExpressionParsingState
 {
-    const std::shared_ptr<xtypes::TypeObject>& type_object;
+    const std::shared_ptr<xtypes::TypeObject> type_object;
     const IContentFilterFactory::ParameterSeq& filter_parameters;
     DDSFilterExpression* filter;
 };
@@ -538,7 +538,7 @@ ReturnCode_t DDSFilterFactory::create_content_filter(
             {
                 DynamicType::_ref_type dyn_type = DynamicTypeBuilderFactory::get_instance()->create_type_w_type_object(
                     type_objects->complete_type_object)->build();
-                if (nullptr != dyn_type)
+                if (dyn_type)
                 {
                     DDSFilterExpression* expr = get_expression();
                     expr->set_type(dyn_type);

diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderFactoryImpl.cpp
@@ -14,9 +14,7 @@
 
 #include "DynamicTypeBuilderFactoryImpl.hpp"
 
-#include <codecvt>
 #include <ios>
-#include <locale>
 #include <sstream>
 #include <string>
 

diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderImpl.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicTypeBuilderImpl.cpp
@@ -203,7 +203,8 @@ bool DynamicTypeBuilderImpl::equals(
             }
         }
 
-        if (verbatim_.size() == impl->verbatim_.size())
+        ret_value &= verbatim_.size() == impl->verbatim_.size();
+        if (ret_value)
         {
             for (size_t count {0}; ret_value && count < verbatim_.size(); ++count)
             {