Skip to content

Commit f7f40ac

Browse files
Refs #22202. Uncrustify
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
1 parent 917b572 commit f7f40ac

7 files changed

Lines changed: 168 additions & 85 deletions

File tree

src/cpp/fastdds/xtypes/serializers/json/dynamic_data_json.cpp

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -148,25 +148,29 @@ ReturnCode_t json_serialize_member(
148148
case TK_BITSET:
149149
{
150150
return json_serialize_member_with_loan(data, member_id,
151-
(member_kind == TK_STRUCTURE) ? "structure" : "bitset", json_serialize_aggregate_member,
152-
member_name, output, format);
151+
(member_kind == TK_STRUCTURE) ? "structure" : "bitset", json_serialize_aggregate_member,
152+
member_name, output, format);
153153
}
154154
case TK_UNION:
155155
{
156-
return json_serialize_member_with_loan(data, member_id, "union", json_serialize_union_member, member_name, output, format);
156+
return json_serialize_member_with_loan(data, member_id, "union", json_serialize_union_member, member_name,
157+
output, format);
157158
}
158159
case TK_SEQUENCE:
159160
case TK_ARRAY:
160161
{
161-
return json_serialize_member_with_loan(data, member_id, (member_kind == TK_SEQUENCE) ? "sequence" : "array", json_serialize_collection_member, member_name, output, format);
162+
return json_serialize_member_with_loan(data, member_id, (member_kind == TK_SEQUENCE) ? "sequence" : "array",
163+
json_serialize_collection_member, member_name, output, format);
162164
}
163165
case TK_MAP:
164166
{
165-
return json_serialize_member_with_loan(data, member_id, "map", json_serialize_map_member, member_name, output, format);
167+
return json_serialize_member_with_loan(data, member_id, "map", json_serialize_map_member, member_name,
168+
output, format);
166169
}
167170
case TK_BITMASK:
168171
{
169-
return json_serialize_member_with_loan(data, member_id, "bitmask", json_serialize_bitmask_member, member_name, output, format);
172+
return json_serialize_member_with_loan(data, member_id, "bitmask", json_serialize_bitmask_member,
173+
member_name, output, format);
170174
}
171175
case TK_ALIAS:
172176
{
@@ -442,7 +446,8 @@ ReturnCode_t json_serialize_basic_member(
442446
else if (size_needed > 0)
443447
{
444448
utf8_value.resize(size_needed);
445-
if (std::wcstombs(&utf8_value[0], aux_wstring_value.c_str(), size_needed) == static_cast<std::size_t>(-1))
449+
if (std::wcstombs(&utf8_value[0], aux_wstring_value.c_str(),
450+
size_needed) == static_cast<std::size_t>(-1))
446451
{
447452
EPROSIMA_LOG_ERROR(XTYPES_UTILS,
448453
"Error encountered while serializing TK_CHAR16 member to JSON: encountered invalid character.");
@@ -561,7 +566,9 @@ ReturnCode_t json_serialize_enum_member(
561566
if (TK_ARRAY == holder_kind || TK_SEQUENCE == holder_kind)
562567
{
563568
const TypeDescriptorImpl& collection_descriptor = data->enclosing_type()->get_descriptor();
564-
enum_type = traits<DynamicType>::narrow<DynamicTypeImpl>(collection_descriptor.element_type())->resolve_alias_enclosed_type();
569+
enum_type =
570+
traits<DynamicType>::narrow<DynamicTypeImpl>(collection_descriptor.element_type())->
571+
resolve_alias_enclosed_type();
565572
}
566573
else
567574
{
@@ -577,7 +584,8 @@ ReturnCode_t json_serialize_enum_member(
577584

578585
// Get value depending on the enclosing type
579586
assert(enum_type->get_kind() == TK_ENUM);
580-
TypeKind enclosing_kind = traits<DynamicType>::narrow<DynamicTypeImpl>(enum_type->get_all_members_by_index().at(0)->get_descriptor().type())->get_kind(); // Unfortunately DynamicDataImpl::get_enclosing_typekind is private
587+
TypeKind enclosing_kind = traits<DynamicType>::narrow<DynamicTypeImpl>(enum_type->get_all_members_by_index().at(
588+
0)->get_descriptor().type())->get_kind(); // Unfortunately DynamicDataImpl::get_enclosing_typekind is private
581589
nlohmann::json j_value;
582590
if (TK_INT8 == enclosing_kind)
583591
{
@@ -725,7 +733,8 @@ ReturnCode_t json_serialize_aggregate_member(
725733
if (RETCODE_OK != (ret = json_serialize_aggregate(data, j_struct, format)))
726734
{
727735
EPROSIMA_LOG_ERROR(XTYPES_UTILS,
728-
"Error encountered while serializing " << kind_str << " member to JSON: json_serialize_aggregate failed.");
736+
"Error encountered while serializing " << kind_str <<
737+
" member to JSON: json_serialize_aggregate failed.");
729738
return ret;
730739
}
731740

@@ -781,7 +790,9 @@ ReturnCode_t json_serialize_collection_member(
781790
{
782791
ReturnCode_t ret = RETCODE_OK;
783792
const TypeDescriptorImpl& descriptor = data->enclosing_type()->get_descriptor();
784-
auto element_kind = traits<DynamicType>::narrow<DynamicTypeImpl>(descriptor.element_type())->resolve_alias_enclosed_type()->get_kind();
793+
auto element_kind =
794+
traits<DynamicType>::narrow<DynamicTypeImpl>(descriptor.element_type())->resolve_alias_enclosed_type()
795+
->get_kind();
785796
if (TK_SEQUENCE == data->enclosing_type()->get_kind())
786797
{
787798
assert(descriptor.bound().size() == 1);

src/cpp/fastdds/xtypes/serializers/json/dynamic_data_json.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ ReturnCode_t json_serialize_enum_member(
8686
// WARNING: Enforcing noexcept here throws a warning in C++11, and in fact causes no effect (i.e. compilation does not
8787
// fail when executing a method with this signature from a noexcept one) -> manually ensure all serializers are noexcept
8888
using MemberSerializer = ReturnCode_t (*)(
89-
const traits<DynamicDataImpl>::ref_type& data,
90-
const std::string& member_name,
91-
nlohmann::json& output,
92-
DynamicDataJsonFormat format);
89+
const traits<DynamicDataImpl>::ref_type& data,
90+
const std::string& member_name,
91+
nlohmann::json& output,
92+
DynamicDataJsonFormat format);
9393

9494
ReturnCode_t json_serialize_member_with_loan(
9595
const traits<DynamicDataImpl>::ref_type& data,

0 commit comments

Comments
 (0)