From af55b7899fb8d2e30de1b11f975750e9d1135bbd Mon Sep 17 00:00:00 2001 From: Pavlo Kleymonov Date: Mon, 13 Oct 2025 16:32:43 +0200 Subject: [PATCH] fix issue with non standard types: u_int32_t, u_int16_t --- .../client/usubscription/v3/USubscriptionUUriBuilder.h | 8 ++++---- src/client/usubscription/v3/USubscriptionUUriBuilder.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/up-cpp/client/usubscription/v3/USubscriptionUUriBuilder.h b/include/up-cpp/client/usubscription/v3/USubscriptionUUriBuilder.h index 28f718e38..40c41715f 100644 --- a/include/up-cpp/client/usubscription/v3/USubscriptionUUriBuilder.h +++ b/include/up-cpp/client/usubscription/v3/USubscriptionUUriBuilder.h @@ -36,13 +36,13 @@ struct USubscriptionUUriBuilder { USubscriptionUUriBuilder& setAuthorityName( const std::string& authority_name); - USubscriptionUUriBuilder& setUEntityId(u_int32_t ue_id); + USubscriptionUUriBuilder& setUEntityId(uint32_t ue_id); - USubscriptionUUriBuilder& setInstanceId(u_int16_t instance_id); + USubscriptionUUriBuilder& setInstanceId(uint16_t instance_id); - USubscriptionUUriBuilder& setServiceId(u_int16_t service_id); + USubscriptionUUriBuilder& setServiceId(uint16_t service_id); - USubscriptionUUriBuilder& setResourceId(u_int32_t resource_id); + USubscriptionUUriBuilder& setResourceId(uint32_t resource_id); /// @brief Get the URI with a specific resource ID. /// /// @param resource_id The resource ID to set in the URI. diff --git a/src/client/usubscription/v3/USubscriptionUUriBuilder.cpp b/src/client/usubscription/v3/USubscriptionUUriBuilder.cpp index 63cbd0725..ac6b9414d 100644 --- a/src/client/usubscription/v3/USubscriptionUUriBuilder.cpp +++ b/src/client/usubscription/v3/USubscriptionUUriBuilder.cpp @@ -43,14 +43,14 @@ USubscriptionUUriBuilder& USubscriptionUUriBuilder::setAuthorityName( } USubscriptionUUriBuilder& USubscriptionUUriBuilder::setUEntityId( - u_int32_t ue_id) { + uint32_t ue_id) { base_uri_.set_ue_id(ue_id); return *this; } constexpr uint16_t BITS_UINT_16 = 16; USubscriptionUUriBuilder& USubscriptionUUriBuilder::setInstanceId( - u_int16_t instance_id) { + uint16_t instance_id) { auto updated_ue_id = (SERVICE_ID_BITMASK & base_uri_.ue_id()) + (static_cast(instance_id) << BITS_UINT_16); base_uri_.set_ue_id(updated_ue_id); @@ -58,14 +58,14 @@ USubscriptionUUriBuilder& USubscriptionUUriBuilder::setInstanceId( } USubscriptionUUriBuilder& USubscriptionUUriBuilder::setServiceId( - u_int16_t service_id) { + uint16_t service_id) { auto updated_ue_id = (INSTANCE_ID_BITMASK & base_uri_.ue_id()) + service_id; base_uri_.set_ue_id(updated_ue_id); return *this; } USubscriptionUUriBuilder& USubscriptionUUriBuilder::setResourceId( - u_int32_t resource_id) { + uint32_t resource_id) { base_uri_.set_resource_id(resource_id); return *this; }