From 4dd6154ef66bec91fadbb4c687615371cc6496f8 Mon Sep 17 00:00:00 2001 From: tftzee <49162693+rex-schilasky@users.noreply.github.com> Date: Thu, 8 Feb 2024 16:11:26 +0100 Subject: [PATCH] clang tidy include cleaner ecal/pb deprecated API removed --- CMakeLists.txt | 5 - ecal/core/CMakeLists.txt | 3 +- ecal/core/include/ecal/ecal_config.h | 3 +- ecal/core/include/ecal/ecal_monitoring.h | 1 + ecal/core/include/ecal/ecal_publisher.h | 5 +- ecal/core/include/ecal/ecal_subscriber.h | 5 +- ecal/core/include/ecal/ecal_util.h | 4 +- .../ecal/msg/protobuf/dynamic_publisher.h | 8 +- .../ecal/msg/protobuf/dynamic_subscriber.h | 3 + .../ecal/msg/protobuf/ecal_proto_hlp.h | 1 + .../include/ecal/msg/protobuf/publisher.h | 3 +- ecal/core/include/ecal/msg/protobuf/server.h | 3 +- .../include/ecal/msg/protobuf/subscriber.h | 3 +- ecal/core/include/ecal/msg/string/publisher.h | 1 + .../core/include/ecal/msg/string/subscriber.h | 1 + ecal/core/include/ecal/types/monitoring.h | 1 + ecal/core/src/config/ecal_config.cpp | 3 + ecal/core/src/config/ecal_config_reader.cpp | 5 +- ecal/core/src/ecal.cpp | 5 +- ecal/core/src/ecal_descgate.cpp | 7 +- ecal/core/src/ecal_descgate.h | 11 +- ecal/core/src/ecal_event.cpp | 3 + ecal/core/src/ecal_global_accessors.cpp | 4 +- ecal/core/src/ecal_globals.cpp | 3 + ecal/core/src/ecal_globals.h | 2 + ecal/core/src/ecal_process.cpp | 6 +- ecal/core/src/ecal_process_stub.cpp | 3 +- ecal/core/src/ecal_util.cpp | 5 + ecal/core/src/ecalc.cpp | 5 + ecal/core/src/io/mtx/ecal_named_mutex.cpp | 3 + .../src/io/mtx/linux/ecal_named_mutex_impl.h | 2 + .../ecal_named_mutex_robust_clocklock_impl.h | 2 + ecal/core/src/io/shm/ecal_memfile.cpp | 3 +- ecal/core/src/io/shm/ecal_memfile.h | 3 +- ecal/core/src/io/shm/ecal_memfile_db.cpp | 3 + ecal/core/src/io/shm/ecal_memfile_db.h | 1 + ecal/core/src/io/shm/ecal_memfile_info.h | 3 +- ecal/core/src/io/shm/ecal_memfile_naming.cpp | 2 + ecal/core/src/io/shm/ecal_memfile_os.h | 1 + ecal/core/src/io/shm/ecal_memfile_pool.cpp | 8 + ecal/core/src/io/shm/ecal_memfile_pool.h | 3 + ecal/core/src/io/shm/ecal_memfile_sync.cpp | 5 + ecal/core/src/io/shm/ecal_memfile_sync.h | 2 + .../core/src/io/shm/linux/ecal_memfile_os.cpp | 9 +- .../src/io/udp/ecal_udp_configurations.cpp | 1 + .../src/io/udp/ecal_udp_sample_receiver.cpp | 4 + .../src/io/udp/ecal_udp_sample_receiver.h | 2 + .../src/io/udp/ecal_udp_sample_sender.cpp | 6 + ecal/core/src/io/udp/ecal_udp_sample_sender.h | 1 + ecal/core/src/io/udp/ecal_udp_topic2mcast.h | 6 +- .../io/udp/fragmentation/rcv_fragments.cpp | 3 + .../src/io/udp/fragmentation/rcv_fragments.h | 1 + .../io/udp/fragmentation/snd_fragments.cpp | 3 + .../src/io/udp/fragmentation/snd_fragments.h | 1 + .../src/io/udp/sendreceive/udp_receiver.cpp | 3 + .../src/io/udp/sendreceive/udp_receiver.h | 1 + .../io/udp/sendreceive/udp_receiver_asio.cpp | 2 + .../io/udp/sendreceive/udp_receiver_asio.h | 1 + .../src/io/udp/sendreceive/udp_sender.cpp | 2 + ecal/core/src/io/udp/sendreceive/udp_sender.h | 1 + ecal/core/src/logging/ecal_log.cpp | 1 + ecal/core/src/logging/ecal_log_impl.h | 4 +- ecal/core/src/pubsub/ecal_pubgate.cpp | 7 +- ecal/core/src/pubsub/ecal_pubgate.h | 3 +- ecal/core/src/pubsub/ecal_publisher.cpp | 6 +- ecal/core/src/pubsub/ecal_subgate.cpp | 8 + ecal/core/src/pubsub/ecal_subgate.h | 3 +- ecal/core/src/pubsub/ecal_subscriber.cpp | 6 +- ecal/core/src/readwrite/ecal_reader.cpp | 5 + ecal/core/src/readwrite/ecal_reader.h | 4 + ecal/core/src/readwrite/ecal_writer.cpp | 6 + ecal/core/src/readwrite/ecal_writer.h | 3 + .../src/readwrite/shm/ecal_reader_shm.cpp | 3 + ecal/core/src/readwrite/shm/ecal_reader_shm.h | 2 + .../src/readwrite/shm/ecal_writer_shm.cpp | 2 + ecal/core/src/readwrite/shm/ecal_writer_shm.h | 2 + .../src/readwrite/udp/ecal_reader_udp_mc.cpp | 5 + .../src/readwrite/udp/ecal_reader_udp_mc.h | 1 + .../src/readwrite/udp/ecal_writer_udp_mc.cpp | 5 +- .../src/readwrite/udp/ecal_writer_udp_mc.h | 1 + .../ecal_registration_provider.cpp | 6 + .../ecal_registration_receiver.cpp | 7 +- .../registration/ecal_registration_receiver.h | 1 + .../ecal_registration_receiver_shm.cpp | 3 + .../ecal_registration_receiver_shm.h | 1 + .../shm/ecal_memfile_broadcast.cpp | 6 +- .../registration/shm/ecal_memfile_broadcast.h | 7 +- .../shm/ecal_memfile_broadcast_reader.cpp | 8 +- .../shm/ecal_memfile_broadcast_reader.h | 5 +- .../shm/ecal_memfile_broadcast_writer.cpp | 5 +- .../shm/ecal_memfile_broadcast_writer.h | 1 + .../shm/relocatable_circular_queue.h | 7 +- .../serialization/ecal_serialize_common.cpp | 8 +- .../src/serialization/ecal_serialize_common.h | 2 + .../serialization/ecal_serialize_logging.cpp | 4 + .../ecal_serialize_monitoring.cpp | 2 + .../serialization/ecal_serialize_monitoring.h | 1 + .../ecal_serialize_sample_payload.cpp | 3 + .../ecal_serialize_sample_payload.h | 1 + .../ecal_serialize_sample_registration.cpp | 4 + .../ecal_serialize_sample_registration.h | 1 + .../serialization/ecal_serialize_service.cpp | 3 + .../serialization/ecal_serialize_service.h | 1 + .../ecal_struct_sample_payload.h | 2 + .../ecal_struct_sample_registration.h | 1 + .../src/serialization/ecal_struct_service.h | 1 + ecal/core/src/service/ecal_clientgate.cpp | 5 + ecal/core/src/service/ecal_clientgate.h | 4 +- ecal/core/src/service/ecal_service_client.cpp | 1 + .../src/service/ecal_service_client_impl.cpp | 4 + ecal/core/src/service/ecal_service_server.cpp | 1 + .../src/service/ecal_service_server_impl.cpp | 3 + .../src/service/ecal_service_server_impl.h | 2 + .../ecal_service_singleton_manager.cpp | 5 + .../service/ecal_service_singleton_manager.h | 7 +- ecal/core/src/service/ecal_servicegate.cpp | 3 + ecal/core/src/time/ecal_time.cpp | 1 + ecal/core/src/time/ecal_timegate.cpp | 2 + ecal/core/src/time/ecal_timegate.h | 1 + ecal/core/src/time/ecal_timer.cpp | 3 +- ecal/core/src/util/advanced_tclap_output.cpp | 6 + ecal/core/src/util/ecal_expmap.h | 3 +- ecal/pb/CMakeLists.txt | 89 ----------- ecal/pb/include/ecal/pb/ecal.pb.h | 29 ---- ecal/pb/include/ecal/pb/host.pb.h | 29 ---- ecal/pb/include/ecal/pb/layer.pb.h | 29 ---- ecal/pb/include/ecal/pb/mma/mma.pb.h | 29 ---- ecal/pb/include/ecal/pb/monitoring.pb.h | 29 ---- ecal/pb/include/ecal/pb/play/service.pb.h | 29 ---- ecal/pb/include/ecal/pb/play/state.pb.h | 29 ---- ecal/pb/include/ecal/pb/process.pb.h | 29 ---- .../include/ecal/pb/rec/client_service.pb.h | 29 ---- ecal/pb/include/ecal/pb/rec/client_state.pb.h | 29 ---- .../pb/include/ecal/pb/rec/server_config.pb.h | 29 ---- .../include/ecal/pb/rec/server_service.pb.h | 29 ---- ecal/pb/include/ecal/pb/rec/server_state.pb.h | 29 ---- ecal/pb/include/ecal/pb/service.pb.h | 29 ---- ecal/pb/include/ecal/pb/sim_time.pb.h | 29 ---- .../include/ecal/pb/sys/client_service.pb.h | 29 ---- ecal/pb/include/ecal/pb/sys/service.pb.h | 29 ---- ecal/pb/include/ecal/pb/sys/state.pb.h | 29 ---- ecal/pb/include/ecal/pb/topic.pb.h | 29 ---- ecal/pb/src/pb.cpp | 1 - ecal/service/CMakeLists.txt | 4 +- .../include/ecal/service/client_manager.h | 6 +- .../include/ecal/service/client_session.h | 3 + .../include/ecal/service/server.h | 2 + .../include/ecal/service/server_manager.h | 5 +- .../ecal_service/src/client_manager.cpp | 6 + .../ecal_service/src/client_session.cpp | 4 + .../src/client_session_impl_base.h | 4 + .../src/client_session_impl_v0.cpp | 142 +++++++++--------- .../ecal_service/src/client_session_impl_v0.h | 3 + .../src/client_session_impl_v1.cpp | 90 +++++------ .../ecal_service/src/client_session_impl_v1.h | 4 + ecal/service/ecal_service/src/log_helpers.h | 1 + ecal/service/ecal_service/src/protocol_v0.cpp | 5 + ecal/service/ecal_service/src/protocol_v0.h | 5 +- ecal/service/ecal_service/src/protocol_v1.cpp | 6 + ecal/service/ecal_service/src/server.cpp | 2 + ecal/service/ecal_service/src/server_impl.cpp | 3 + ecal/service/ecal_service/src/server_impl.h | 6 +- .../ecal_service/src/server_manager.cpp | 5 + .../src/server_session_impl_base.h | 2 +- .../src/server_session_impl_v0.cpp | 6 + .../ecal_service/src/server_session_impl_v0.h | 4 + .../src/server_session_impl_v1.cpp | 8 +- .../ecal_service/src/server_session_impl_v1.h | 4 + .../test/src/ecal_tcp_service_test.cpp | 5 +- 169 files changed, 560 insertions(+), 835 deletions(-) delete mode 100644 ecal/pb/CMakeLists.txt delete mode 100644 ecal/pb/include/ecal/pb/ecal.pb.h delete mode 100644 ecal/pb/include/ecal/pb/host.pb.h delete mode 100644 ecal/pb/include/ecal/pb/layer.pb.h delete mode 100644 ecal/pb/include/ecal/pb/mma/mma.pb.h delete mode 100644 ecal/pb/include/ecal/pb/monitoring.pb.h delete mode 100644 ecal/pb/include/ecal/pb/play/service.pb.h delete mode 100644 ecal/pb/include/ecal/pb/play/state.pb.h delete mode 100644 ecal/pb/include/ecal/pb/process.pb.h delete mode 100644 ecal/pb/include/ecal/pb/rec/client_service.pb.h delete mode 100644 ecal/pb/include/ecal/pb/rec/client_state.pb.h delete mode 100644 ecal/pb/include/ecal/pb/rec/server_config.pb.h delete mode 100644 ecal/pb/include/ecal/pb/rec/server_service.pb.h delete mode 100644 ecal/pb/include/ecal/pb/rec/server_state.pb.h delete mode 100644 ecal/pb/include/ecal/pb/service.pb.h delete mode 100644 ecal/pb/include/ecal/pb/sim_time.pb.h delete mode 100644 ecal/pb/include/ecal/pb/sys/client_service.pb.h delete mode 100644 ecal/pb/include/ecal/pb/sys/service.pb.h delete mode 100644 ecal/pb/include/ecal/pb/sys/state.pb.h delete mode 100644 ecal/pb/include/ecal/pb/topic.pb.h delete mode 100644 ecal/pb/src/pb.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fa2e35a5b..64377b784e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -325,11 +325,6 @@ endif() # -------------------------------------------------------- add_subdirectory(contrib/ecalproto) -# -------------------------------------------------------- -# old ecal core protobuf interface (for compatibility) -# -------------------------------------------------------- -add_subdirectory(ecal/pb) - # -------------------------------------------------------- # ecal core protobuf interface # -------------------------------------------------------- diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt index 0111aa9df3..69568cc257 100644 --- a/ecal/core/CMakeLists.txt +++ b/ecal/core/CMakeLists.txt @@ -23,6 +23,7 @@ find_package(asio REQUIRED) find_package(tclap REQUIRED) find_package(simpleini REQUIRED) find_package(tcp_pubsub REQUIRED) + if (ECAL_CORE_NPCAP_SUPPORT) find_package(udpcap REQUIRED) endif() @@ -653,8 +654,6 @@ target_include_directories(${PROJECT_NAME} ) target_link_libraries(${PROJECT_NAME} -# PUBLIC -# eCAL::proto PRIVATE $<$,$>>:dl> $<$,$>,$>>:rt> diff --git a/ecal/core/include/ecal/ecal_config.h b/ecal/core/include/ecal/ecal_config.h index c817d79d60..78ea92e557 100644 --- a/ecal/core/include/ecal/ecal_config.h +++ b/ecal/core/include/ecal/ecal_config.h @@ -19,9 +19,10 @@ #pragma once +#include +#include #include #include -#include #include diff --git a/ecal/core/include/ecal/ecal_monitoring.h b/ecal/core/include/ecal/ecal_monitoring.h index 972f109bfd..b97c7015bd 100644 --- a/ecal/core/include/ecal/ecal_monitoring.h +++ b/ecal/core/include/ecal/ecal_monitoring.h @@ -26,6 +26,7 @@ #include #include +#include namespace eCAL { diff --git a/ecal/core/include/ecal/ecal_publisher.h b/ecal/core/include/ecal/ecal_publisher.h index aeaf8c9854..7d6c1e3760 100644 --- a/ecal/core/include/ecal/ecal_publisher.h +++ b/ecal/core/include/ecal/ecal_publisher.h @@ -24,9 +24,10 @@ #pragma once -#include -#include +#include #include +#include +#include #include #include diff --git a/ecal/core/include/ecal/ecal_subscriber.h b/ecal/core/include/ecal/ecal_subscriber.h index 0d3a690f65..32741ca1d7 100644 --- a/ecal/core/include/ecal/ecal_subscriber.h +++ b/ecal/core/include/ecal/ecal_subscriber.h @@ -24,9 +24,10 @@ #pragma once -#include -#include +#include #include +#include +#include #include #include diff --git a/ecal/core/include/ecal/ecal_util.h b/ecal/core/include/ecal/ecal_util.h index 39bb0a8c10..3a05290415 100644 --- a/ecal/core/include/ecal/ecal_util.h +++ b/ecal/core/include/ecal/ecal_util.h @@ -30,12 +30,12 @@ #include #include -#include #include #include +#include +#include #include - namespace eCAL { namespace Util diff --git a/ecal/core/include/ecal/msg/protobuf/dynamic_publisher.h b/ecal/core/include/ecal/msg/protobuf/dynamic_publisher.h index 19ac4ffda8..5652f5126d 100644 --- a/ecal/core/include/ecal/msg/protobuf/dynamic_publisher.h +++ b/ecal/core/include/ecal/msg/protobuf/dynamic_publisher.h @@ -24,11 +24,17 @@ #pragma once +#include +#include +#include +#include #include #include -#include #include +#include +#include +#include #ifdef _MSC_VER #pragma warning(push, 0) // disable proto warnings diff --git a/ecal/core/include/ecal/msg/protobuf/dynamic_subscriber.h b/ecal/core/include/ecal/msg/protobuf/dynamic_subscriber.h index 4d78d36619..032536e89a 100644 --- a/ecal/core/include/ecal/msg/protobuf/dynamic_subscriber.h +++ b/ecal/core/include/ecal/msg/protobuf/dynamic_subscriber.h @@ -30,8 +30,11 @@ #include #include +#include #include +#include #include +#include #ifdef _MSC_VER #pragma warning(push, 0) // disable proto warnings diff --git a/ecal/core/include/ecal/msg/protobuf/ecal_proto_hlp.h b/ecal/core/include/ecal/msg/protobuf/ecal_proto_hlp.h index b60b8af789..bb7e982838 100644 --- a/ecal/core/include/ecal/msg/protobuf/ecal_proto_hlp.h +++ b/ecal/core/include/ecal/msg/protobuf/ecal_proto_hlp.h @@ -25,6 +25,7 @@ #pragma once #include +#include #include #include diff --git a/ecal/core/include/ecal/msg/protobuf/publisher.h b/ecal/core/include/ecal/msg/protobuf/publisher.h index e60f580ba2..894fc19738 100644 --- a/ecal/core/include/ecal/msg/protobuf/publisher.h +++ b/ecal/core/include/ecal/msg/protobuf/publisher.h @@ -24,9 +24,10 @@ #pragma once +#include #include -#include #include +#include // protobuf includes #ifdef _MSC_VER diff --git a/ecal/core/include/ecal/msg/protobuf/server.h b/ecal/core/include/ecal/msg/protobuf/server.h index 5fa84c1714..2f6cb8cc43 100644 --- a/ecal/core/include/ecal/msg/protobuf/server.h +++ b/ecal/core/include/ecal/msg/protobuf/server.h @@ -25,8 +25,9 @@ #pragma once #include -#include #include +#include +#include // protobuf includes #ifdef _MSC_VER diff --git a/ecal/core/include/ecal/msg/protobuf/subscriber.h b/ecal/core/include/ecal/msg/protobuf/subscriber.h index 4b30683884..b176805a47 100644 --- a/ecal/core/include/ecal/msg/protobuf/subscriber.h +++ b/ecal/core/include/ecal/msg/protobuf/subscriber.h @@ -24,8 +24,9 @@ #pragma once -#include +#include #include +#include // protobuf includes #ifdef _MSC_VER diff --git a/ecal/core/include/ecal/msg/string/publisher.h b/ecal/core/include/ecal/msg/string/publisher.h index 4465b68b52..8555c49cfe 100644 --- a/ecal/core/include/ecal/msg/string/publisher.h +++ b/ecal/core/include/ecal/msg/string/publisher.h @@ -24,6 +24,7 @@ #pragma once +#include #include #include diff --git a/ecal/core/include/ecal/msg/string/subscriber.h b/ecal/core/include/ecal/msg/string/subscriber.h index 2ccb5761a7..949acf37b0 100644 --- a/ecal/core/include/ecal/msg/string/subscriber.h +++ b/ecal/core/include/ecal/msg/string/subscriber.h @@ -24,6 +24,7 @@ #pragma once +#include #include #include diff --git a/ecal/core/include/ecal/types/monitoring.h b/ecal/core/include/ecal/types/monitoring.h index 6b206d6647..7007560e4b 100644 --- a/ecal/core/include/ecal/types/monitoring.h +++ b/ecal/core/include/ecal/types/monitoring.h @@ -29,6 +29,7 @@ #include #include #include +#include namespace eCAL { diff --git a/ecal/core/src/config/ecal_config.cpp b/ecal/core/src/config/ecal_config.cpp index 1ec91b1890..a9343bcce3 100644 --- a/ecal/core/src/config/ecal_config.cpp +++ b/ecal/core/src/config/ecal_config.cpp @@ -17,8 +17,11 @@ * ========================= eCAL LICENSE ================================= */ +#include #include #include +#include +#include #include "ecal_config_reader.h" #include "ecal_config_reader_hlp.h" diff --git a/ecal/core/src/config/ecal_config_reader.cpp b/ecal/core/src/config/ecal_config_reader.cpp index d960ee4ce0..e5990982d3 100644 --- a/ecal/core/src/config/ecal_config_reader.cpp +++ b/ecal/core/src/config/ecal_config_reader.cpp @@ -21,8 +21,9 @@ * @brief Global config class **/ -#include +#include #include +#include #include "ecal_def.h" #include "ecal_config_reader.h" @@ -35,6 +36,8 @@ #include #include +#include +#include #ifdef ECAL_OS_LINUX #include diff --git a/ecal/core/src/ecal.cpp b/ecal/core/src/ecal.cpp index 29ab150036..5309654bf3 100644 --- a/ecal/core/src/ecal.cpp +++ b/ecal/core/src/ecal.cpp @@ -22,8 +22,11 @@ **/ #include "ecal_def.h" -#include "ecal_globals.h" #include "ecal_event.h" +#include "ecal_globals.h" +#include +#include +#include #if ECAL_CORE_COMMAND_LINE #include "util/advanced_tclap_output.h" diff --git a/ecal/core/src/ecal_descgate.cpp b/ecal/core/src/ecal_descgate.cpp index c805c545fd..70594440b7 100644 --- a/ecal/core/src/ecal_descgate.cpp +++ b/ecal/core/src/ecal_descgate.cpp @@ -25,9 +25,14 @@ #include #include "ecal_descgate.h" -#include #include +#include #include +#include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/ecal_descgate.h b/ecal/core/src/ecal_descgate.h index b2e2ee50cc..59c05309c2 100644 --- a/ecal/core/src/ecal_descgate.h +++ b/ecal/core/src/ecal_descgate.h @@ -23,22 +23,23 @@ #pragma once -#include +#include #include +#include #include "ecal_global_accessors.h" #include "ecal_def.h" #include "util/ecal_expmap.h" -#include -#include #include -#include #include +#include +#include #include +#include +#include #include - namespace eCAL { class CDescGate diff --git a/ecal/core/src/ecal_event.cpp b/ecal/core/src/ecal_event.cpp index 67391af151..797b38f191 100644 --- a/ecal/core/src/ecal_event.cpp +++ b/ecal/core/src/ecal_event.cpp @@ -21,11 +21,14 @@ * @brief eCAL handle helper class **/ +#include +#include #include #include "ecal_event.h" #include +#include #ifdef ECAL_OS_WINDOWS diff --git a/ecal/core/src/ecal_global_accessors.cpp b/ecal/core/src/ecal_global_accessors.cpp index 4aea1a3b5a..bfadfdf993 100644 --- a/ecal/core/src/ecal_global_accessors.cpp +++ b/ecal/core/src/ecal_global_accessors.cpp @@ -21,9 +21,11 @@ * @brief eCAL core functions **/ -#include "ecal_def.h" #include "ecal_global_accessors.h" +#include "ecal_def.h" #include "ecal_globals.h" +#include +#include namespace eCAL { diff --git a/ecal/core/src/ecal_globals.cpp b/ecal/core/src/ecal_globals.cpp index daae75b66f..995188053e 100644 --- a/ecal/core/src/ecal_globals.cpp +++ b/ecal/core/src/ecal_globals.cpp @@ -26,7 +26,10 @@ #include "config/ecal_config_reader.h" #include +#include #include +#include +#include #if ECAL_CORE_SERVICE #include "service/ecal_service_singleton_manager.h" diff --git a/ecal/core/src/ecal_globals.h b/ecal/core/src/ecal_globals.h index 06c3a0bac5..53f3163226 100644 --- a/ecal/core/src/ecal_globals.h +++ b/ecal/core/src/ecal_globals.h @@ -24,6 +24,8 @@ #pragma once #include "ecal_global_accessors.h" +#include +#include #if ECAL_CORE_REGISTRATION #include "registration/ecal_registration_provider.h" #include "registration/ecal_registration_receiver.h" diff --git a/ecal/core/src/ecal_process.cpp b/ecal/core/src/ecal_process.cpp index 1a90d11c9c..2c9d559e0c 100644 --- a/ecal/core/src/ecal_process.cpp +++ b/ecal/core/src/ecal_process.cpp @@ -21,6 +21,7 @@ * @brief eCAL process interface **/ +#include #include #include "ecal_def.h" @@ -38,15 +39,16 @@ #include #include #include -#include #include +#include #include #include #include #include -#include #include +#include #include +#include #ifdef ECAL_OS_WINDOWS #include "ecal_win_main.h" diff --git a/ecal/core/src/ecal_process_stub.cpp b/ecal/core/src/ecal_process_stub.cpp index d0a76b3585..fc1383a50a 100644 --- a/ecal/core/src/ecal_process_stub.cpp +++ b/ecal/core/src/ecal_process_stub.cpp @@ -17,10 +17,11 @@ * ========================= eCAL LICENSE ================================= */ +#include +#include #include #include #include -#include #include #include diff --git a/ecal/core/src/ecal_util.cpp b/ecal/core/src/ecal_util.cpp index e6369819f7..6f6a9b2a97 100644 --- a/ecal/core/src/ecal_util.cpp +++ b/ecal/core/src/ecal_util.cpp @@ -23,7 +23,12 @@ #include "pubsub/ecal_pubgate.h" #include +#include #include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/ecalc.cpp b/ecal/core/src/ecalc.cpp index 68cd569774..ec3080a6e3 100644 --- a/ecal/core/src/ecalc.cpp +++ b/ecal/core/src/ecalc.cpp @@ -21,10 +21,15 @@ * @brief Implementation of the eCAL dll interface **/ +#include +#include +#include #include #include #include +#include +#include static int CopyBuffer(void* target_, int target_len_, const std::string& source_s_) { diff --git a/ecal/core/src/io/mtx/ecal_named_mutex.cpp b/ecal/core/src/io/mtx/ecal_named_mutex.cpp index d8dff14e45..2a93e01d5a 100644 --- a/ecal/core/src/io/mtx/ecal_named_mutex.cpp +++ b/ecal/core/src/io/mtx/ecal_named_mutex.cpp @@ -21,7 +21,10 @@ * @brief eCAL named mutex **/ +#include #include +#include +#include #include "ecal_named_mutex.h" diff --git a/ecal/core/src/io/mtx/linux/ecal_named_mutex_impl.h b/ecal/core/src/io/mtx/linux/ecal_named_mutex_impl.h index 16fba6c6ee..aa81a5638b 100644 --- a/ecal/core/src/io/mtx/linux/ecal_named_mutex_impl.h +++ b/ecal/core/src/io/mtx/linux/ecal_named_mutex_impl.h @@ -24,6 +24,8 @@ #pragma once #include "io/mtx/ecal_named_mutex_base.h" +#include +#include typedef struct named_mutex named_mutex_t; diff --git a/ecal/core/src/io/mtx/linux/ecal_named_mutex_robust_clocklock_impl.h b/ecal/core/src/io/mtx/linux/ecal_named_mutex_robust_clocklock_impl.h index 81e676900e..c09ca045d8 100644 --- a/ecal/core/src/io/mtx/linux/ecal_named_mutex_robust_clocklock_impl.h +++ b/ecal/core/src/io/mtx/linux/ecal_named_mutex_robust_clocklock_impl.h @@ -24,6 +24,8 @@ #pragma once #include "io/mtx/ecal_named_mutex_base.h" +#include +#include typedef struct named_mutex named_mutex_t; diff --git a/ecal/core/src/io/shm/ecal_memfile.cpp b/ecal/core/src/io/shm/ecal_memfile.cpp index 6c671845b5..8b4d94443b 100644 --- a/ecal/core/src/io/shm/ecal_memfile.cpp +++ b/ecal/core/src/io/shm/ecal_memfile.cpp @@ -26,10 +26,11 @@ #include "ecal_memfile_info.h" #include "ecal_memfile_db.h" +#include #include #include +#include #include -#include #include #define SIZEOF_PARTIAL_STRUCT(_STRUCT_NAME_, _FIELD_NAME_) (reinterpret_cast(&(reinterpret_cast<_STRUCT_NAME_*>(0)->_FIELD_NAME_)) + sizeof(_STRUCT_NAME_::_FIELD_NAME_)) //NOLINT diff --git a/ecal/core/src/io/shm/ecal_memfile.h b/ecal/core/src/io/shm/ecal_memfile.h index 4ac38b866a..88523d1a79 100644 --- a/ecal/core/src/io/shm/ecal_memfile.h +++ b/ecal/core/src/io/shm/ecal_memfile.h @@ -23,9 +23,10 @@ #pragma once -#include #include +#include #include +#include #include diff --git a/ecal/core/src/io/shm/ecal_memfile_db.cpp b/ecal/core/src/io/shm/ecal_memfile_db.cpp index 36e1a94428..9fadbffc87 100644 --- a/ecal/core/src/io/shm/ecal_memfile_db.cpp +++ b/ecal/core/src/io/shm/ecal_memfile_db.cpp @@ -26,6 +26,9 @@ #include "ecal_memfile_db.h" #include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/io/shm/ecal_memfile_db.h b/ecal/core/src/io/shm/ecal_memfile_db.h index a60224bf30..e5477249a1 100644 --- a/ecal/core/src/io/shm/ecal_memfile_db.h +++ b/ecal/core/src/io/shm/ecal_memfile_db.h @@ -23,6 +23,7 @@ #pragma once +#include #include #include #include diff --git a/ecal/core/src/io/shm/ecal_memfile_info.h b/ecal/core/src/io/shm/ecal_memfile_info.h index dc37723d23..bd2f8fef6c 100644 --- a/ecal/core/src/io/shm/ecal_memfile_info.h +++ b/ecal/core/src/io/shm/ecal_memfile_info.h @@ -23,8 +23,9 @@ #pragma once -#include +#include #include +#include #include diff --git a/ecal/core/src/io/shm/ecal_memfile_naming.cpp b/ecal/core/src/io/shm/ecal_memfile_naming.cpp index 011d5dd6b2..b736e6df61 100644 --- a/ecal/core/src/io/shm/ecal_memfile_naming.cpp +++ b/ecal/core/src/io/shm/ecal_memfile_naming.cpp @@ -20,9 +20,11 @@ #include "io/shm/ecal_memfile_naming.h" #include +#include #include #include #include +#include namespace eCAL { diff --git a/ecal/core/src/io/shm/ecal_memfile_os.h b/ecal/core/src/io/shm/ecal_memfile_os.h index c68a792db3..5d48177c79 100644 --- a/ecal/core/src/io/shm/ecal_memfile_os.h +++ b/ecal/core/src/io/shm/ecal_memfile_os.h @@ -23,6 +23,7 @@ #pragma once +#include #include #include "ecal_memfile.h" diff --git a/ecal/core/src/io/shm/ecal_memfile_pool.cpp b/ecal/core/src/io/shm/ecal_memfile_pool.cpp index 77c685a097..b087c3f982 100644 --- a/ecal/core/src/io/shm/ecal_memfile_pool.cpp +++ b/ecal/core/src/io/shm/ecal_memfile_pool.cpp @@ -26,7 +26,15 @@ #include "ecal_event.h" #include "ecal_memfile_pool.h" +#include #include +#include +#include +#include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/io/shm/ecal_memfile_pool.h b/ecal/core/src/io/shm/ecal_memfile_pool.h index 0c45884457..dd173e70c1 100644 --- a/ecal/core/src/io/shm/ecal_memfile_pool.h +++ b/ecal/core/src/io/shm/ecal_memfile_pool.h @@ -23,6 +23,8 @@ #pragma once +#include +#include #include #include "ecal_event.h" @@ -35,6 +37,7 @@ #include #include #include +#include #include namespace eCAL diff --git a/ecal/core/src/io/shm/ecal_memfile_sync.cpp b/ecal/core/src/io/shm/ecal_memfile_sync.cpp index 8978110f2b..5c01a170db 100644 --- a/ecal/core/src/io/shm/ecal_memfile_sync.cpp +++ b/ecal/core/src/io/shm/ecal_memfile_sync.cpp @@ -21,6 +21,8 @@ * @brief synchronized memory file interface **/ +#include +#include #include #include "ecal_event.h" @@ -29,7 +31,10 @@ #include "ecal_memfile_sync.h" #include +#include #include +#include +#include namespace eCAL { diff --git a/ecal/core/src/io/shm/ecal_memfile_sync.h b/ecal/core/src/io/shm/ecal_memfile_sync.h index 19bda5b297..472e178827 100644 --- a/ecal/core/src/io/shm/ecal_memfile_sync.h +++ b/ecal/core/src/io/shm/ecal_memfile_sync.h @@ -23,6 +23,8 @@ #pragma once +#include +#include #include #include "readwrite/ecal_writer_data.h" diff --git a/ecal/core/src/io/shm/linux/ecal_memfile_os.cpp b/ecal/core/src/io/shm/linux/ecal_memfile_os.cpp index 5a80490882..32d500422c 100644 --- a/ecal/core/src/io/shm/linux/ecal_memfile_os.cpp +++ b/ecal/core/src/io/shm/linux/ecal_memfile_os.cpp @@ -26,12 +26,13 @@ #include #include -#include -#include -#include +#include #include +#include +#include +#include +#include #include -#include namespace eCAL { diff --git a/ecal/core/src/io/udp/ecal_udp_configurations.cpp b/ecal/core/src/io/udp/ecal_udp_configurations.cpp index 47919811fe..20c24168f1 100644 --- a/ecal/core/src/io/udp/ecal_udp_configurations.cpp +++ b/ecal/core/src/io/udp/ecal_udp_configurations.cpp @@ -23,6 +23,7 @@ #include "ecal_udp_topic2mcast.h" #include +#include namespace eCAL { diff --git a/ecal/core/src/io/udp/ecal_udp_sample_receiver.cpp b/ecal/core/src/io/udp/ecal_udp_sample_receiver.cpp index 18d773f539..79495f5642 100644 --- a/ecal/core/src/io/udp/ecal_udp_sample_receiver.cpp +++ b/ecal/core/src/io/udp/ecal_udp_sample_receiver.cpp @@ -24,10 +24,14 @@ #include "ecal_udp_sample_receiver.h" #include "io/udp/fragmentation/msg_type.h" +#include #include #include +#include +#include #include +#include namespace eCAL { diff --git a/ecal/core/src/io/udp/ecal_udp_sample_receiver.h b/ecal/core/src/io/udp/ecal_udp_sample_receiver.h index 5178ba6876..63a0b5a599 100644 --- a/ecal/core/src/io/udp/ecal_udp_sample_receiver.h +++ b/ecal/core/src/io/udp/ecal_udp_sample_receiver.h @@ -28,6 +28,8 @@ #include "util/ecal_thread.h" #include +#include +#include #include #include #include diff --git a/ecal/core/src/io/udp/ecal_udp_sample_sender.cpp b/ecal/core/src/io/udp/ecal_udp_sample_sender.cpp index c13f6268cd..6242a2765c 100644 --- a/ecal/core/src/io/udp/ecal_udp_sample_sender.cpp +++ b/ecal/core/src/io/udp/ecal_udp_sample_sender.cpp @@ -24,7 +24,13 @@ #include "ecal_udp_sample_sender.h" #include "io/udp/fragmentation/snd_fragments.h" +#include +#include #include +#include +#include +#include +#include namespace { diff --git a/ecal/core/src/io/udp/ecal_udp_sample_sender.h b/ecal/core/src/io/udp/ecal_udp_sample_sender.h index aeda1a3292..2dcfcab3f9 100644 --- a/ecal/core/src/io/udp/ecal_udp_sample_sender.h +++ b/ecal/core/src/io/udp/ecal_udp_sample_sender.h @@ -25,6 +25,7 @@ #include "io/udp/sendreceive/udp_sender.h" +#include #include #include #include diff --git a/ecal/core/src/io/udp/ecal_udp_topic2mcast.h b/ecal/core/src/io/udp/ecal_udp_topic2mcast.h index 510db51a84..5f4cc0f6f6 100644 --- a/ecal/core/src/io/udp/ecal_udp_topic2mcast.h +++ b/ecal/core/src/io/udp/ecal_udp_topic2mcast.h @@ -23,11 +23,13 @@ #pragma once +#include #include -#include +#include #include +#include #include - + namespace eCAL { namespace UDP diff --git a/ecal/core/src/io/udp/fragmentation/rcv_fragments.cpp b/ecal/core/src/io/udp/fragmentation/rcv_fragments.cpp index 2eaf8c6253..c69b6dacad 100644 --- a/ecal/core/src/io/udp/fragmentation/rcv_fragments.cpp +++ b/ecal/core/src/io/udp/fragmentation/rcv_fragments.cpp @@ -25,9 +25,12 @@ #include "rcv_fragments.h" #include "msg_type.h" +#include #include #include +#include +#include namespace IO { diff --git a/ecal/core/src/io/udp/fragmentation/rcv_fragments.h b/ecal/core/src/io/udp/fragmentation/rcv_fragments.h index cf7a11b9a9..a27f759afe 100644 --- a/ecal/core/src/io/udp/fragmentation/rcv_fragments.h +++ b/ecal/core/src/io/udp/fragmentation/rcv_fragments.h @@ -26,6 +26,7 @@ #include "ecal_def.h" #include +#include #include namespace IO diff --git a/ecal/core/src/io/udp/fragmentation/snd_fragments.cpp b/ecal/core/src/io/udp/fragmentation/snd_fragments.cpp index d72dd7a632..170381dc46 100644 --- a/ecal/core/src/io/udp/fragmentation/snd_fragments.cpp +++ b/ecal/core/src/io/udp/fragmentation/snd_fragments.cpp @@ -25,9 +25,12 @@ #include "msg_type.h" #include +#include #include #include +#include #include +#include namespace { diff --git a/ecal/core/src/io/udp/fragmentation/snd_fragments.h b/ecal/core/src/io/udp/fragmentation/snd_fragments.h index b4a2793dee..0c7bf334aa 100644 --- a/ecal/core/src/io/udp/fragmentation/snd_fragments.h +++ b/ecal/core/src/io/udp/fragmentation/snd_fragments.h @@ -21,6 +21,7 @@ * @brief raw message buffer handling **/ +#include #include #include #include diff --git a/ecal/core/src/io/udp/sendreceive/udp_receiver.cpp b/ecal/core/src/io/udp/sendreceive/udp_receiver.cpp index 155c6c560d..6a24d59b9a 100644 --- a/ecal/core/src/io/udp/sendreceive/udp_receiver.cpp +++ b/ecal/core/src/io/udp/sendreceive/udp_receiver.cpp @@ -25,6 +25,9 @@ #include "io/udp/ecal_udp_configurations.h" #include "udp_receiver_asio.h" +#include +#include +#include #ifdef ECAL_CORE_NPCAP_SUPPORT #include "udp_receiver_npcap.h" #endif diff --git a/ecal/core/src/io/udp/sendreceive/udp_receiver.h b/ecal/core/src/io/udp/sendreceive/udp_receiver.h index b91749cd65..71027248e4 100644 --- a/ecal/core/src/io/udp/sendreceive/udp_receiver.h +++ b/ecal/core/src/io/udp/sendreceive/udp_receiver.h @@ -23,6 +23,7 @@ #pragma once +#include #include #ifdef ECAL_OS_WINDOWS diff --git a/ecal/core/src/io/udp/sendreceive/udp_receiver_asio.cpp b/ecal/core/src/io/udp/sendreceive/udp_receiver_asio.cpp index 454b52eeb7..b22bf4706d 100644 --- a/ecal/core/src/io/udp/sendreceive/udp_receiver_asio.cpp +++ b/ecal/core/src/io/udp/sendreceive/udp_receiver_asio.cpp @@ -21,6 +21,8 @@ #include "udp_receiver_asio.h" #include "io/udp/ecal_udp_configurations.h" +#include +#include #ifdef __linux__ #include "linux/socket_os.h" diff --git a/ecal/core/src/io/udp/sendreceive/udp_receiver_asio.h b/ecal/core/src/io/udp/sendreceive/udp_receiver_asio.h index f173bfb967..10bebe0279 100644 --- a/ecal/core/src/io/udp/sendreceive/udp_receiver_asio.h +++ b/ecal/core/src/io/udp/sendreceive/udp_receiver_asio.h @@ -20,6 +20,7 @@ #pragma once #include "udp_receiver.h" +#include #ifdef _MSC_VER #pragma warning(push) diff --git a/ecal/core/src/io/udp/sendreceive/udp_sender.cpp b/ecal/core/src/io/udp/sendreceive/udp_sender.cpp index ce59546855..e46a067e97 100644 --- a/ecal/core/src/io/udp/sendreceive/udp_sender.cpp +++ b/ecal/core/src/io/udp/sendreceive/udp_sender.cpp @@ -23,7 +23,9 @@ #include "udp_sender.h" +#include #include +#include #ifdef _MSC_VER #pragma warning(push) diff --git a/ecal/core/src/io/udp/sendreceive/udp_sender.h b/ecal/core/src/io/udp/sendreceive/udp_sender.h index ade26739cc..91f6465ea0 100644 --- a/ecal/core/src/io/udp/sendreceive/udp_sender.h +++ b/ecal/core/src/io/udp/sendreceive/udp_sender.h @@ -23,6 +23,7 @@ #pragma once +#include #include #ifdef ECAL_OS_WINDOWS diff --git a/ecal/core/src/logging/ecal_log.cpp b/ecal/core/src/logging/ecal_log.cpp index 530e99357f..2c3a473b66 100644 --- a/ecal/core/src/logging/ecal_log.cpp +++ b/ecal/core/src/logging/ecal_log.cpp @@ -22,6 +22,7 @@ **/ #include +#include #include "ecal_log_impl.h" diff --git a/ecal/core/src/logging/ecal_log_impl.h b/ecal/core/src/logging/ecal_log_impl.h index bbed11dce5..694a31d9f3 100644 --- a/ecal/core/src/logging/ecal_log_impl.h +++ b/ecal/core/src/logging/ecal_log_impl.h @@ -27,6 +27,7 @@ #include "io/udp/ecal_udp_sample_sender.h" #include "serialization/ecal_struct_logging.h" +#include #include #include @@ -36,8 +37,9 @@ #include #include -#include #include +#include +#include #include namespace eCAL diff --git a/ecal/core/src/pubsub/ecal_pubgate.cpp b/ecal/core/src/pubsub/ecal_pubgate.cpp index bed3f31783..24e61a7cc4 100644 --- a/ecal/core/src/pubsub/ecal_pubgate.cpp +++ b/ecal/core/src/pubsub/ecal_pubgate.cpp @@ -25,8 +25,13 @@ #include "ecal_sample_to_topicinfo.h" #include "ecal_globals.h" -#include #include +#include +#include +#include +#include +#include +#include namespace { diff --git a/ecal/core/src/pubsub/ecal_pubgate.h b/ecal/core/src/pubsub/ecal_pubgate.h index 7b42a793f5..ba7ec50948 100644 --- a/ecal/core/src/pubsub/ecal_pubgate.h +++ b/ecal/core/src/pubsub/ecal_pubgate.h @@ -27,8 +27,9 @@ #include "serialization/ecal_struct_sample_registration.h" #include -#include +#include #include +#include #include #include diff --git a/ecal/core/src/pubsub/ecal_publisher.cpp b/ecal/core/src/pubsub/ecal_publisher.cpp index 09d14b9cfe..256a5802c3 100644 --- a/ecal/core/src/pubsub/ecal_publisher.cpp +++ b/ecal/core/src/pubsub/ecal_publisher.cpp @@ -21,14 +21,18 @@ * @brief common data publisher based on eCAL **/ +#include #include #include "ecal_globals.h" #include "readwrite/ecal_writer.h" #include "readwrite/ecal_writer_buffer_payload.h" -#include #include +#include +#include +#include +#include namespace { diff --git a/ecal/core/src/pubsub/ecal_subgate.cpp b/ecal/core/src/pubsub/ecal_subgate.cpp index 113309134c..ad324b87ac 100644 --- a/ecal/core/src/pubsub/ecal_subgate.cpp +++ b/ecal/core/src/pubsub/ecal_subgate.cpp @@ -26,7 +26,15 @@ #include "ecal_globals.h" #include +#include +#include #include +#include +#include +#include +#include +#include +#include namespace { diff --git a/ecal/core/src/pubsub/ecal_subgate.h b/ecal/core/src/pubsub/ecal_subgate.h index 7d44063546..21442f2d26 100644 --- a/ecal/core/src/pubsub/ecal_subgate.h +++ b/ecal/core/src/pubsub/ecal_subgate.h @@ -26,8 +26,9 @@ #include "readwrite/ecal_reader.h" #include -#include +#include #include +#include #include #include diff --git a/ecal/core/src/pubsub/ecal_subscriber.cpp b/ecal/core/src/pubsub/ecal_subscriber.cpp index b8eddb1eda..b5bef7f2fd 100644 --- a/ecal/core/src/pubsub/ecal_subscriber.cpp +++ b/ecal/core/src/pubsub/ecal_subscriber.cpp @@ -21,13 +21,17 @@ * @brief common data subscriber for eCAL **/ +#include #include #include "ecal_globals.h" #include "readwrite/ecal_reader.h" -#include #include +#include +#include +#include +#include namespace { diff --git a/ecal/core/src/readwrite/ecal_reader.cpp b/ecal/core/src/readwrite/ecal_reader.cpp index e449ae4160..bac9bb1d9e 100644 --- a/ecal/core/src/readwrite/ecal_reader.cpp +++ b/ecal/core/src/readwrite/ecal_reader.cpp @@ -21,8 +21,13 @@ * @brief common eCAL data reader **/ +#include #include #include +#include +#include +#include +#include #if ECAL_CORE_REGISTRATION #include "registration/ecal_registration_provider.h" diff --git a/ecal/core/src/readwrite/ecal_reader.h b/ecal/core/src/readwrite/ecal_reader.h index 3987e30b78..2f7613b539 100644 --- a/ecal/core/src/readwrite/ecal_reader.h +++ b/ecal/core/src/readwrite/ecal_reader.h @@ -23,6 +23,9 @@ #pragma once +#include +#include +#include #include #include #include @@ -32,6 +35,7 @@ #include "util/ecal_expmap.h" #include +#include #include #include #include diff --git a/ecal/core/src/readwrite/ecal_writer.cpp b/ecal/core/src/readwrite/ecal_writer.cpp index d37257a97f..a0731476f4 100644 --- a/ecal/core/src/readwrite/ecal_writer.cpp +++ b/ecal/core/src/readwrite/ecal_writer.cpp @@ -21,9 +21,15 @@ * @brief common eCAL data writer **/ +#include +#include #include #include #include +#include +#include +#include +#include #include "ecal_def.h" #include "config/ecal_config_reader_hlp.h" diff --git a/ecal/core/src/readwrite/ecal_writer.h b/ecal/core/src/readwrite/ecal_writer.h index ecb48166cb..47d550f460 100644 --- a/ecal/core/src/readwrite/ecal_writer.h +++ b/ecal/core/src/readwrite/ecal_writer.h @@ -23,10 +23,13 @@ #pragma once +#include +#include #include #include #include #include +#include #include "ecal_def.h" #include "util/ecal_expmap.h" diff --git a/ecal/core/src/readwrite/shm/ecal_reader_shm.cpp b/ecal/core/src/readwrite/shm/ecal_reader_shm.cpp index 84238fe421..c2f4b2f66e 100644 --- a/ecal/core/src/readwrite/shm/ecal_reader_shm.cpp +++ b/ecal/core/src/readwrite/shm/ecal_reader_shm.cpp @@ -21,7 +21,10 @@ * @brief shared memory layer **/ +#include #include +#include +#include #include "ecal_global_accessors.h" #include "pubsub/ecal_subgate.h" diff --git a/ecal/core/src/readwrite/shm/ecal_reader_shm.h b/ecal/core/src/readwrite/shm/ecal_reader_shm.h index 36f4087a5d..e3c5cb3926 100644 --- a/ecal/core/src/readwrite/shm/ecal_reader_shm.h +++ b/ecal/core/src/readwrite/shm/ecal_reader_shm.h @@ -26,7 +26,9 @@ #include "ecal_def.h" #include "readwrite/ecal_reader_layer.h" +#include #include +#include namespace eCAL { diff --git a/ecal/core/src/readwrite/shm/ecal_writer_shm.cpp b/ecal/core/src/readwrite/shm/ecal_writer_shm.cpp index a289fde457..0a07907785 100644 --- a/ecal/core/src/readwrite/shm/ecal_writer_shm.cpp +++ b/ecal/core/src/readwrite/shm/ecal_writer_shm.cpp @@ -21,9 +21,11 @@ * @brief memory file data writer **/ +#include #include #include #include +#include #include "ecal_def.h" #include "ecal_writer_shm.h" diff --git a/ecal/core/src/readwrite/shm/ecal_writer_shm.h b/ecal/core/src/readwrite/shm/ecal_writer_shm.h index deb4d7020e..d3081a5aa9 100644 --- a/ecal/core/src/readwrite/shm/ecal_writer_shm.h +++ b/ecal/core/src/readwrite/shm/ecal_writer_shm.h @@ -26,8 +26,10 @@ #include "readwrite/ecal_writer_base.h" #include "io/shm/ecal_memfile_sync.h" +#include #include #include +#include namespace eCAL { diff --git a/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.cpp b/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.cpp index 0261754544..39ade8083d 100644 --- a/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.cpp +++ b/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.cpp @@ -27,6 +27,11 @@ #include "pubsub/ecal_subgate.h" #include "io/udp/ecal_udp_configurations.h" +#include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.h b/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.h index cbfb16e389..5360dc5ca3 100644 --- a/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.h +++ b/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.h @@ -26,6 +26,7 @@ #include "io/udp/ecal_udp_sample_receiver.h" #include "readwrite/ecal_reader_layer.h" +#include #include #include #include diff --git a/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.cpp b/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.cpp index 6882cfca9c..063ed701a4 100644 --- a/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.cpp +++ b/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.cpp @@ -21,8 +21,11 @@ * @brief udp data writer **/ -#include +#include #include +#include +#include +#include #include "ecal_writer_udp_mc.h" #include "io/udp/ecal_udp_configurations.h" diff --git a/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.h b/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.h index d1bc40b9e1..9b9df24207 100644 --- a/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.h +++ b/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.h @@ -26,6 +26,7 @@ #include "io/udp/ecal_udp_sample_sender.h" #include "readwrite/ecal_writer_base.h" +#include #include #include diff --git a/ecal/core/src/registration/ecal_registration_provider.cpp b/ecal/core/src/registration/ecal_registration_provider.cpp index c936ac3c49..a6b735ded1 100644 --- a/ecal/core/src/registration/ecal_registration_provider.cpp +++ b/ecal/core/src/registration/ecal_registration_provider.cpp @@ -26,6 +26,7 @@ * **/ +#include #include #include "ecal_def.h" @@ -36,6 +37,11 @@ #include "io/udp/ecal_udp_sample_sender.h" #include +#include +#include +#include +#include +#include namespace { diff --git a/ecal/core/src/registration/ecal_registration_receiver.cpp b/ecal/core/src/registration/ecal_registration_receiver.cpp index 1e857f1bde..799d572f52 100644 --- a/ecal/core/src/registration/ecal_registration_receiver.cpp +++ b/ecal/core/src/registration/ecal_registration_receiver.cpp @@ -32,8 +32,13 @@ #include "pubsub/ecal_pubgate.h" #include "service/ecal_clientgate.h" -#include "io/udp/ecal_udp_configurations.h" #include "ecal_sample_to_topicinfo.h" +#include "io/udp/ecal_udp_configurations.h" +#include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/registration/ecal_registration_receiver.h b/ecal/core/src/registration/ecal_registration_receiver.h index a6ababcabf..a3e4e2d4e2 100644 --- a/ecal/core/src/registration/ecal_registration_receiver.h +++ b/ecal/core/src/registration/ecal_registration_receiver.h @@ -27,6 +27,7 @@ #pragma once +#include #include #include "ecal_def.h" diff --git a/ecal/core/src/registration/ecal_registration_receiver_shm.cpp b/ecal/core/src/registration/ecal_registration_receiver_shm.cpp index b1e89ff0c2..541d220b3c 100644 --- a/ecal/core/src/registration/ecal_registration_receiver_shm.cpp +++ b/ecal/core/src/registration/ecal_registration_receiver_shm.cpp @@ -29,6 +29,9 @@ #include "ecal_registration_receiver_shm.h" #include "serialization/ecal_serialize_sample_registration.h" +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/registration/ecal_registration_receiver_shm.h b/ecal/core/src/registration/ecal_registration_receiver_shm.h index 45a554a794..b4e0388720 100644 --- a/ecal/core/src/registration/ecal_registration_receiver_shm.h +++ b/ecal/core/src/registration/ecal_registration_receiver_shm.h @@ -31,6 +31,7 @@ #include "shm/ecal_memfile_broadcast_reader.h" #include "util/ecal_thread.h" +#include namespace eCAL { diff --git a/ecal/core/src/registration/shm/ecal_memfile_broadcast.cpp b/ecal/core/src/registration/shm/ecal_memfile_broadcast.cpp index f342f8e2cf..a97827860d 100644 --- a/ecal/core/src/registration/shm/ecal_memfile_broadcast.cpp +++ b/ecal/core/src/registration/shm/ecal_memfile_broadcast.cpp @@ -27,8 +27,12 @@ #include "io/shm/ecal_memfile.h" #include "ecal_global_accessors.h" -#include #include +#include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/registration/shm/ecal_memfile_broadcast.h b/ecal/core/src/registration/shm/ecal_memfile_broadcast.h index 9c500ee587..261cfdbc00 100644 --- a/ecal/core/src/registration/shm/ecal_memfile_broadcast.h +++ b/ecal/core/src/registration/shm/ecal_memfile_broadcast.h @@ -23,11 +23,12 @@ #pragma once +#include +#include +#include +#include #include #include -#include -#include -#include #include "relocatable_circular_queue.h" #include "io/shm/ecal_memfile.h" diff --git a/ecal/core/src/registration/shm/ecal_memfile_broadcast_reader.cpp b/ecal/core/src/registration/shm/ecal_memfile_broadcast_reader.cpp index cf1ed8bb15..15bee6b58b 100644 --- a/ecal/core/src/registration/shm/ecal_memfile_broadcast_reader.cpp +++ b/ecal/core/src/registration/shm/ecal_memfile_broadcast_reader.cpp @@ -22,8 +22,14 @@ **/ #include "ecal_memfile_broadcast_reader.h" -#include "io/shm/ecal_memfile.h" #include "ecal_def.h" +#include "io/shm/ecal_memfile.h" +#include +#include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/registration/shm/ecal_memfile_broadcast_reader.h b/ecal/core/src/registration/shm/ecal_memfile_broadcast_reader.h index 2e16a4ca6d..d02a04d7c4 100644 --- a/ecal/core/src/registration/shm/ecal_memfile_broadcast_reader.h +++ b/ecal/core/src/registration/shm/ecal_memfile_broadcast_reader.h @@ -25,10 +25,11 @@ #include "ecal_memfile_broadcast.h" +#include #include -#include -#include #include +#include +#include namespace eCAL { diff --git a/ecal/core/src/registration/shm/ecal_memfile_broadcast_writer.cpp b/ecal/core/src/registration/shm/ecal_memfile_broadcast_writer.cpp index 2e9e911816..e7ff9dd4b6 100644 --- a/ecal/core/src/registration/shm/ecal_memfile_broadcast_writer.cpp +++ b/ecal/core/src/registration/shm/ecal_memfile_broadcast_writer.cpp @@ -22,8 +22,11 @@ **/ #include "ecal_memfile_broadcast_writer.h" -#include "io/shm/ecal_memfile.h" #include "ecal_def.h" +#include "io/shm/ecal_memfile.h" +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/registration/shm/ecal_memfile_broadcast_writer.h b/ecal/core/src/registration/shm/ecal_memfile_broadcast_writer.h index afc6350efd..9985a5a006 100644 --- a/ecal/core/src/registration/shm/ecal_memfile_broadcast_writer.h +++ b/ecal/core/src/registration/shm/ecal_memfile_broadcast_writer.h @@ -25,6 +25,7 @@ #include "ecal_memfile_broadcast.h" +#include #include #include diff --git a/ecal/core/src/registration/shm/relocatable_circular_queue.h b/ecal/core/src/registration/shm/relocatable_circular_queue.h index e90f3a674d..76a04feb47 100644 --- a/ecal/core/src/registration/shm/relocatable_circular_queue.h +++ b/ecal/core/src/registration/shm/relocatable_circular_queue.h @@ -23,11 +23,12 @@ #pragma once +#include +#include #include -#include -#include #include -#include +#include +#include template class RelocatableCircularQueue{ diff --git a/ecal/core/src/serialization/ecal_serialize_common.cpp b/ecal/core/src/serialization/ecal_serialize_common.cpp index aaff165c16..6862cce1eb 100644 --- a/ecal/core/src/serialization/ecal_serialize_common.cpp +++ b/ecal/core/src/serialization/ecal_serialize_common.cpp @@ -22,9 +22,13 @@ * @brief eCAL common (de)serialization **/ -#include "nanopb/pb_encode.h" -#include "nanopb/pb_decode.h" #include "nanopb/ecal.pb.h" +#include "nanopb/pb_decode.h" +#include "nanopb/pb_encode.h" +#include +#include +#include +#include #include "ecal_serialize_common.h" diff --git a/ecal/core/src/serialization/ecal_serialize_common.h b/ecal/core/src/serialization/ecal_serialize_common.h index d6d977f8cf..20b7fd3cff 100644 --- a/ecal/core/src/serialization/ecal_serialize_common.h +++ b/ecal/core/src/serialization/ecal_serialize_common.h @@ -31,6 +31,8 @@ #include "ecal_struct_sample_registration.h" #include "ecal_struct_service.h" +#include +#include #include #include diff --git a/ecal/core/src/serialization/ecal_serialize_logging.cpp b/ecal/core/src/serialization/ecal_serialize_logging.cpp index 3a7f05a911..34b3fd8e8b 100644 --- a/ecal/core/src/serialization/ecal_serialize_logging.cpp +++ b/ecal/core/src/serialization/ecal_serialize_logging.cpp @@ -29,7 +29,11 @@ #include "ecal_serialize_common.h" #include "ecal_serialize_logging.h" +#include #include +#include +#include +#include namespace { diff --git a/ecal/core/src/serialization/ecal_serialize_monitoring.cpp b/ecal/core/src/serialization/ecal_serialize_monitoring.cpp index 3578f261d3..669eaf4240 100644 --- a/ecal/core/src/serialization/ecal_serialize_monitoring.cpp +++ b/ecal/core/src/serialization/ecal_serialize_monitoring.cpp @@ -29,7 +29,9 @@ #include "ecal_serialize_common.h" #include "ecal_serialize_monitoring.h" +#include #include +#include namespace { diff --git a/ecal/core/src/serialization/ecal_serialize_monitoring.h b/ecal/core/src/serialization/ecal_serialize_monitoring.h index 937238bda1..4f85722327 100644 --- a/ecal/core/src/serialization/ecal_serialize_monitoring.h +++ b/ecal/core/src/serialization/ecal_serialize_monitoring.h @@ -24,6 +24,7 @@ #pragma once +#include #include #include diff --git a/ecal/core/src/serialization/ecal_serialize_sample_payload.cpp b/ecal/core/src/serialization/ecal_serialize_sample_payload.cpp index ad003e6337..5172431e53 100644 --- a/ecal/core/src/serialization/ecal_serialize_sample_payload.cpp +++ b/ecal/core/src/serialization/ecal_serialize_sample_payload.cpp @@ -29,7 +29,10 @@ #include "ecal_serialize_common.h" #include "ecal_struct_sample_payload.h" +#include #include +#include +#include namespace { diff --git a/ecal/core/src/serialization/ecal_serialize_sample_payload.h b/ecal/core/src/serialization/ecal_serialize_sample_payload.h index e39a990d11..6ef483ba9b 100644 --- a/ecal/core/src/serialization/ecal_serialize_sample_payload.h +++ b/ecal/core/src/serialization/ecal_serialize_sample_payload.h @@ -26,6 +26,7 @@ #include "ecal_struct_sample_payload.h" +#include #include #include diff --git a/ecal/core/src/serialization/ecal_serialize_sample_registration.cpp b/ecal/core/src/serialization/ecal_serialize_sample_registration.cpp index def75962d7..2ab09d2e7f 100644 --- a/ecal/core/src/serialization/ecal_serialize_sample_registration.cpp +++ b/ecal/core/src/serialization/ecal_serialize_sample_registration.cpp @@ -29,7 +29,11 @@ #include "ecal_serialize_common.h" #include "ecal_serialize_sample_registration.h" +#include #include +#include +#include +#include namespace { diff --git a/ecal/core/src/serialization/ecal_serialize_sample_registration.h b/ecal/core/src/serialization/ecal_serialize_sample_registration.h index 86c65aea2a..a17ffc8b21 100644 --- a/ecal/core/src/serialization/ecal_serialize_sample_registration.h +++ b/ecal/core/src/serialization/ecal_serialize_sample_registration.h @@ -26,6 +26,7 @@ #include "ecal_struct_sample_registration.h" +#include #include #include diff --git a/ecal/core/src/serialization/ecal_serialize_service.cpp b/ecal/core/src/serialization/ecal_serialize_service.cpp index c73947f5dc..dce7ab57d0 100644 --- a/ecal/core/src/serialization/ecal_serialize_service.cpp +++ b/ecal/core/src/serialization/ecal_serialize_service.cpp @@ -29,7 +29,10 @@ #include "ecal_serialize_common.h" #include "ecal_serialize_service.h" +#include #include +#include +#include namespace { diff --git a/ecal/core/src/serialization/ecal_serialize_service.h b/ecal/core/src/serialization/ecal_serialize_service.h index 71cc2553b6..242199e592 100644 --- a/ecal/core/src/serialization/ecal_serialize_service.h +++ b/ecal/core/src/serialization/ecal_serialize_service.h @@ -26,6 +26,7 @@ #include "ecal_struct_service.h" +#include #include #include diff --git a/ecal/core/src/serialization/ecal_struct_sample_payload.h b/ecal/core/src/serialization/ecal_struct_sample_payload.h index 2875f8526a..0279c8b688 100644 --- a/ecal/core/src/serialization/ecal_struct_sample_payload.h +++ b/ecal/core/src/serialization/ecal_struct_sample_payload.h @@ -26,6 +26,8 @@ #include "ecal_struct_sample_common.h" +#include +#include #include #include #include diff --git a/ecal/core/src/serialization/ecal_struct_sample_registration.h b/ecal/core/src/serialization/ecal_struct_sample_registration.h index 33e8abd114..22e312272d 100644 --- a/ecal/core/src/serialization/ecal_struct_sample_registration.h +++ b/ecal/core/src/serialization/ecal_struct_sample_registration.h @@ -27,6 +27,7 @@ #include "ecal_struct_sample_common.h" #include "ecal_struct_service.h" +#include #include #include #include diff --git a/ecal/core/src/serialization/ecal_struct_service.h b/ecal/core/src/serialization/ecal_struct_service.h index c8cc783550..0df89def35 100644 --- a/ecal/core/src/serialization/ecal_struct_service.h +++ b/ecal/core/src/serialization/ecal_struct_service.h @@ -26,6 +26,7 @@ #include #include +#include namespace eCAL { diff --git a/ecal/core/src/service/ecal_clientgate.cpp b/ecal/core/src/service/ecal_clientgate.cpp index 26a3bcab0e..fa6f2d41cd 100644 --- a/ecal/core/src/service/ecal_clientgate.cpp +++ b/ecal/core/src/service/ecal_clientgate.cpp @@ -24,6 +24,11 @@ #include "ecal_clientgate.h" #include "ecal_descgate.h" #include "service/ecal_service_client_impl.h" +#include +#include +#include +#include +#include namespace { diff --git a/ecal/core/src/service/ecal_clientgate.h b/ecal/core/src/service/ecal_clientgate.h index 6d2ac72ec2..e48675190c 100644 --- a/ecal/core/src/service/ecal_clientgate.h +++ b/ecal/core/src/service/ecal_clientgate.h @@ -30,8 +30,10 @@ #include #include -#include #include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/service/ecal_service_client.cpp b/ecal/core/src/service/ecal_service_client.cpp index d23282fe4e..73b005f6c5 100644 --- a/ecal/core/src/service/ecal_service_client.cpp +++ b/ecal/core/src/service/ecal_service_client.cpp @@ -22,6 +22,7 @@ **/ #include +#include #include "ecal_clientgate.h" #include "ecal_global_accessors.h" diff --git a/ecal/core/src/service/ecal_service_client_impl.cpp b/ecal/core/src/service/ecal_service_client_impl.cpp index a3ad1b69fe..cb9c949580 100644 --- a/ecal/core/src/service/ecal_service_client_impl.cpp +++ b/ecal/core/src/service/ecal_service_client_impl.cpp @@ -30,8 +30,12 @@ #include "serialization/ecal_serialize_service.h" #include +#include +#include #include +#include #include +#include namespace eCAL { diff --git a/ecal/core/src/service/ecal_service_server.cpp b/ecal/core/src/service/ecal_service_server.cpp index 80c2d8b28c..b76e88a899 100644 --- a/ecal/core/src/service/ecal_service_server.cpp +++ b/ecal/core/src/service/ecal_service_server.cpp @@ -22,6 +22,7 @@ **/ #include +#include #include "ecal_servicegate.h" #include "ecal_global_accessors.h" diff --git a/ecal/core/src/service/ecal_service_server_impl.cpp b/ecal/core/src/service/ecal_service_server_impl.cpp index 171100472a..f63dce8ffc 100644 --- a/ecal/core/src/service/ecal_service_server_impl.cpp +++ b/ecal/core/src/service/ecal_service_server_impl.cpp @@ -33,7 +33,10 @@ #include #include +#include +#include #include +#include #include namespace diff --git a/ecal/core/src/service/ecal_service_server_impl.h b/ecal/core/src/service/ecal_service_server_impl.h index c013ef6012..5b35fcbef6 100644 --- a/ecal/core/src/service/ecal_service_server_impl.h +++ b/ecal/core/src/service/ecal_service_server_impl.h @@ -28,9 +28,11 @@ #include #include +#include #include #include +#include #include "serialization/ecal_struct_service.h" diff --git a/ecal/core/src/service/ecal_service_singleton_manager.cpp b/ecal/core/src/service/ecal_service_singleton_manager.cpp index 4cce08d1e3..7ad89086d9 100644 --- a/ecal/core/src/service/ecal_service_singleton_manager.cpp +++ b/ecal/core/src/service/ecal_service_singleton_manager.cpp @@ -19,7 +19,12 @@ #include "ecal_service_singleton_manager.h" +#include #include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/service/ecal_service_singleton_manager.h b/ecal/core/src/service/ecal_service_singleton_manager.h index 6625da6eac..f8f7ce8768 100644 --- a/ecal/core/src/service/ecal_service_singleton_manager.h +++ b/ecal/core/src/service/ecal_service_singleton_manager.h @@ -19,10 +19,15 @@ #pragma once -#include +#include +#include #include +#include #include +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/service/ecal_servicegate.cpp b/ecal/core/src/service/ecal_servicegate.cpp index ba6e960aaf..76d0aa7ad4 100644 --- a/ecal/core/src/service/ecal_servicegate.cpp +++ b/ecal/core/src/service/ecal_servicegate.cpp @@ -23,6 +23,9 @@ #include "ecal_servicegate.h" #include "service/ecal_service_server_impl.h" +#include +#include +#include namespace eCAL { diff --git a/ecal/core/src/time/ecal_time.cpp b/ecal/core/src/time/ecal_time.cpp index e67d34de44..c8aa271d26 100644 --- a/ecal/core/src/time/ecal_time.cpp +++ b/ecal/core/src/time/ecal_time.cpp @@ -24,6 +24,7 @@ #include #include +#include #include #if ECAL_CORE_TIMEGATE diff --git a/ecal/core/src/time/ecal_timegate.cpp b/ecal/core/src/time/ecal_timegate.cpp index 681b30c90a..9594734627 100644 --- a/ecal/core/src/time/ecal_timegate.cpp +++ b/ecal/core/src/time/ecal_timegate.cpp @@ -21,6 +21,7 @@ * @brief eCAL time gateway class **/ +#include #include #include @@ -31,6 +32,7 @@ #include "util/getenvvar.h" #include +#include #define etime_initialize_name "etime_initialize" #define etime_finalize_name "etime_finalize" diff --git a/ecal/core/src/time/ecal_timegate.h b/ecal/core/src/time/ecal_timegate.h index 8a11e9642d..ccd9938936 100644 --- a/ecal/core/src/time/ecal_timegate.h +++ b/ecal/core/src/time/ecal_timegate.h @@ -28,6 +28,7 @@ #include "ecal_global_accessors.h" #include +#include #ifdef ECAL_OS_WINDOWS diff --git a/ecal/core/src/time/ecal_timer.cpp b/ecal/core/src/time/ecal_timer.cpp index bde258a5e8..cd2d607df4 100644 --- a/ecal/core/src/time/ecal_timer.cpp +++ b/ecal/core/src/time/ecal_timer.cpp @@ -24,9 +24,10 @@ #include #include +#include #include +#include #include -#include namespace eCAL { diff --git a/ecal/core/src/util/advanced_tclap_output.cpp b/ecal/core/src/util/advanced_tclap_output.cpp index 58f7d6adea..e936c40baf 100644 --- a/ecal/core/src/util/advanced_tclap_output.cpp +++ b/ecal/core/src/util/advanced_tclap_output.cpp @@ -19,7 +19,13 @@ #include "advanced_tclap_output.h" +#include +#include +#include #include +#include +#include +#include namespace CustomTclap { diff --git a/ecal/core/src/util/ecal_expmap.h b/ecal/core/src/util/ecal_expmap.h index ba3959e1b7..20b1ddaec5 100644 --- a/ecal/core/src/util/ecal_expmap.h +++ b/ecal/core/src/util/ecal_expmap.h @@ -23,13 +23,14 @@ #pragma once +#include #include +#include #include #include #include #include #include -#include namespace eCAL { diff --git a/ecal/pb/CMakeLists.txt b/ecal/pb/CMakeLists.txt deleted file mode 100644 index 525c0abe52..0000000000 --- a/ecal/pb/CMakeLists.txt +++ /dev/null @@ -1,89 +0,0 @@ -# ========================= eCAL LICENSE ================================= -# -# Copyright (C) 2016 - 2019 Continental Corporation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ========================= eCAL LICENSE ================================= - -# installing old, deprecated ecal core, app, time protobuf header for downward compatibility -# REMOVE ME IN ECAL6 - -project(pb) - -set(ecal_pb_includes - include/ecal/pb/ecal.pb.h - include/ecal/pb/host.pb.h - include/ecal/pb/layer.pb.h - include/ecal/pb/monitoring.pb.h - include/ecal/pb/process.pb.h - include/ecal/pb/service.pb.h - include/ecal/pb/sim_time.pb.h - include/ecal/pb/topic.pb.h - include/ecal/pb/mma/mma.pb.h - include/ecal/pb/play/service.pb.h - include/ecal/pb/play/state.pb.h - include/ecal/pb/rec/client_service.pb.h - include/ecal/pb/rec/client_state.pb.h - include/ecal/pb/rec/server_config.pb.h - include/ecal/pb/rec/server_service.pb.h - include/ecal/pb/rec/server_state.pb.h - include/ecal/pb/sys/client_service.pb.h - include/ecal/pb/sys/service.pb.h - include/ecal/pb/sys/state.pb.h -) - -set(ecal_pb_src - src/pb.cpp -) - -ecal_add_static_library(${PROJECT_NAME} - ${ecal_pb_includes} - ${ecal_pb_src} -) - -add_library(eCAL::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) - -target_link_libraries(${PROJECT_NAME} - PUBLIC - eCAL::core_pb -) - -if(BUILD_APPS) -target_link_libraries(${PROJECT_NAME} - PUBLIC - eCAL::app_pb -) -endif() - -if(BUILD_TIME) -target_link_libraries(${PROJECT_NAME} - PUBLIC - eCAL::ecaltime_pb -) -endif() - -target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_14) - -target_include_directories(${PROJECT_NAME} PUBLIC - $ - $ -) - -install(DIRECTORY - "include/" DESTINATION "${INSTALL_INCLUDE_DIR}" COMPONENT sdk - FILES_MATCHING PATTERN "*.pb.h") - -ecal_install_library(${PROJECT_NAME}) - -set_property(TARGET ${PROJECT_NAME} PROPERTY FOLDER ecal/pb) diff --git a/ecal/pb/include/ecal/pb/ecal.pb.h b/ecal/pb/include/ecal/pb/ecal.pb.h deleted file mode 100644 index 32ebc6d7e9..0000000000 --- a/ecal/pb/include/ecal/pb/ecal.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/host.pb.h b/ecal/pb/include/ecal/pb/host.pb.h deleted file mode 100644 index 3597697e68..0000000000 --- a/ecal/pb/include/ecal/pb/host.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/layer.pb.h b/ecal/pb/include/ecal/pb/layer.pb.h deleted file mode 100644 index b932926ff4..0000000000 --- a/ecal/pb/include/ecal/pb/layer.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/mma/mma.pb.h b/ecal/pb/include/ecal/pb/mma/mma.pb.h deleted file mode 100644 index 2c74665537..0000000000 --- a/ecal/pb/include/ecal/pb/mma/mma.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/monitoring.pb.h b/ecal/pb/include/ecal/pb/monitoring.pb.h deleted file mode 100644 index e5fbfee631..0000000000 --- a/ecal/pb/include/ecal/pb/monitoring.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/play/service.pb.h b/ecal/pb/include/ecal/pb/play/service.pb.h deleted file mode 100644 index d0b69c3ed1..0000000000 --- a/ecal/pb/include/ecal/pb/play/service.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/play/state.pb.h b/ecal/pb/include/ecal/pb/play/state.pb.h deleted file mode 100644 index 25b963248d..0000000000 --- a/ecal/pb/include/ecal/pb/play/state.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/process.pb.h b/ecal/pb/include/ecal/pb/process.pb.h deleted file mode 100644 index b596842ff8..0000000000 --- a/ecal/pb/include/ecal/pb/process.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/rec/client_service.pb.h b/ecal/pb/include/ecal/pb/rec/client_service.pb.h deleted file mode 100644 index 48f21a4ec4..0000000000 --- a/ecal/pb/include/ecal/pb/rec/client_service.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/rec/client_state.pb.h b/ecal/pb/include/ecal/pb/rec/client_state.pb.h deleted file mode 100644 index 49f5a5105d..0000000000 --- a/ecal/pb/include/ecal/pb/rec/client_state.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/rec/server_config.pb.h b/ecal/pb/include/ecal/pb/rec/server_config.pb.h deleted file mode 100644 index 19d81695fc..0000000000 --- a/ecal/pb/include/ecal/pb/rec/server_config.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/rec/server_service.pb.h b/ecal/pb/include/ecal/pb/rec/server_service.pb.h deleted file mode 100644 index 2544b56968..0000000000 --- a/ecal/pb/include/ecal/pb/rec/server_service.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/rec/server_state.pb.h b/ecal/pb/include/ecal/pb/rec/server_state.pb.h deleted file mode 100644 index a360f57ded..0000000000 --- a/ecal/pb/include/ecal/pb/rec/server_state.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/service.pb.h b/ecal/pb/include/ecal/pb/service.pb.h deleted file mode 100644 index 50abe5f8bd..0000000000 --- a/ecal/pb/include/ecal/pb/service.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/sim_time.pb.h b/ecal/pb/include/ecal/pb/sim_time.pb.h deleted file mode 100644 index d4b5714d3a..0000000000 --- a/ecal/pb/include/ecal/pb/sim_time.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/sys/client_service.pb.h b/ecal/pb/include/ecal/pb/sys/client_service.pb.h deleted file mode 100644 index c75b069373..0000000000 --- a/ecal/pb/include/ecal/pb/sys/client_service.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/sys/service.pb.h b/ecal/pb/include/ecal/pb/sys/service.pb.h deleted file mode 100644 index dee5f1beaf..0000000000 --- a/ecal/pb/include/ecal/pb/sys/service.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/sys/state.pb.h b/ecal/pb/include/ecal/pb/sys/state.pb.h deleted file mode 100644 index 64367ec93a..0000000000 --- a/ecal/pb/include/ecal/pb/sys/state.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/include/ecal/pb/topic.pb.h b/ecal/pb/include/ecal/pb/topic.pb.h deleted file mode 100644 index 50ed411b5a..0000000000 --- a/ecal/pb/include/ecal/pb/topic.pb.h +++ /dev/null @@ -1,29 +0,0 @@ -/* ========================= eCAL LICENSE ================================= - * - * Copyright (C) 2016 - 2019 Continental Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ========================= eCAL LICENSE ================================= -*/ - -#pragma once - -#ifdef _MSC_VER -#pragma message("WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead") -#endif /*_MSC_VER*/ -#ifdef __GNUC__ -#pragma message "WARNING: This header file is deprecated. It will be removed in future eCAL versions. Please include instead" -#endif /* __GNUC__ */ - -#include diff --git a/ecal/pb/src/pb.cpp b/ecal/pb/src/pb.cpp deleted file mode 100644 index 0989ba9481..0000000000 --- a/ecal/pb/src/pb.cpp +++ /dev/null @@ -1 +0,0 @@ -// dummy file to force VS to create a library \ No newline at end of file diff --git a/ecal/service/CMakeLists.txt b/ecal/service/CMakeLists.txt index ce5ada8210..83a34bb9c0 100644 --- a/ecal/service/CMakeLists.txt +++ b/ecal/service/CMakeLists.txt @@ -20,11 +20,11 @@ add_subdirectory(ecal_service) # Samples -if(BUILD_SAMPLES) +if(ECAL_CORE_BUILD_SAMPLES) add_subdirectory(sample) endif() # Tests -if(BUILD_ECAL_TESTS) +if(ECAL_CORE_BUILD_TESTS) add_subdirectory(test) endif() \ No newline at end of file diff --git a/ecal/service/ecal_service/include/ecal/service/client_manager.h b/ecal/service/ecal_service/include/ecal/service/client_manager.h index 9681501c4d..39170c3bc1 100644 --- a/ecal/service/ecal_service/include/ecal/service/client_manager.h +++ b/ecal/service/ecal_service/include/ecal/service/client_manager.h @@ -19,10 +19,14 @@ #pragma once -#include +#include +#include #include +#include #include +#include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/include/ecal/service/client_session.h b/ecal/service/ecal_service/include/ecal/service/client_session.h index 826a215330..c7edeef3a0 100644 --- a/ecal/service/ecal_service/include/ecal/service/client_session.h +++ b/ecal/service/ecal_service/include/ecal/service/client_session.h @@ -19,7 +19,10 @@ #pragma once +#include +#include #include +#include #ifdef _MSC_VER #pragma warning(push) diff --git a/ecal/service/ecal_service/include/ecal/service/server.h b/ecal/service/ecal_service/include/ecal/service/server.h index cdb23b1591..8b60d9b51b 100644 --- a/ecal/service/ecal_service/include/ecal/service/server.h +++ b/ecal/service/ecal_service/include/ecal/service/server.h @@ -19,6 +19,8 @@ #pragma once +#include +#include #include #include diff --git a/ecal/service/ecal_service/include/ecal/service/server_manager.h b/ecal/service/ecal_service/include/ecal/service/server_manager.h index fc6bfa457b..fa93457a46 100644 --- a/ecal/service/ecal_service/include/ecal/service/server_manager.h +++ b/ecal/service/ecal_service/include/ecal/service/server_manager.h @@ -19,10 +19,13 @@ #pragma once -#include +#include +#include #include +#include #include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/src/client_manager.cpp b/ecal/service/ecal_service/src/client_manager.cpp index 9573f5d1a9..3843fb07c0 100644 --- a/ecal/service/ecal_service/src/client_manager.cpp +++ b/ecal/service/ecal_service/src/client_manager.cpp @@ -17,7 +17,13 @@ * ========================= eCAL LICENSE ================================= */ +#include +#include #include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/src/client_session.cpp b/ecal/service/ecal_service/src/client_session.cpp index 06ae27644b..c3a032f0c3 100644 --- a/ecal/service/ecal_service/src/client_session.cpp +++ b/ecal/service/ecal_service/src/client_session.cpp @@ -17,7 +17,11 @@ * ========================= eCAL LICENSE ================================= */ +#include #include +#include +#include +#include #include "client_session_impl_v1.h" #include "client_session_impl_v0.h" diff --git a/ecal/service/ecal_service/src/client_session_impl_base.h b/ecal/service/ecal_service/src/client_session_impl_base.h index 4a3ce5e5fe..df87e1eedb 100644 --- a/ecal/service/ecal_service/src/client_session_impl_base.h +++ b/ecal/service/ecal_service/src/client_session_impl_base.h @@ -19,6 +19,10 @@ #pragma once +#include +#include +#include +#include #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable: 4834) diff --git a/ecal/service/ecal_service/src/client_session_impl_v0.cpp b/ecal/service/ecal_service/src/client_session_impl_v0.cpp index 36c8522b4d..474f7b4f2a 100644 --- a/ecal/service/ecal_service/src/client_session_impl_v0.cpp +++ b/ecal/service/ecal_service/src/client_session_impl_v0.cpp @@ -23,7 +23,13 @@ #include "log_helpers.h" #include "log_defs.h" +#include +#include #include +#include +#include +#include +#include namespace eCAL { @@ -109,88 +115,80 @@ namespace eCAL void ClientSessionV0::connect_to_endpoint(const asio::ip::tcp::resolver::iterator& resolved_endpoints) { - // Look for the best endpoint to connect to. If possible, we use a loopback - // endpoint. Otherwise, we just use the first one. - - - auto endpoint_to_connect_to = resolved_endpoints->endpoint(); // Default to first endpoint - for (auto it = resolved_endpoints; it != asio::ip::tcp::resolver::iterator(); it++) + // Convert the resolved_endpoints iterator to an endpoint sequence + // (i.e. a vector of endpoints) + auto endpoint_sequence = std::make_shared>(); + for (auto it = resolved_endpoints; it != asio::ip::tcp::resolver::iterator(); ++it) { - if (it->endpoint().address().is_loopback()) - { - // If we find a loopback endpoint we use that one. - endpoint_to_connect_to = it->endpoint(); - break; - } + endpoint_sequence->push_back(*it); } - ECAL_SERVICE_LOG_DEBUG(logger_, "Successfully resolved endpoint to [" + endpoint_to_string(endpoint_to_connect_to) + "]. Connecting..."); - const std::lock_guard socket_lock(socket_mutex_); - socket_.async_connect(endpoint_to_connect_to - , service_call_queue_strand_.wrap([me = shared_from_this(), endpoint_to_connect_to](asio::error_code ec) + asio::async_connect(socket_ + , *endpoint_sequence + , service_call_queue_strand_.wrap([me = shared_from_this(), endpoint_sequence](asio::error_code ec, const asio::ip::tcp::endpoint& endpoint) + { + if (ec) + { + const std::string message = "Failed to connect to endpoint [" + me->address_ + ":" + std::to_string(me->port_) + "]: " + ec.message(); + me->logger_(LogLevel::Error, message); + me->handle_connection_loss_error(message); + return; + } + else + { + ECAL_SERVICE_LOG_DEBUG(me->logger_, "Successfully connected to endpoint [" + endpoint.address().to_string() + ":" + std::to_string(endpoint.port()) + "]"); + + // Disable Nagle's algorithm. Nagles Algorithm will otherwise cause the + // Socket to wait for more data, if it encounters a frame that can still + // fit more data. Obviously, this is an awfull default behaviour, if we + // want to transmit our data in a timely fashion. + { + asio::error_code socket_option_ec; { - if (ec) - { - const std::string message = "Failed to connect to endpoint [" + endpoint_to_string(endpoint_to_connect_to) + "]: " + ec.message(); - me->logger_(LogLevel::Error, message); - me->handle_connection_loss_error(message); - return; - } - else - { - ECAL_SERVICE_LOG_DEBUG(me->logger_, "Successfully connected to endpoint [" + endpoint_to_string(endpoint_to_connect_to) + "]"); + const std::lock_guard socket_lock(me->socket_mutex_); + me->socket_.set_option(asio::ip::tcp::no_delay(true), socket_option_ec); + } + if (socket_option_ec) + { + me->logger_(LogLevel::Warning, "[" + get_connection_info_string(me->socket_) + "] " + "Failed setting tcp::no_delay option: " + socket_option_ec.message()); + } + } - // Disable Nagle's algorithm. Nagles Algorithm will otherwise cause the - // Socket to wait for more data, if it encounters a frame that can still - // fit more data. Obviously, this is an awfull default behaviour, if we - // want to transmit our data in a timely fashion. - { - asio::error_code socket_option_ec; - { - const std::lock_guard socket_lock(me->socket_mutex_); - me->socket_.set_option(asio::ip::tcp::no_delay(true), socket_option_ec); - } - if (socket_option_ec) - { - me->logger_(LogLevel::Warning, "[" + get_connection_info_string(me->socket_) + "] " + "Failed setting tcp::no_delay option: " + socket_option_ec.message()); - } - } + const std::string message = "Connected to server. Using protocol version 0."; + me->logger_(LogLevel::Info, "[" + get_connection_info_string(me->socket_) + "] " + message); - const std::string message = "Connected to server. Using protocol version 0."; - me->logger_(LogLevel::Info, "[" + get_connection_info_string(me->socket_) + "] " + message); + { + const std::lock_guard lock(me->service_state_mutex_); + me->state_ = State::CONNECTED; + } - { - const std::lock_guard lock(me->service_state_mutex_); - me->state_ = State::CONNECTED; - } + // Call event callback + me->event_callback_(eCAL::service::ClientEventType::Connected, message); - // Call event callback - me->event_callback_(eCAL::service::ClientEventType::Connected, message); + // Start sending service requests, if there are any + { + const std::lock_guard lock(me->service_state_mutex_); + if (!me->service_call_queue_.empty()) + { + // If there are service calls in the queue, we send the next one. + me->service_call_in_progress_ = true; + me->send_next_service_request(me->service_call_queue_.front().request, me->service_call_queue_.front().response_cb); + me->service_call_queue_.pop_front(); + } + else + { + // If there are no more service calls to send, we go to error-peeking. + // While error peeking we basically do nothing, except from non-destructively + // reading 1 byte from the socket (i.e. without removing it from the socket). + // This will cause asio / the OS to notify us, when the server closed the connection. - // Start sending service requests, if there are any - { - const std::lock_guard lock(me->service_state_mutex_); - if (!me->service_call_queue_.empty()) - { - // If there are service calls in the queue, we send the next one. - me->service_call_in_progress_ = true; - me->send_next_service_request(me->service_call_queue_.front().request, me->service_call_queue_.front().response_cb); - me->service_call_queue_.pop_front(); - } - else - { - // If there are no more service calls to send, we go to error-peeking. - // While error peeking we basically do nothing, except from non-destructively - // reading 1 byte from the socket (i.e. without removing it from the socket). - // This will cause asio / the OS to notify us, when the server closed the connection. - - me->service_call_in_progress_ = false; - me->peek_for_error(); - } - } - } - })); + me->service_call_in_progress_ = false; + me->peek_for_error(); + } + } + } + })); } ////////////////////////////////////// diff --git a/ecal/service/ecal_service/src/client_session_impl_v0.h b/ecal/service/ecal_service/src/client_session_impl_v0.h index c792e83e76..96017f1be3 100644 --- a/ecal/service/ecal_service/src/client_session_impl_v0.h +++ b/ecal/service/ecal_service/src/client_session_impl_v0.h @@ -20,10 +20,13 @@ #pragma once #include "client_session_impl_base.h" +#include #include #include +#include #include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/src/client_session_impl_v1.cpp b/ecal/service/ecal_service/src/client_session_impl_v1.cpp index 9379b48037..ccd493b820 100644 --- a/ecal/service/ecal_service/src/client_session_impl_v1.cpp +++ b/ecal/service/ecal_service/src/client_session_impl_v1.cpp @@ -23,7 +23,14 @@ #include "log_helpers.h" #include "log_defs.h" +#include +#include #include +#include +#include +#include +#include +#include namespace eCAL { @@ -113,57 +120,50 @@ namespace eCAL void ClientSessionV1::connect_to_endpoint(const asio::ip::tcp::resolver::iterator& resolved_endpoints) { - // Look for the best endpoint to connect to. If possible, we use a loopback - // endpoint. Otherwise, we just use the first one. - - auto endpoint_to_connect_to = resolved_endpoints->endpoint(); // Default to first endpoint - for (auto it = resolved_endpoints; it != asio::ip::tcp::resolver::iterator(); it++) + // Convert the resolved_endpoints iterator to an endpoint sequence + // (i.e. a vector of endpoints) + auto endpoint_sequence = std::make_shared>(); + for (auto it = resolved_endpoints; it != asio::ip::tcp::resolver::iterator(); ++it) { - if (it->endpoint().address().is_loopback()) - { - // If we find a loopback endpoint we use that one. - endpoint_to_connect_to = it->endpoint(); - break; - } + endpoint_sequence->push_back(*it); } - ECAL_SERVICE_LOG_DEBUG(logger_, "Successfully resolved endpoint to [" + endpoint_to_string(endpoint_to_connect_to) + "]. Connecting..."); - const std::lock_guard socket_lock(socket_mutex_); - socket_.async_connect(endpoint_to_connect_to - , service_call_queue_strand_.wrap([me = shared_from_this(), endpoint_to_connect_to](asio::error_code ec) - { - if (ec) - { - const std::string message = "Failed to connect to endpoint [" + endpoint_to_string(endpoint_to_connect_to) + "]: " + ec.message(); - me->logger_(LogLevel::Error, message); - me->handle_connection_loss_error(message); - return; - } - else - { - ECAL_SERVICE_LOG_DEBUG(me->logger_, "Successfully connected to endpoint [" + endpoint_to_string(endpoint_to_connect_to) + "]"); + asio::async_connect(socket_ + , *endpoint_sequence + , service_call_queue_strand_.wrap([me = shared_from_this(), endpoint_sequence](asio::error_code ec, const asio::ip::tcp::endpoint& endpoint) + { + if (ec) + { + const std::string message = "Failed to connect to endpoint [" + me->address_ + ":" + std::to_string(me->port_) + "]: " + ec.message(); + me->logger_(LogLevel::Error, message); + me->handle_connection_loss_error(message); + return; + } + else + { + ECAL_SERVICE_LOG_DEBUG(me->logger_, "Successfully connected to endpoint [" + endpoint.address().to_string() + ":" + std::to_string(endpoint.port()) + "]"); - // Disable Nagle's algorithm. Nagles Algorithm will otherwise cause the - // Socket to wait for more data, if it encounters a frame that can still - // fit more data. Obviously, this is an awfull default behaviour, if we - // want to transmit our data in a timely fashion. - { - asio::error_code socket_option_ec; - { - const std::lock_guard socket_lock(me->socket_mutex_); - me->socket_.set_option(asio::ip::tcp::no_delay(true), socket_option_ec); - } - if (socket_option_ec) - { - me->logger_(LogLevel::Warning, "[" + get_connection_info_string(me->socket_) + "] " + "Failed setting tcp::no_delay option: " + socket_option_ec.message()); - } - } + // Disable Nagle's algorithm. Nagles Algorithm will otherwise cause the + // Socket to wait for more data, if it encounters a frame that can still + // fit more data. Obviously, this is an awfull default behaviour, if we + // want to transmit our data in a timely fashion. + { + asio::error_code socket_option_ec; + { + const std::lock_guard socket_lock(me->socket_mutex_); + me->socket_.set_option(asio::ip::tcp::no_delay(true), socket_option_ec); + } + if (socket_option_ec) + { + me->logger_(LogLevel::Warning, "[" + get_connection_info_string(me->socket_) + "] " + "Failed setting tcp::no_delay option: " + socket_option_ec.message()); + } + } - // Start sending the protocol handshake to the server. This will tell us the actual protocol version. - me->send_protocol_handshake_request(); - } - })); + // Start sending the protocol handshake to the server. This will tell us the actual protocol version. + me->send_protocol_handshake_request(); + } + })); } void ClientSessionV1::send_protocol_handshake_request() diff --git a/ecal/service/ecal_service/src/client_session_impl_v1.h b/ecal/service/ecal_service/src/client_session_impl_v1.h index 3f9de5bd5d..ebd1a92529 100644 --- a/ecal/service/ecal_service/src/client_session_impl_v1.h +++ b/ecal/service/ecal_service/src/client_session_impl_v1.h @@ -20,10 +20,14 @@ #pragma once #include "client_session_impl_base.h" +#include +#include #include #include +#include #include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/src/log_helpers.h b/ecal/service/ecal_service/src/log_helpers.h index e4409ab260..9dda632662 100644 --- a/ecal/service/ecal_service/src/log_helpers.h +++ b/ecal/service/ecal_service/src/log_helpers.h @@ -20,6 +20,7 @@ #pragma once #include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/src/protocol_v0.cpp b/ecal/service/ecal_service/src/protocol_v0.cpp index 05650dbd78..54d231b4a4 100644 --- a/ecal/service/ecal_service/src/protocol_v0.cpp +++ b/ecal/service/ecal_service/src/protocol_v0.cpp @@ -20,6 +20,11 @@ #include "protocol_v0.h" #include "protocol_layout.h" +#include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/src/protocol_v0.h b/ecal/service/ecal_service/src/protocol_v0.h index e9a7c84622..d5fb1aeb42 100644 --- a/ecal/service/ecal_service/src/protocol_v0.h +++ b/ecal/service/ecal_service/src/protocol_v0.h @@ -19,11 +19,10 @@ #pragma once -#include -#include -#include #include +#include #include +#include #include diff --git a/ecal/service/ecal_service/src/protocol_v1.cpp b/ecal/service/ecal_service/src/protocol_v1.cpp index fc00787bdd..3ce1395957 100644 --- a/ecal/service/ecal_service/src/protocol_v1.cpp +++ b/ecal/service/ecal_service/src/protocol_v1.cpp @@ -20,6 +20,12 @@ #include "protocol_v1.h" #include "protocol_layout.h" +#include +#include +#include +#include +#include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/src/server.cpp b/ecal/service/ecal_service/src/server.cpp index 6972a2f2ca..c5c4002f15 100644 --- a/ecal/service/ecal_service/src/server.cpp +++ b/ecal/service/ecal_service/src/server.cpp @@ -17,9 +17,11 @@ * ========================= eCAL LICENSE ================================= */ +#include #include #include +#include #include "server_impl.h" diff --git a/ecal/service/ecal_service/src/server_impl.cpp b/ecal/service/ecal_service/src/server_impl.cpp index 027316bcef..28da90c43e 100644 --- a/ecal/service/ecal_service/src/server_impl.cpp +++ b/ecal/service/ecal_service/src/server_impl.cpp @@ -20,6 +20,9 @@ #include "server_impl.h" #include +#include +#include +#include #include "server_session_impl_v1.h" #include "server_session_impl_v0.h" diff --git a/ecal/service/ecal_service/src/server_impl.h b/ecal/service/ecal_service/src/server_impl.h index ba22554dfb..9b33edd76d 100644 --- a/ecal/service/ecal_service/src/server_impl.h +++ b/ecal/service/ecal_service/src/server_impl.h @@ -19,11 +19,13 @@ #pragma once +#include +#include #include -#include #include -#include #include +#include +#include #ifdef _MSC_VER #pragma warning(push) diff --git a/ecal/service/ecal_service/src/server_manager.cpp b/ecal/service/ecal_service/src/server_manager.cpp index ade0f1ee7f..0b462412c9 100644 --- a/ecal/service/ecal_service/src/server_manager.cpp +++ b/ecal/service/ecal_service/src/server_manager.cpp @@ -17,7 +17,12 @@ * ========================= eCAL LICENSE ================================= */ +#include +#include #include +#include +#include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/src/server_session_impl_base.h b/ecal/service/ecal_service/src/server_session_impl_base.h index 358e40a469..1d84acf6c2 100644 --- a/ecal/service/ecal_service/src/server_session_impl_base.h +++ b/ecal/service/ecal_service/src/server_session_impl_base.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #ifdef _MSC_VER diff --git a/ecal/service/ecal_service/src/server_session_impl_v0.cpp b/ecal/service/ecal_service/src/server_session_impl_v0.cpp index 1d971b44fc..bb984839e0 100644 --- a/ecal/service/ecal_service/src/server_session_impl_v0.cpp +++ b/ecal/service/ecal_service/src/server_session_impl_v0.cpp @@ -23,6 +23,12 @@ #include "log_defs.h" #include "protocol_layout.h" +#include +#include +#include +#include +#include +#include /////////////////////////////////////////////// // Create, Constructor, Destructor diff --git a/ecal/service/ecal_service/src/server_session_impl_v0.h b/ecal/service/ecal_service/src/server_session_impl_v0.h index 0c39e6bb43..cffeda48a0 100644 --- a/ecal/service/ecal_service/src/server_session_impl_v0.h +++ b/ecal/service/ecal_service/src/server_session_impl_v0.h @@ -20,10 +20,14 @@ #pragma once #include "server_session_impl_base.h" +#include +#include #include #include #include +#include +#include namespace eCAL { diff --git a/ecal/service/ecal_service/src/server_session_impl_v1.cpp b/ecal/service/ecal_service/src/server_session_impl_v1.cpp index 981b7d0c15..3633a2445c 100644 --- a/ecal/service/ecal_service/src/server_session_impl_v1.cpp +++ b/ecal/service/ecal_service/src/server_session_impl_v1.cpp @@ -21,8 +21,14 @@ #include "protocol_v1.h" -#include "log_helpers.h" #include "log_defs.h" +#include "log_helpers.h" +#include +#include +#include +#include +#include +#include /////////////////////////////////////////////// // Create, Constructor, Destructor diff --git a/ecal/service/ecal_service/src/server_session_impl_v1.h b/ecal/service/ecal_service/src/server_session_impl_v1.h index 87164ba28d..d61e2ecc1e 100644 --- a/ecal/service/ecal_service/src/server_session_impl_v1.h +++ b/ecal/service/ecal_service/src/server_session_impl_v1.h @@ -20,10 +20,14 @@ #pragma once #include "server_session_impl_base.h" +#include +#include #include #include #include +#include +#include namespace eCAL { diff --git a/ecal/service/test/src/ecal_tcp_service_test.cpp b/ecal/service/test/src/ecal_tcp_service_test.cpp index 6b44026678..e4bf48042f 100644 --- a/ecal/service/test/src/ecal_tcp_service_test.cpp +++ b/ecal/service/test/src/ecal_tcp_service_test.cpp @@ -21,10 +21,11 @@ #include -#include #include -#include #include +#include +#include +#include #include // Should not be needed, when I use the server manager / client manager #include // Should not be needed, when I use the server manager / client manager