Skip to content

Commit df72ddb

Browse files
LiPing07engr-ping
authored andcommitted
fix microcontroller no real bool type issue
Signed-off-by: clipping <clippinglp@qq.com>
1 parent cf9069c commit df72ddb

1 file changed

Lines changed: 33 additions & 33 deletions

File tree

src/c/core/serialization/xrce_types.c

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ bool uxr_serialize_CLIENT_Representation(
409409
ret &= uxr_serialize_XrceVendorId(buffer, &input->xrce_vendor_id);
410410
ret &= uxr_serialize_ClientKey(buffer, &input->client_key);
411411
ret &= ucdr_serialize_uint8_t(buffer, input->session_id);
412-
ret &= ucdr_serialize_bool(buffer, input->optional_properties);
412+
ret &= ucdr_serialize_bool(buffer, (input->optional_properties)? 0x01 : 0x00);
413413
if (input->optional_properties == true)
414414
{
415415
ret &= uxr_serialize_PropertySeq(buffer, &input->properties);
@@ -447,7 +447,7 @@ bool uxr_serialize_AGENT_Representation(
447447
ret &= uxr_serialize_XrceCookie(buffer, &input->xrce_cookie);
448448
ret &= uxr_serialize_XrceVersion(buffer, &input->xrce_version);
449449
ret &= uxr_serialize_XrceVendorId(buffer, &input->xrce_vendor_id);
450-
ret &= ucdr_serialize_bool(buffer, input->optional_properties);
450+
ret &= ucdr_serialize_bool(buffer, (input->optional_properties)? 0x01 : 0x00);
451451
if (input->optional_properties == true)
452452
{
453453
ret &= uxr_serialize_PropertySeq(buffer, &input->properties);
@@ -909,13 +909,13 @@ bool uxr_serialize_OBJK_DomainParticipant_Binary(
909909
const OBJK_DomainParticipant_Binary* input)
910910
{
911911
bool ret = true;
912-
ret &= ucdr_serialize_bool(buffer, input->optional_domain_reference);
912+
ret &= ucdr_serialize_bool(buffer, (input->optional_domain_reference)? 0x01 : 0x00);
913913
if (input->optional_domain_reference == true)
914914
{
915915
ret &= ucdr_serialize_string(buffer, input->domain_reference);
916916
}
917917

918-
ret &= ucdr_serialize_bool(buffer, input->optional_qos_profile_reference);
918+
ret &= ucdr_serialize_bool(buffer, (input->optional_qos_profile_reference)? 0x01 : 0x00);
919919
if (input->optional_qos_profile_reference == true)
920920
{
921921
ret &= ucdr_serialize_string(buffer, input->qos_profile_reference);
@@ -950,13 +950,13 @@ bool uxr_serialize_OBJK_Topic_Binary(
950950
{
951951
bool ret = true;
952952
ret &= ucdr_serialize_string(buffer, input->topic_name);
953-
ret &= ucdr_serialize_bool(buffer, input->optional_type_reference);
953+
ret &= ucdr_serialize_bool(buffer, (input->optional_type_reference)? 0x01 : 0x00);
954954
if (input->optional_type_reference == true)
955955
{
956956
ret &= ucdr_serialize_string(buffer, input->type_reference);
957957
}
958958

959-
ret &= ucdr_serialize_bool(buffer, input->optional_type_name);
959+
ret &= ucdr_serialize_bool(buffer, (input->optional_type_name)? 0x01 : 0x00);
960960
if (input->optional_type_name == true)
961961
{
962962
ret &= ucdr_serialize_string(buffer, input->type_name);
@@ -991,13 +991,13 @@ bool uxr_serialize_OBJK_Publisher_Binary_Qos(
991991
const OBJK_Publisher_Binary_Qos* input)
992992
{
993993
bool ret = true;
994-
ret &= ucdr_serialize_bool(buffer, input->optional_partitions);
994+
ret &= ucdr_serialize_bool(buffer, (input->optional_partitions)? 0x01 : 0x00);
995995
if (input->optional_partitions == true)
996996
{
997997
ret &= uxr_serialize_StringSequence_t(buffer, &input->partitions);
998998
}
999999

1000-
ret &= ucdr_serialize_bool(buffer, input->optional_group_data);
1000+
ret &= ucdr_serialize_bool(buffer, (input->optional_group_data)? 0x01 : 0x00);
10011001
if (input->optional_group_data == true)
10021002
{
10031003
ret &= uxr_serialize_BinarySequence_t(buffer, &input->group_data);
@@ -1031,13 +1031,13 @@ bool uxr_serialize_OBJK_Publisher_Binary(
10311031
const OBJK_Publisher_Binary* input)
10321032
{
10331033
bool ret = true;
1034-
ret &= ucdr_serialize_bool(buffer, input->optional_publisher_name);
1034+
ret &= ucdr_serialize_bool(buffer, (input->optional_publisher_name)? 0x01 : 0x00);
10351035
if (input->optional_publisher_name == true)
10361036
{
10371037
ret &= ucdr_serialize_string(buffer, input->publisher_name);
10381038
}
10391039

1040-
ret &= ucdr_serialize_bool(buffer, input->optional_qos);
1040+
ret &= ucdr_serialize_bool(buffer, (input->optional_qos)? 0x01 : 0x00);
10411041
if (input->optional_qos == true)
10421042
{
10431043
ret &= uxr_serialize_OBJK_Publisher_Binary_Qos(buffer, &input->qos);
@@ -1071,13 +1071,13 @@ bool uxr_serialize_OBJK_Subscriber_Binary_Qos(
10711071
const OBJK_Subscriber_Binary_Qos* input)
10721072
{
10731073
bool ret = true;
1074-
ret &= ucdr_serialize_bool(buffer, input->optional_partitions);
1074+
ret &= ucdr_serialize_bool(buffer, (input->optional_partitions)? 0x01 : 0x00);
10751075
if (input->optional_partitions == true)
10761076
{
10771077
ret &= uxr_serialize_StringSequence_t(buffer, &input->partitions);
10781078
}
10791079

1080-
ret &= ucdr_serialize_bool(buffer, input->optional_group_data);
1080+
ret &= ucdr_serialize_bool(buffer, (input->optional_group_data)? 0x01 : 0x00);
10811081
if (input->optional_group_data == true)
10821082
{
10831083
ret &= uxr_serialize_BinarySequence_t(buffer, &input->group_data);
@@ -1111,13 +1111,13 @@ bool uxr_serialize_OBJK_Subscriber_Binary(
11111111
const OBJK_Subscriber_Binary* input)
11121112
{
11131113
bool ret = true;
1114-
ret &= ucdr_serialize_bool(buffer, input->optional_subscriber_name);
1114+
ret &= ucdr_serialize_bool(buffer, (input->optional_subscriber_name)? 0x01 : 0x00);
11151115
if (input->optional_subscriber_name == true)
11161116
{
11171117
ret &= ucdr_serialize_string(buffer, input->subscriber_name);
11181118
}
11191119

1120-
ret &= ucdr_serialize_bool(buffer, input->optional_qos);
1120+
ret &= ucdr_serialize_bool(buffer, (input->optional_qos)? 0x01 : 0x00);
11211121
if (input->optional_qos == true)
11221122
{
11231123
ret &= uxr_serialize_OBJK_Subscriber_Binary_Qos(buffer, &input->qos);
@@ -1152,25 +1152,25 @@ bool uxr_serialize_OBJK_Endpoint_QosBinary(
11521152
{
11531153
bool ret = true;
11541154
ret &= ucdr_serialize_uint16_t(buffer, input->qos_flags);
1155-
ret &= ucdr_serialize_bool(buffer, input->optional_history_depth);
1155+
ret &= ucdr_serialize_bool(buffer, (input->optional_history_depth)? 0x01 : 0x00);
11561156
if (input->optional_history_depth == true)
11571157
{
11581158
ret &= ucdr_serialize_uint16_t(buffer, input->history_depth);
11591159
}
11601160

1161-
ret &= ucdr_serialize_bool(buffer, input->optional_deadline_msec);
1161+
ret &= ucdr_serialize_bool(buffer, (input->optional_deadline_msec)? 0x01 : 0x00);
11621162
if (input->optional_deadline_msec == true)
11631163
{
11641164
ret &= ucdr_serialize_uint32_t(buffer, input->deadline_msec);
11651165
}
11661166

1167-
ret &= ucdr_serialize_bool(buffer, input->optional_lifespan_msec);
1167+
ret &= ucdr_serialize_bool(buffer, (input->optional_lifespan_msec)? 0x01 : 0x00);
11681168
if (input->optional_lifespan_msec == true)
11691169
{
11701170
ret &= ucdr_serialize_uint32_t(buffer, input->lifespan_msec);
11711171
}
11721172

1173-
ret &= ucdr_serialize_bool(buffer, input->optional_user_data);
1173+
ret &= ucdr_serialize_bool(buffer, (input->optional_user_data)? 0x01 : 0x00);
11741174
if (input->optional_user_data == true)
11751175
{
11761176
ret &= uxr_serialize_BinarySequence_t(buffer, (BinarySequence_t*) &input->user_data);
@@ -1218,7 +1218,7 @@ bool uxr_serialize_OBJK_DataWriter_Binary_Qos(
12181218
{
12191219
bool ret = true;
12201220
ret &= uxr_serialize_OBJK_Endpoint_QosBinary(buffer, &input->base);
1221-
ret &= ucdr_serialize_bool(buffer, input->optional_ownership_strength);
1221+
ret &= ucdr_serialize_bool(buffer, (input->optional_ownership_strength)? 0x01 : 0x00);
12221222
if (input->optional_ownership_strength == true)
12231223
{
12241224
ret &= ucdr_serialize_uint64_t(buffer, input->ownership_strength);
@@ -1248,13 +1248,13 @@ bool uxr_serialize_OBJK_DataReader_Binary_Qos(
12481248
{
12491249
bool ret = true;
12501250
ret &= uxr_serialize_OBJK_Endpoint_QosBinary(buffer, &input->base);
1251-
ret &= ucdr_serialize_bool(buffer, input->optional_timebasedfilter_msec);
1251+
ret &= ucdr_serialize_bool(buffer, (input->optional_timebasedfilter_msec)? 0x01 : 0x00);
12521252
if (input->optional_timebasedfilter_msec == true)
12531253
{
12541254
ret &= ucdr_serialize_uint64_t(buffer, input->timebasedfilter_msec);
12551255
}
12561256

1257-
ret &= ucdr_serialize_bool(buffer, input->optional_contentbased_filter);
1257+
ret &= ucdr_serialize_bool(buffer, (input->optional_contentbased_filter)? 0x01 : 0x00);
12581258
if (input->optional_contentbased_filter == true)
12591259
{
12601260
ret &= ucdr_serialize_string(buffer, input->contentbased_filter);
@@ -1290,7 +1290,7 @@ bool uxr_serialize_OBJK_DataReader_Binary(
12901290
{
12911291
bool ret = true;
12921292
ret &= uxr_serialize_ObjectId(buffer, &input->topic_id);
1293-
ret &= ucdr_serialize_bool(buffer, input->optional_qos);
1293+
ret &= ucdr_serialize_bool(buffer, (input->optional_qos)? 0x01 : 0x00);
12941294
if (input->optional_qos == true)
12951295
{
12961296
ret &= uxr_serialize_OBJK_DataReader_Binary_Qos(buffer, &input->qos);
@@ -1320,7 +1320,7 @@ bool uxr_serialize_OBJK_DataWriter_Binary(
13201320
{
13211321
bool ret = true;
13221322
ret &= uxr_serialize_ObjectId(buffer, &input->topic_id);
1323-
ret &= ucdr_serialize_bool(buffer, input->optional_qos);
1323+
ret &= ucdr_serialize_bool(buffer, (input->optional_qos)? 0x01 : 0x00);
13241324
if (input->optional_qos == true)
13251325
{
13261326
ret &= uxr_serialize_OBJK_DataWriter_Binary_Qos(buffer, &input->qos);
@@ -1352,12 +1352,12 @@ bool uxr_serialize_OBJK_Requester_Binary(
13521352
ret &= ucdr_serialize_string(buffer, input->service_name);
13531353
ret &= ucdr_serialize_string(buffer, input->request_type);
13541354
ret &= ucdr_serialize_string(buffer, input->reply_type);
1355-
ret &= ucdr_serialize_bool(buffer, input->optional_request_topic_name);
1355+
ret &= ucdr_serialize_bool(buffer, (input->optional_request_topic_name)? 0x01 : 0x00);
13561356
if (input->optional_request_topic_name == true)
13571357
{
13581358
ret &= ucdr_serialize_string(buffer, input->request_topic_name);
13591359
}
1360-
ret &= ucdr_serialize_bool(buffer, input->optional_reply_topic_name);
1360+
ret &= ucdr_serialize_bool(buffer, (input->optional_reply_topic_name)? 0x01 : 0x00);
13611361
if (input->optional_reply_topic_name == true)
13621362
{
13631363
ret &= ucdr_serialize_string(buffer, input->reply_topic_name);
@@ -1396,12 +1396,12 @@ bool uxr_serialize_OBJK_Replier_Binary(
13961396
ret &= ucdr_serialize_string(buffer, input->service_name);
13971397
ret &= ucdr_serialize_string(buffer, input->request_type);
13981398
ret &= ucdr_serialize_string(buffer, input->reply_type);
1399-
ret &= ucdr_serialize_bool(buffer, input->optional_request_topic_name);
1399+
ret &= ucdr_serialize_bool(buffer, (input->optional_request_topic_name)? 0x01 : 0x00);
14001400
if (input->optional_request_topic_name == true)
14011401
{
14021402
ret &= ucdr_serialize_string(buffer, input->request_topic_name);
14031403
}
1404-
ret &= ucdr_serialize_bool(buffer, input->optional_reply_topic_name);
1404+
ret &= ucdr_serialize_bool(buffer, (input->optional_reply_topic_name)? 0x01 : 0x00);
14051405
if (input->optional_reply_topic_name == true)
14061406
{
14071407
ret &= ucdr_serialize_string(buffer, input->reply_topic_name);
@@ -1549,8 +1549,8 @@ bool uxr_serialize_CreationMode(
15491549
const CreationMode* input)
15501550
{
15511551
bool ret = true;
1552-
ret &= ucdr_serialize_bool(buffer, input->reuse);
1553-
ret &= ucdr_serialize_bool(buffer, input->replace);
1552+
ret &= ucdr_serialize_bool(buffer, (input->reuse)? 0x01 : 0x00);
1553+
ret &= ucdr_serialize_bool(buffer, (input->replace)? 0x01 : 0x00);
15541554
return ret;
15551555
}
15561556

@@ -1737,13 +1737,13 @@ bool uxr_serialize_ObjectInfo(
17371737
const ObjectInfo* input)
17381738
{
17391739
bool ret = true;
1740-
ret &= ucdr_serialize_bool(buffer, input->optional_config);
1740+
ret &= ucdr_serialize_bool(buffer, (input->optional_config)? 0x01 : 0x00);
17411741
if (input->optional_config == true)
17421742
{
17431743
ret &= uxr_serialize_ObjectVariant(buffer, &input->config);
17441744
}
17451745

1746-
ret &= ucdr_serialize_bool(buffer, input->optional_activity);
1746+
ret &= ucdr_serialize_bool(buffer, (input->optional_activity)? 0x01 : 0x00);
17471747
if (input->optional_activity == true)
17481748
{
17491749
ret &= uxr_serialize_ActivityInfoVariant(buffer, &input->activity);
@@ -1823,13 +1823,13 @@ bool uxr_serialize_ReadSpecification(
18231823
bool ret = true;
18241824
ret &= ucdr_serialize_uint8_t(buffer, input->preferred_stream_id);
18251825
ret &= ucdr_serialize_uint8_t(buffer, input->data_format);
1826-
ret &= ucdr_serialize_bool(buffer, input->optional_content_filter_expression);
1826+
ret &= ucdr_serialize_bool(buffer, (input->optional_content_filter_expression)? 0x01 : 0x00);
18271827
if (input->optional_content_filter_expression == true)
18281828
{
18291829
ret &= ucdr_serialize_string(buffer, input->content_filter_expression);
18301830
}
18311831

1832-
ret &= ucdr_serialize_bool(buffer, input->optional_delivery_control);
1832+
ret &= ucdr_serialize_bool(buffer, (input->optional_delivery_control)? 0x01 : 0x00);
18331833
if (input->optional_delivery_control == true)
18341834
{
18351835
ret &= uxr_serialize_DataDeliveryControl(buffer, &input->delivery_control);

0 commit comments

Comments
 (0)