diff --git a/MODULE.bazel b/MODULE.bazel index 81fe691d9b..5bbfafe7d5 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "org_eclipse_iceoryx", - version = "2.95.3", + version = "2.95.4", ) bazel_dep(name = "bazel_skylib", version = "1.7.1") diff --git a/VERSION b/VERSION index 228c711c24..b7b1a588d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.95.3 +2.95.4 diff --git a/cmake/package/package.cmake b/cmake/package/package.cmake index dce9023c4c..7249307404 100644 --- a/cmake/package/package.cmake +++ b/cmake/package/package.cmake @@ -14,7 +14,7 @@ # # SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") project(iceoryx_package VERSION ${IOX_VERSION_STRING}) diff --git a/doc/aspice_swe3_4/CMakeLists.txt b/doc/aspice_swe3_4/CMakeLists.txt index 096ec9a601..e58eda9c64 100644 --- a/doc/aspice_swe3_4/CMakeLists.txt +++ b/doc/aspice_swe3_4/CMakeLists.txt @@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") project(iceoryx_doc VERSION ${IOX_VERSION_STRING}) diff --git a/iceoryx_binding_c/CMakeLists.txt b/iceoryx_binding_c/CMakeLists.txt index efdf016a1f..73b1579502 100644 --- a/iceoryx_binding_c/CMakeLists.txt +++ b/iceoryx_binding_c/CMakeLists.txt @@ -16,7 +16,7 @@ # SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") project(iceoryx_binding_c VERSION ${IOX_VERSION_STRING}) diff --git a/iceoryx_binding_c/cmake/iceoryx_binding_cConfigVersion.cmake b/iceoryx_binding_c/cmake/iceoryx_binding_cConfigVersion.cmake index b620bba7dd..be92292c8f 100644 --- a/iceoryx_binding_c/cmake/iceoryx_binding_cConfigVersion.cmake +++ b/iceoryx_binding_c/cmake/iceoryx_binding_cConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/iceoryx_binding_c/package.xml b/iceoryx_binding_c/package.xml index e2ced7bd62..5068a01d83 100644 --- a/iceoryx_binding_c/package.xml +++ b/iceoryx_binding_c/package.xml @@ -2,7 +2,7 @@ iceoryx_binding_c - 2.95.3 + 2.95.4 Eclipse iceoryx inter-process-communication (IPC) middleware C-Language Binding Eclipse Foundation, Inc. Apache 2.0 diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt index 86eca3c86d..ea81cb4e82 100644 --- a/iceoryx_hoofs/CMakeLists.txt +++ b/iceoryx_hoofs/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") project(iceoryx_hoofs VERSION ${IOX_VERSION_STRING}) diff --git a/iceoryx_hoofs/cmake/iceoryx_hoofsConfigVersion.cmake b/iceoryx_hoofs/cmake/iceoryx_hoofsConfigVersion.cmake index b620bba7dd..be92292c8f 100644 --- a/iceoryx_hoofs/cmake/iceoryx_hoofsConfigVersion.cmake +++ b/iceoryx_hoofs/cmake/iceoryx_hoofsConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/iceoryx_hoofs/package.xml b/iceoryx_hoofs/package.xml index 81539e9b0f..951509d946 100644 --- a/iceoryx_hoofs/package.xml +++ b/iceoryx_hoofs/package.xml @@ -2,7 +2,7 @@ iceoryx_hoofs - 2.95.3 + 2.95.4 Eclipse iceoryx inter-process-communication (IPC) middleware basic building blocks Eclipse Foundation, Inc. Apache 2.0 diff --git a/iceoryx_hoofs/test/moduletests/test_time_unit_duration.cpp b/iceoryx_hoofs/test/moduletests/test_time_unit_duration.cpp index 8c5f842d2b..9a2aa28d2b 100644 --- a/iceoryx_hoofs/test/moduletests/test_time_unit_duration.cpp +++ b/iceoryx_hoofs/test/moduletests/test_time_unit_duration.cpp @@ -20,6 +20,7 @@ #include "iox/duration.hpp" #include "iox/posix_call.hpp" #include "test.hpp" +#include #include #include #include @@ -102,7 +103,7 @@ TEST(Duration_test, ConstructDurationWithNanosecondsLessThanOneSecond) ::testing::Test::RecordProperty("TEST_ID", "7de47e88-c4b3-4655-bdeb-3c51f3b34d3e"); constexpr uint64_t SECONDS{37U}; constexpr uint64_t NANOSECONDS{73U}; - constexpr uint64_t EXPECTED_DURATION_IN_NANOSECONDS{SECONDS * NANOSECS_PER_SECOND + NANOSECONDS}; + constexpr uint64_t EXPECTED_DURATION_IN_NANOSECONDS{(SECONDS * NANOSECS_PER_SECOND) + NANOSECONDS}; auto sut = createDuration(SECONDS, NANOSECONDS); @@ -127,7 +128,7 @@ TEST(Duration_test, ConstructDurationWithNanosecondsMoreThanOneSecond) constexpr uint64_t SECONDS{37U}; constexpr uint64_t NANOSECONDS{42U}; constexpr uint64_t MORE_THAN_ONE_SECOND_NANOSECONDS{NANOSECS_PER_SECOND + NANOSECONDS}; - constexpr uint64_t EXPECTED_DURATION_IN_NANOSECONDS{(SECONDS + 1U) * NANOSECS_PER_SECOND + NANOSECONDS}; + constexpr uint64_t EXPECTED_DURATION_IN_NANOSECONDS{((SECONDS + 1U) * NANOSECS_PER_SECOND) + NANOSECONDS}; auto sut = createDuration(SECONDS, MORE_THAN_ONE_SECOND_NANOSECONDS); @@ -139,9 +140,10 @@ TEST(Duration_test, ConstructDurationWithNanosecondsMaxValue) ::testing::Test::RecordProperty("TEST_ID", "fe8152ca-cd14-4d99-aa68-0f56ab3007de"); constexpr uint64_t SECONDS{37U}; constexpr uint64_t MAX_NANOSECONDS_FOR_CTOR{std::numeric_limits::max()}; - constexpr uint64_t EXPECTED_SECONDS = SECONDS + MAX_NANOSECONDS_FOR_CTOR / NANOSECS_PER_SECOND; + constexpr uint64_t EXPECTED_SECONDS = SECONDS + (MAX_NANOSECONDS_FOR_CTOR / NANOSECS_PER_SECOND); constexpr uint64_t REMAINING_NANOSECONDS = MAX_NANOSECONDS_FOR_CTOR % NANOSECS_PER_SECOND; - constexpr uint64_t EXPECTED_DURATION_IN_NANOSECONDS{(EXPECTED_SECONDS)*NANOSECS_PER_SECOND + REMAINING_NANOSECONDS}; + constexpr uint64_t EXPECTED_DURATION_IN_NANOSECONDS{((EXPECTED_SECONDS)*NANOSECS_PER_SECOND) + + REMAINING_NANOSECONDS}; auto sut = createDuration(SECONDS, MAX_NANOSECONDS_FOR_CTOR); @@ -1156,7 +1158,7 @@ TEST(Duration_test, ConvertTimevalFromDurationWithLessThanOneSecond) constexpr int64_t MICROSECONDS{222}; constexpr int64_t ROUND_OFF_NANOSECONDS{666}; - auto duration = createDuration(SECONDS, MICROSECONDS * NANOSECS_PER_MICROSECOND + ROUND_OFF_NANOSECONDS); + auto duration = createDuration(SECONDS, (MICROSECONDS * NANOSECS_PER_MICROSECOND) + ROUND_OFF_NANOSECONDS); const timeval sut = duration.timeval(); @@ -1171,7 +1173,7 @@ TEST(Duration_test, ConvertTimevalFromDurationWithMoreThanOneSecond) constexpr int64_t MICROSECONDS{222}; constexpr int64_t ROUND_OFF_NANOSECONDS{666}; - auto duration = createDuration(SECONDS, MICROSECONDS * NANOSECS_PER_MICROSECOND + ROUND_OFF_NANOSECONDS); + auto duration = createDuration(SECONDS, (MICROSECONDS * NANOSECS_PER_MICROSECOND) + ROUND_OFF_NANOSECONDS); const timeval sut = duration.timeval(); @@ -1428,7 +1430,7 @@ TEST(Duration_test, AddDurationWithOneZeroDurationsResultsInNoneZeroDuration) TEST(Duration_test, AddDurationWithSumOfDurationsLessThanOneSecondsResultsInLessThanOneSecond) { ::testing::Test::RecordProperty("TEST_ID", "b3704e3c-588a-4c1f-a09b-9244c210d853"); - constexpr Duration EXPECTED_DURATION = createDuration(0U, 100 * NANOSECS_PER_MICROSECOND + 10U); + constexpr Duration EXPECTED_DURATION = createDuration(0U, (100 * NANOSECS_PER_MICROSECOND) + 10U); const auto duration1 = 100_us; const auto duration2 = 10_ns; @@ -1981,7 +1983,7 @@ TEST(Duration_test, MultiplyDurationWithNegativMultiplicatorResultsInZero) TEST(Duration_test, MultiplyDurationLessThanOneSecondResultsInMoreNanosecondsThan64BitCanRepresent) { ::testing::Test::RecordProperty("TEST_ID", "2f1bbcb3-3692-4895-a36f-38eed7775b6f"); - constexpr uint64_t MULTIPLICATOR{(1ULL << 32U) * 42U + 73U}; + constexpr uint64_t MULTIPLICATOR{((1ULL << 32U) * 42U) + 73U}; constexpr Duration DURATION = 473_ms + 578_us + 511_ns; const auto EXPECTED_RESULT = createDuration(85428177141U, 573034055U); diff --git a/iceoryx_integrationtest/package.xml b/iceoryx_integrationtest/package.xml index 08e5772ec0..1bab5f58c6 100644 --- a/iceoryx_integrationtest/package.xml +++ b/iceoryx_integrationtest/package.xml @@ -2,7 +2,7 @@ iceoryx_integrationtest - 2.95.3 + 2.95.4 iceoryx Software Integrationtest Eclipse Foundation, Inc. Apache 2.0 diff --git a/iceoryx_platform/CMakeLists.txt b/iceoryx_platform/CMakeLists.txt index 16ca2f2da8..bc612b78d9 100644 --- a/iceoryx_platform/CMakeLists.txt +++ b/iceoryx_platform/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") project(iceoryx_platform VERSION ${IOX_VERSION_STRING}) if(UNIX AND NOT APPLE) diff --git a/iceoryx_platform/cmake/iceoryx_platformConfigVersion.cmake b/iceoryx_platform/cmake/iceoryx_platformConfigVersion.cmake index b620bba7dd..be92292c8f 100644 --- a/iceoryx_platform/cmake/iceoryx_platformConfigVersion.cmake +++ b/iceoryx_platform/cmake/iceoryx_platformConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/iceoryx_platform/package.xml b/iceoryx_platform/package.xml index 3f44f3b06e..f0c40923ac 100644 --- a/iceoryx_platform/package.xml +++ b/iceoryx_platform/package.xml @@ -2,7 +2,7 @@ iceoryx_platform - 2.95.3 + 2.95.4 Eclipse iceoryx inter-process-communication (IPC) middleware platform Eclipse Foundation, Inc. Apache 2.0 diff --git a/iceoryx_posh/CMakeLists.txt b/iceoryx_posh/CMakeLists.txt index 3d2cbdc64d..985ddc5b83 100644 --- a/iceoryx_posh/CMakeLists.txt +++ b/iceoryx_posh/CMakeLists.txt @@ -16,7 +16,7 @@ # SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") project(iceoryx_posh VERSION ${IOX_VERSION_STRING}) diff --git a/iceoryx_posh/cmake/iceoryx_poshConfigVersion.cmake b/iceoryx_posh/cmake/iceoryx_poshConfigVersion.cmake index b620bba7dd..be92292c8f 100644 --- a/iceoryx_posh/cmake/iceoryx_poshConfigVersion.cmake +++ b/iceoryx_posh/cmake/iceoryx_poshConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/iceoryx_posh/package.xml b/iceoryx_posh/package.xml index 632de0bd99..4958e81477 100644 --- a/iceoryx_posh/package.xml +++ b/iceoryx_posh/package.xml @@ -2,7 +2,7 @@ iceoryx_posh - 2.95.3 + 2.95.4 Eclipse iceoryx inter-process-communication (IPC) middleware Posix Shared Memory Library and middleware daemon (RouDi) Eclipse Foundation, Inc. Apache 2.0 diff --git a/tools/introspection/CMakeLists.txt b/tools/introspection/CMakeLists.txt index 113d4d906b..997d7691d3 100644 --- a/tools/introspection/CMakeLists.txt +++ b/tools/introspection/CMakeLists.txt @@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.16) -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") project(iceoryx_introspection VERSION ${IOX_VERSION_STRING}) diff --git a/tools/introspection/cmake/iceoryx_introspectionConfigVersion.cmake b/tools/introspection/cmake/iceoryx_introspectionConfigVersion.cmake index b620bba7dd..be92292c8f 100644 --- a/tools/introspection/cmake/iceoryx_introspectionConfigVersion.cmake +++ b/tools/introspection/cmake/iceoryx_introspectionConfigVersion.cmake @@ -18,7 +18,7 @@ ########## dummyConfig.cmake to be able to use find_package with a specific version with the source tree ########## # -set(IOX_VERSION_STRING "2.95.3") +set(IOX_VERSION_STRING "2.95.4") set(PACKAGE_VERSION ${IOX_VERSION_STRING}) if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) diff --git a/tools/introspection/package.xml b/tools/introspection/package.xml index 42f315407c..0187c2b2ea 100644 --- a/tools/introspection/package.xml +++ b/tools/introspection/package.xml @@ -2,7 +2,7 @@ iceoryx_introspection - 2.95.3 + 2.95.4 Eclipse iceoryx inter-process-communication (IPC) middleware introspection client Eclipse Foundation, Inc. Apache 2.0