Skip to content

Commit 843b205

Browse files
committed
iox-eclipse-iceoryx#1391 Port away from deprecated header
1 parent 2bbdc90 commit 843b205

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

iceoryx_examples/complexdata/topic_data.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define IOX_EXAMPLES_COMPLEXDATA_TOPIC_DATA_HPP
1919

2020
#include "iceoryx_dust/cxx/forward_list.hpp"
21-
#include "iceoryx_hoofs/cxx/list.hpp"
21+
#include "iox/list.hpp"
2222
#include "iox/optional.hpp"
2323
#include "iox/stack.hpp"
2424
#include "iox/string.hpp"

iceoryx_hoofs/test/moduletests/test_cxx_list.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
//
1616
// SPDX-License-Identifier: Apache-2.0
1717

18-
#include "iceoryx_hoofs/cxx/list.hpp"
1918
#include "iceoryx_hoofs/error_handling/error_handling.hpp"
2019
#include "iceoryx_hoofs/testing/ctor_and_assignment_operator_test_class.hpp"
2120
#include "iceoryx_hoofs/testing/fatal_failure.hpp"
2221
#include "iox/attributes.hpp"
22+
#include "iox/list.hpp"
2323
#include "iox/logging.hpp"
2424
#include "test.hpp"
2525

2626

2727
namespace
2828
{
2929
using namespace ::testing;
30-
using namespace iox::cxx;
30+
using namespace iox;
3131
using namespace iox::testing;
3232

3333
constexpr uint64_t TESTLISTCAPACITY{10U};

iceoryx_posh/include/iceoryx_posh/internal/roudi/introspection/process_introspection.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
#ifndef IOX_POSH_ROUDI_INTROSPECTION_PROCESS_INTROSPECTION_HPP
1818
#define IOX_POSH_ROUDI_INTROSPECTION_PROCESS_INTROSPECTION_HPP
1919

20-
#include "iceoryx_hoofs/cxx/list.hpp"
2120
#include "iceoryx_hoofs/internal/concurrent/periodic_task.hpp"
2221
#include "iceoryx_posh/iceoryx_posh_types.hpp"
2322
#include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp"
2423
#include "iceoryx_posh/roudi/introspection_types.hpp"
2524
#include "iox/function.hpp"
25+
#include "iox/list.hpp"
2626

2727
#include <mutex>
2828

@@ -94,7 +94,7 @@ class ProcessIntrospection
9494
void send() noexcept;
9595

9696
private:
97-
using ProcessList_t = cxx::list<ProcessIntrospectionData, MAX_PROCESS_NUMBER>;
97+
using ProcessList_t = iox::list<ProcessIntrospectionData, MAX_PROCESS_NUMBER>;
9898
ProcessList_t m_processList;
9999
bool m_processListNewData{true}; // true because we want to have a valid field, even with an empty list
100100

iceoryx_posh/include/iceoryx_posh/internal/roudi/process_manager.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#ifndef IOX_POSH_ROUDI_PROCESS_MANAGER_HPP
1818
#define IOX_POSH_ROUDI_PROCESS_MANAGER_HPP
1919

20-
#include "iceoryx_hoofs/cxx/list.hpp"
2120
#include "iceoryx_hoofs/posix_wrapper/posix_access_rights.hpp"
2221
#include "iceoryx_posh/internal/mepoo/segment_manager.hpp"
2322
#include "iceoryx_posh/internal/roudi/introspection/process_introspection.hpp"
@@ -27,6 +26,7 @@
2726
#include "iceoryx_posh/mepoo/chunk_header.hpp"
2827
#include "iceoryx_posh/version/compatibility_check_level.hpp"
2928
#include "iceoryx_posh/version/version_info.hpp"
29+
#include "iox/list.hpp"
3030

3131
#include <cstdint>
3232
#include <ctime>
@@ -46,7 +46,7 @@ class ProcessManagerInterface
4646
class ProcessManager : public ProcessManagerInterface
4747
{
4848
public:
49-
using ProcessList_t = cxx::list<Process, MAX_PROCESS_NUMBER>;
49+
using ProcessList_t = iox::list<Process, MAX_PROCESS_NUMBER>;
5050
using PortConfigInfo = iox::runtime::PortConfigInfo;
5151

5252
enum class TerminationFeedback

iceoryx_posh/test/integrationtests/test_publisher_subscriber_communication.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
// SPDX-License-Identifier: Apache-2.0
1717

1818
#include "iceoryx_dust/cxx/forward_list.hpp"
19-
#include "iceoryx_hoofs/cxx/list.hpp"
2019
#include "iceoryx_hoofs/testing/barrier.hpp"
2120
#include "iceoryx_hoofs/testing/watch_dog.hpp"
2221
#include "iceoryx_posh/popo/publisher.hpp"
2322
#include "iceoryx_posh/popo/subscriber.hpp"
2423
#include "iceoryx_posh/roudi_env/minimal_roudi_config.hpp"
2524
#include "iceoryx_posh/runtime/posh_runtime.hpp"
2625
#include "iceoryx_posh/testing/roudi_gtest.hpp"
26+
#include "iox/list.hpp"
2727
#include "iox/optional.hpp"
2828
#include "iox/stack.hpp"
2929
#include "iox/string.hpp"

0 commit comments

Comments
 (0)