Skip to content

fix issue with non standard types: u_int32_t, u_int16_t #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PLeVasseur merged 1 commit into from
Nov 27, 2025
Merged

fix issue with non standard types: u_int32_t, u_int16_t #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/up-cpp/client/usubscription/v3/USubscriptionUUriBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions src/client/usubscription/v3/USubscriptionUUriBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,29 +43,29 @@ 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<uint32_t>(instance_id) << BITS_UINT_16);
base_uri_.set_ue_id(updated_ue_id);
return *this;
}

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;
}
Expand Down
Loading