Skip to content

Commit

Permalink
Refs #18687. Fix warning on mac
Browse files Browse the repository at this point in the history
Signed-off-by: Ricardo González Moreno <[email protected]>
  • Loading branch information
richiware committed Sep 22, 2023
1 parent 23cb25a commit 7d0278c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
9 changes: 4 additions & 5 deletions test/unittest/dynamic_types/idl/Basic.h
Original file line number Diff line number Diff line change
Expand Up @@ -1877,7 +1877,7 @@ class ArraytStruct

private:

std::array<std::array<std::array<int32_t, 2>, 2>, 2> m_my_array{0};
std::array<std::array<std::array<int32_t, 2>, 2>, 2> m_my_array{ {{ {{0}} }} };

};
typedef std::array<std::array<int32_t, 2>, 2> MyArray;
Expand Down Expand Up @@ -1970,7 +1970,7 @@ class ArrayArrayStruct

private:

std::array<std::array<MyArray, 2>, 2> m_my_array_array{0};
std::array<std::array<MyArray, 2>, 2> m_my_array_array{ {{ {{ {{0}} }} }} };

};
/*!
Expand Down Expand Up @@ -2428,9 +2428,8 @@ class MyBitset

eProsima_user_DllExport std::bitset<30> bitset() const;

eProsima_user_DllExport void bitset(const std::bitset<30>&);


eProsima_user_DllExport void bitset(
const std::bitset<30>&);

private:

Expand Down
7 changes: 4 additions & 3 deletions test/unittest/dynamic_types/idl/Test.h
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,8 @@ class ComplexStruct
* @brief This function returns a constant reference to member my_array_string
* @return Constant reference to member my_array_string
*/
eProsima_user_DllExport const std::array<std::array<eprosima::fastcdr::fixed_string<75>, 5>, 5>& my_array_string() const;
eProsima_user_DllExport const std::array<std::array<eprosima::fastcdr::fixed_string<75>, 5>,
5>& my_array_string() const;

/*!
* @brief This function returns a reference to member my_array_string
Expand Down Expand Up @@ -1022,7 +1023,7 @@ class ComplexStruct
MyEnum m_my_enum{::A};
std::vector<uint8_t> m_my_sequence_octet;
std::vector<BasicStruct> m_my_sequence_struct;
std::array<std::array<std::array<char, 4>, 5>, 500> m_my_array_octet{0};
std::array<std::array<std::array<char, 4>, 5>, 500> m_my_array_octet{ {{ {{0}} }} };
MyOctetArray500 m_my_octet_array_500{0};
std::array<BasicStruct, 5> m_my_array_struct;
std::map<uint8_t, int16_t> m_my_map_octet_short;
Expand All @@ -1034,7 +1035,7 @@ class ComplexStruct
eprosima::fastcdr::fixed_string<500> m_my_large_string_8;
std::array<std::array<eprosima::fastcdr::fixed_string<75>, 5>, 5> m_my_array_string;
MA3 m_multi_alias_array_42{::A};
std::array<MyMiniArray, 5> m_my_array_arrays{0};
std::array<MyMiniArray, 5> m_my_array_arrays { {{0}} };
std::array<MySequenceLong, 23> m_my_sequences_array;

};
Expand Down
2 changes: 1 addition & 1 deletion test/unittest/xtypes/idl/Types.h
Original file line number Diff line number Diff line change
Expand Up @@ -1829,7 +1829,7 @@ class ArrayDimensionsStruct

private:

std::array<std::array<int32_t, 2>, 2> m_my_array{0};
std::array<std::array<int32_t, 2>, 2> m_my_array { {{0}} };

};
/*!
Expand Down
2 changes: 1 addition & 1 deletion test/xtypes/idl/Types.h
Original file line number Diff line number Diff line change
Expand Up @@ -1829,7 +1829,7 @@ class ArrayDimensionsStruct

private:

std::array<std::array<int32_t, 2>, 2> m_my_array{0};
std::array<std::array<int32_t, 2>, 2> m_my_array { {{0}} };

};
/*!
Expand Down

0 comments on commit 7d0278c

Please sign in to comment.