Skip to content

Commit cca0ed3

Browse files
authored
Merge pull request #1207 from eclipse-iceoryx/iox2-301-move-duration-files-to-iox2-bb
[#301] Move 'Duration' files to 'iox2/bb'
2 parents 871f153 + 77a3cc3 commit cca0ed3

File tree

67 files changed

+1370
-1576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1370
-1576
lines changed

component-tests/cxx/include/iox2/component-tests/common.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct RequestResponseServer {
4545
template <typename RequestType, typename ResponseType>
4646
auto create_server(iox2::Node<iox2::ServiceType::Ipc> const& node,
4747
char const* service_name,
48-
iox2::legacy::units::Duration const& refresh_interval)
48+
iox2::bb::Duration const& refresh_interval)
4949
-> iox2::container::Optional<RequestResponseServer<RequestType, ResponseType>> {
5050
auto exp_service_name = iox2::ServiceName::create(service_name);
5151
if (!exp_service_name) {

component-tests/cxx/src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ auto main() -> int {
7373
std::cout << "Waiting for clients to connect..." << std::endl;
7474
int const receive_interval_ms = 100;
7575
while (service.dynamic_config().number_of_publishers() == 0) {
76-
if (!node.wait(iox2::legacy::units::Duration::fromMilliseconds(receive_interval_ms))) {
76+
if (!node.wait(iox2::bb::Duration::from_millis(receive_interval_ms))) {
7777
std::cout << "Aborting.\n";
7878
return 1;
7979
}
8080
}
81-
while (node.wait(iox2::legacy::units::Duration::fromMilliseconds(receive_interval_ms)).has_value()) {
81+
while (node.wait(iox2::bb::Duration::from_millis(receive_interval_ms)).has_value()) {
8282
auto sample = subscriber.receive().expect("Failure in receive");
8383
if (sample) {
8484
auto it_test = std::find_if(begin(tests), end(tests), [&sample](Test const& test) -> auto {

component-tests/cxx/src/test_container_mutation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ auto prepare_response(ContainerMutationTestRequest const& request)
9797
}
9898

9999
auto ContainerMutationTest::run_test(iox2::Node<iox2::ServiceType::Ipc> const& node) -> bool {
100-
auto const refresh_interval = iox2::legacy::units::Duration::fromMilliseconds(100);
100+
auto const refresh_interval = iox2::bb::Duration::from_millis(100);
101101
auto opt_server = create_server<ContainerMutationTestRequest, ContainerMutationTestResponse>(
102102
node, "iox2-component-tests-container_mutation", refresh_interval);
103103
if (!opt_server) {

component-tests/cxx/src/test_containers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ auto check_request(ContainerTestRequest const& req) -> bool {
218218
}
219219

220220
auto ContainerTest::run_test(iox2::Node<iox2::ServiceType::Ipc> const& node) -> bool {
221-
auto const refresh_interval = iox2::legacy::units::Duration::fromMilliseconds(100);
221+
auto const refresh_interval = iox2::bb::Duration::from_millis(100);
222222
auto opt_server = create_server<ContainerTestRequest, ContainerTestResponse>(
223223
node, "iox2-component-tests-containers", refresh_interval);
224224
if (!opt_server) {

examples/cxx/blackboard/src/creator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
// SPDX-License-Identifier: Apache-2.0 OR MIT
1212

1313
#include "blackboard_complex_key.hpp"
14+
#include "iox2/bb/duration.hpp"
1415
#include "iox2/entry_handle_mut.hpp"
1516
#include "iox2/entry_value.hpp"
16-
#include "iox2/legacy/duration.hpp"
1717
#include "iox2/log.hpp"
1818
#include "iox2/node.hpp"
1919
#include "iox2/service_name.hpp"
@@ -22,7 +22,7 @@
2222
#include <iostream>
2323
#include <utility>
2424

25-
constexpr iox2::legacy::units::Duration CYCLE_TIME = iox2::legacy::units::Duration::fromSeconds(1);
25+
constexpr iox2::bb::Duration CYCLE_TIME = iox2::bb::Duration::from_secs(1);
2626

2727
auto main() -> int {
2828
using namespace iox2;

examples/cxx/blackboard/src/opener.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
// SPDX-License-Identifier: Apache-2.0 OR MIT
1212

1313
#include "blackboard_complex_key.hpp"
14-
#include "iox2/legacy/duration.hpp"
14+
#include "iox2/bb/duration.hpp"
1515
#include "iox2/log.hpp"
1616
#include "iox2/node.hpp"
1717
#include "iox2/service_name.hpp"
1818
#include "iox2/service_type.hpp"
1919

2020
#include <iostream>
2121

22-
constexpr iox2::legacy::units::Duration CYCLE_TIME = iox2::legacy::units::Duration::fromSeconds(1);
22+
constexpr iox2::bb::Duration CYCLE_TIME = iox2::bb::Duration::from_secs(1);
2323

2424
auto main() -> int {
2525
using namespace iox2;

examples/cxx/complex_data_types/src/complex_data_types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct ComplexDataType {
2828
iox2::legacy::vector<ComplexData, 404857> vec_of_complex_data; // NOLINT
2929
};
3030

31-
constexpr iox2::legacy::units::Duration CYCLE_TIME = iox2::legacy::units::Duration::fromSeconds(1);
31+
constexpr iox2::bb::Duration CYCLE_TIME = iox2::bb::Duration::from_secs(1);
3232

3333
auto main() -> int {
3434
using namespace iox2;

examples/cxx/cross_language_communication_basics/src/publisher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <iostream>
1818
#include <utility>
1919

20-
constexpr iox2::legacy::units::Duration CYCLE_TIME = iox2::legacy::units::Duration::fromSeconds(1);
20+
constexpr iox2::bb::Duration CYCLE_TIME = iox2::bb::Duration::from_secs(1);
2121

2222
auto main() -> int {
2323
using namespace iox2;

examples/cxx/cross_language_communication_basics/src/subscriber.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "iox2/iceoryx2.hpp"
1616
#include "message_data.hpp"
1717

18-
constexpr iox2::legacy::units::Duration CYCLE_TIME = iox2::legacy::units::Duration::fromSeconds(1);
18+
constexpr iox2::bb::Duration CYCLE_TIME = iox2::bb::Duration::from_secs(1);
1919

2020
auto main() -> int {
2121
using namespace iox2;

examples/cxx/cross_language_communication_complex_types/src/publisher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <iostream>
1818
#include <utility>
1919

20-
constexpr iox2::legacy::units::Duration CYCLE_TIME = iox2::legacy::units::Duration::fromSeconds(1);
20+
constexpr iox2::bb::Duration CYCLE_TIME = iox2::bb::Duration::from_secs(1);
2121

2222
auto main() -> int {
2323
using namespace iox2;

0 commit comments

Comments
 (0)