Refs #20424. Fixing windows and mac warnings.

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · May 13, 2024 · be61920 · be61920
1 parent 337a21b
commit be61920
Show file tree

Hide file tree

Showing 6 changed files with 373 additions and 29,058 deletions.
diff --git a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.cpp b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.cpp
diff --git a/test/feature/dynamic_types/DynamicTypesTests.cpp b/test/feature/dynamic_types/DynamicTypesTests.cpp
@@ -151,17 +151,6 @@ class DynamicTypesTests : public ::testing::Test
         return config_file_;
     }
 
-    struct order_member_desc
-        : public std::binary_function<const MemberDescriptor&, const MemberDescriptor&, bool>
-    {
-        result_type operator ()(
-                first_argument_type lhs,
-                second_argument_type rhs ) const
-        {
-            return lhs.index() < rhs.index();
-        }
-
-    };
 };
 
 
@@ -10350,7 +10339,7 @@ TEST_F(DynamicTypesTests, DynamicType_array)
         type_descriptor->key_element_type(nullptr);
     }
 
-    BoundSeq array_dimensions {{ 2, 2, 2 }};
+    BoundSeq array_dimensions {2, 2, 2};
 
     DynamicTypeBuilder::_ref_type builder {factory->create_array_type(
                                                factory->get_primitive_type(
@@ -10650,8 +10639,8 @@ TEST_F(DynamicTypesTests, DynamicType_array_of_arrays)
 {
     DynamicTypeBuilderFactory::_ref_type factory {DynamicTypeBuilderFactory::get_instance()};
 
-    BoundSeq array_dimensions {{ 2, 2 }};
-    BoundSeq inner_array_dimensions {{ 2 }};
+    BoundSeq array_dimensions {2, 2};
+    BoundSeq inner_array_dimensions {2};
 
     DynamicTypeBuilder::_ref_type builder {factory->create_array_type(
                                                factory->get_primitive_type(

diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp
@@ -491,7 +491,7 @@ TEST_F(DynamicTypesDDSTypesTest, DDSTypesTest_AliasOctet)
 {
     TypeDescriptor::_ref_type type_descriptor {traits<TypeDescriptor>::make_shared()};
     type_descriptor->kind(TK_STRUCTURE);
-    type_descriptor->name("AliasOctet");
+    type_descriptor->name(struct_alias_octet_name);
     DynamicTypeBuilder::_ref_type type_builder {DynamicTypeBuilderFactory::get_instance()->create_type(type_descriptor)};
     ASSERT_TRUE(type_builder);
 

diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp
@@ -79,7 +79,6 @@ constexpr const char* bounded_wstring_multiarray_struct_name = "ArrayMultiDimens
 constexpr const char* enum_multiarray_struct_name = "ArrayMultiDimensionEnum";
 constexpr const char* bitmask_multiarray_struct_name = "ArrayMultiDimensionBitMask";
 constexpr const char* alias_multiarray_struct_name = "ArrayMultiDimensionAlias";
-constexpr const char* array_multiarray_struct_name = "ArrayMultiDimensionShortArray";
 constexpr const char* seq_multiarray_struct_name = "ArrayMultiDimensionSequence";
 constexpr const char* map_multiarray_struct_name = "ArrayMultiDimensionMap";
 constexpr const char* union_multiarray_struct_name = "ArrayMultiDimensionUnion";