From 8bbd25fdc38e6de750b1885bc88fcebda270c7e4 Mon Sep 17 00:00:00 2001 From: Rex Schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Thu, 23 Nov 2023 11:07:29 +0100 Subject: [PATCH] core: cleanup core folder structure (#1269) --- ecal/core/CMakeLists.txt | 169 +++++++++++------- ecal/core/src/{ => config}/ecal_config.cpp | 0 .../src/{ => config}/ecal_config_reader.cpp | 2 +- .../src/{ => config}/ecal_config_reader.h | 0 .../src/{ => config}/ecal_config_reader_hlp.h | 0 ecal/core/src/ecal.cpp | 2 +- ecal/core/src/ecal_descgate.h | 2 +- ecal/core/src/ecal_globals.cpp | 2 +- ecal/core/src/ecal_globals.h | 10 +- ecal/core/src/ecal_process.cpp | 6 +- ecal/core/src/ecal_util.cpp | 4 +- .../src/io/mtx/linux/ecal_named_mutex_impl.h | 2 +- .../ecal_named_mutex_robust_clocklock_impl.h | 2 +- .../src/io/mtx/win32/ecal_named_mutex_impl.h | 2 +- .../core/src/io/shm/linux/ecal_memfile_os.cpp | 2 +- .../core/src/io/shm/win32/ecal_memfile_os.cpp | 2 +- ecal/core/src/io/udp/rcv_sample.h | 2 +- ecal/core/src/io/udp/udp_receiver_npcap.h | 2 +- ecal/core/src/{ => logging}/ecal_log.cpp | 0 ecal/core/src/{ => logging}/ecal_log_impl.cpp | 0 ecal/core/src/{ => logging}/ecal_log_impl.h | 0 .../ecal_monitoring_def.cpp | 0 .../{mon => monitoring}/ecal_monitoring_def.h | 0 .../ecal_monitoring_impl.cpp | 4 +- .../ecal_monitoring_impl.h | 2 +- .../ecal_monitoring_threads.cpp | 0 .../ecal_monitoring_threads.h | 2 +- ecal/core/src/pubsub/ecal_pubgate.cpp | 2 +- ecal/core/src/pubsub/ecal_publisher.cpp | 4 +- ecal/core/src/pubsub/ecal_subgate.h | 2 +- .../ecal_buffer_payload_writer.h | 0 ecal/core/src/readwrite/ecal_reader.cpp | 8 +- ecal/core/src/readwrite/ecal_reader.h | 2 +- ecal/core/src/readwrite/ecal_writer.cpp | 6 +- ecal/core/src/readwrite/ecal_writer.h | 10 +- .../{ => inproc}/ecal_writer_inproc.cpp | 2 +- .../{ => inproc}/ecal_writer_inproc.h | 0 .../readwrite/{ => shm}/ecal_reader_shm.cpp | 2 +- .../src/readwrite/{ => shm}/ecal_reader_shm.h | 0 .../readwrite/{ => shm}/ecal_writer_shm.cpp | 2 +- .../src/readwrite/{ => shm}/ecal_writer_shm.h | 0 .../readwrite/{ => tcp}/ecal_reader_tcp.cpp | 4 +- .../src/readwrite/{ => tcp}/ecal_reader_tcp.h | 0 .../{ => tcp}/ecal_tcp_pubsub_logger.h | 0 .../readwrite/{ => tcp}/ecal_writer_tcp.cpp | 6 +- .../src/readwrite/{ => tcp}/ecal_writer_tcp.h | 0 .../{ => udp}/ecal_reader_udp_mc.cpp | 2 +- .../readwrite/{ => udp}/ecal_reader_udp_mc.h | 0 .../{ => udp}/ecal_writer_udp_mc.cpp | 0 .../readwrite/{ => udp}/ecal_writer_udp_mc.h | 0 .../ecal_registration_provider.cpp | 0 .../ecal_registration_provider.h | 2 +- .../ecal_registration_receiver.cpp | 0 .../ecal_registration_receiver.h | 2 +- ecal/core/src/service/ecal_clientgate.h | 2 +- .../src/service/ecal_service_client_impl.cpp | 2 +- .../src/service/ecal_service_server_impl.cpp | 2 +- ecal/core/src/{ => time}/ecal_time.cpp | 0 ecal/core/src/{ => time}/ecal_timegate.cpp | 4 +- ecal/core/src/{ => time}/ecal_timegate.h | 0 ecal/core/src/{ => time}/ecal_timer.cpp | 0 .../advanced_tclap_output.cpp | 2 +- .../advanced_tclap_output.h | 0 ecal/core/src/{ => util}/convert_utf.cpp | 0 ecal/core/src/{ => util}/convert_utf.h | 0 ecal/core/src/{ => util}/ecal_expmap.h | 0 ecal/core/src/{ => util}/ecal_thread.cpp | 0 ecal/core/src/{ => util}/ecal_thread.h | 0 ecal/core/src/{ => util}/getenvvar.h | 0 ecal/core/src/{ => util}/sys_usage.cpp | 0 ecal/core/src/{ => util}/sys_usage.h | 0 testing/ecal/expmap_test/src/expmap_test.cpp | 2 +- 72 files changed, 169 insertions(+), 120 deletions(-) rename ecal/core/src/{ => config}/ecal_config.cpp (100%) rename ecal/core/src/{ => config}/ecal_config_reader.cpp (99%) rename ecal/core/src/{ => config}/ecal_config_reader.h (100%) rename ecal/core/src/{ => config}/ecal_config_reader_hlp.h (100%) rename ecal/core/src/{ => logging}/ecal_log.cpp (100%) rename ecal/core/src/{ => logging}/ecal_log_impl.cpp (100%) rename ecal/core/src/{ => logging}/ecal_log_impl.h (100%) rename ecal/core/src/{mon => monitoring}/ecal_monitoring_def.cpp (100%) rename ecal/core/src/{mon => monitoring}/ecal_monitoring_def.h (100%) rename ecal/core/src/{mon => monitoring}/ecal_monitoring_impl.cpp (99%) rename ecal/core/src/{mon => monitoring}/ecal_monitoring_impl.h (99%) rename ecal/core/src/{mon => monitoring}/ecal_monitoring_threads.cpp (100%) rename ecal/core/src/{mon => monitoring}/ecal_monitoring_threads.h (98%) rename ecal/core/src/{ => readwrite}/ecal_buffer_payload_writer.h (100%) rename ecal/core/src/readwrite/{ => inproc}/ecal_writer_inproc.cpp (98%) rename ecal/core/src/readwrite/{ => inproc}/ecal_writer_inproc.h (100%) rename ecal/core/src/readwrite/{ => shm}/ecal_reader_shm.cpp (99%) rename ecal/core/src/readwrite/{ => shm}/ecal_reader_shm.h (100%) rename ecal/core/src/readwrite/{ => shm}/ecal_writer_shm.cpp (99%) rename ecal/core/src/readwrite/{ => shm}/ecal_writer_shm.h (100%) rename ecal/core/src/readwrite/{ => tcp}/ecal_reader_tcp.cpp (98%) rename ecal/core/src/readwrite/{ => tcp}/ecal_reader_tcp.h (100%) rename ecal/core/src/readwrite/{ => tcp}/ecal_tcp_pubsub_logger.h (100%) rename ecal/core/src/readwrite/{ => tcp}/ecal_writer_tcp.cpp (98%) rename ecal/core/src/readwrite/{ => tcp}/ecal_writer_tcp.h (100%) rename ecal/core/src/readwrite/{ => udp}/ecal_reader_udp_mc.cpp (98%) rename ecal/core/src/readwrite/{ => udp}/ecal_reader_udp_mc.h (100%) rename ecal/core/src/readwrite/{ => udp}/ecal_writer_udp_mc.cpp (100%) rename ecal/core/src/readwrite/{ => udp}/ecal_writer_udp_mc.h (100%) rename ecal/core/src/{ => registration}/ecal_registration_provider.cpp (100%) rename ecal/core/src/{ => registration}/ecal_registration_provider.h (99%) rename ecal/core/src/{ => registration}/ecal_registration_receiver.cpp (100%) rename ecal/core/src/{ => registration}/ecal_registration_receiver.h (99%) rename ecal/core/src/{ => time}/ecal_time.cpp (100%) rename ecal/core/src/{ => time}/ecal_timegate.cpp (99%) rename ecal/core/src/{ => time}/ecal_timegate.h (100%) rename ecal/core/src/{ => time}/ecal_timer.cpp (100%) rename ecal/core/src/{custom_tclap => util}/advanced_tclap_output.cpp (99%) rename ecal/core/src/{custom_tclap => util}/advanced_tclap_output.h (100%) rename ecal/core/src/{ => util}/convert_utf.cpp (100%) rename ecal/core/src/{ => util}/convert_utf.h (100%) rename ecal/core/src/{ => util}/ecal_expmap.h (100%) rename ecal/core/src/{ => util}/ecal_thread.cpp (100%) rename ecal/core/src/{ => util}/ecal_thread.h (100%) rename ecal/core/src/{ => util}/getenvvar.h (100%) rename ecal/core/src/{ => util}/sys_usage.cpp (100%) rename ecal/core/src/{ => util}/sys_usage.h (100%) diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt index 6369432767..814d7270b2 100644 --- a/ecal/core/CMakeLists.txt +++ b/ecal/core/CMakeLists.txt @@ -57,13 +57,14 @@ if(UNIX) endif() endif() - ###################################### -# custom_tclap +# config ###################################### -set(ecal_custom_tclap_src - src/custom_tclap/advanced_tclap_output.cpp - src/custom_tclap/advanced_tclap_output.h +set(ecal_config_src + src/config/ecal_config.cpp + src/config/ecal_config_reader.cpp + src/config/ecal_config_reader.h + src/config/ecal_config_reader_hlp.h ) ###################################### @@ -174,15 +175,24 @@ if(UNIX) endif() ###################################### -# mon +# logging ###################################### -set(ecal_mon_src - src/mon/ecal_monitoring_def.cpp - src/mon/ecal_monitoring_impl.cpp - src/mon/ecal_monitoring_threads.cpp - src/mon/ecal_monitoring_def.h - src/mon/ecal_monitoring_impl.h - src/mon/ecal_monitoring_threads.h +set(ecal_logging_src + src/logging/ecal_log.cpp + src/logging/ecal_log_impl.cpp + src/logging/ecal_log_impl.h +) + +###################################### +# monitoring +###################################### +set(ecal_monitoring_src + src/monitoring/ecal_monitoring_def.cpp + src/monitoring/ecal_monitoring_impl.cpp + src/monitoring/ecal_monitoring_threads.cpp + src/monitoring/ecal_monitoring_def.h + src/monitoring/ecal_monitoring_impl.h + src/monitoring/ecal_monitoring_threads.h ) ###################################### @@ -202,29 +212,52 @@ set(ecal_pubsub_src # readwrite ###################################### set(ecal_readwrite_src + src/readwrite/ecal_buffer_payload_writer.h src/readwrite/ecal_reader.cpp - src/readwrite/ecal_reader_udp_mc.cpp - src/readwrite/ecal_reader_tcp.cpp - src/readwrite/ecal_writer.cpp - src/readwrite/ecal_writer_inproc.cpp - src/readwrite/ecal_writer_udp_mc.cpp - src/readwrite/ecal_writer_tcp.cpp - src/readwrite/ecal_reader_shm.cpp - src/readwrite/ecal_writer_shm.cpp src/readwrite/ecal_reader.h src/readwrite/ecal_reader_layer.h - src/readwrite/ecal_reader_tcp.h - src/readwrite/ecal_reader_udp_mc.h + src/readwrite/ecal_writer.cpp src/readwrite/ecal_writer.h src/readwrite/ecal_writer_base.h src/readwrite/ecal_writer_data.h src/readwrite/ecal_writer_info.h - src/readwrite/ecal_writer_inproc.h - src/readwrite/ecal_writer_tcp.h - src/readwrite/ecal_writer_udp_mc.h - src/readwrite/ecal_tcp_pubsub_logger.h - src/readwrite/ecal_reader_shm.h - src/readwrite/ecal_writer_shm.h +) + +set(ecal_readwrite_inproc_src + src/readwrite/inproc/ecal_writer_inproc.cpp + src/readwrite/inproc/ecal_writer_inproc.h +) + +set(ecal_readwrite_shm_src + src/readwrite/shm/ecal_reader_shm.cpp + src/readwrite/shm/ecal_reader_shm.h + src/readwrite/shm/ecal_writer_shm.cpp + src/readwrite/shm/ecal_writer_shm.h +) + +set(ecal_readwrite_tcp_src + src/readwrite/tcp/ecal_reader_tcp.cpp + src/readwrite/tcp/ecal_reader_tcp.h + src/readwrite/tcp/ecal_tcp_pubsub_logger.h + src/readwrite/tcp/ecal_writer_tcp.cpp + src/readwrite/tcp/ecal_writer_tcp.h +) + +set(ecal_readwrite_udp_src + src/readwrite/udp/ecal_reader_udp_mc.cpp + src/readwrite/udp/ecal_reader_udp_mc.h + src/readwrite/udp/ecal_writer_udp_mc.cpp + src/readwrite/udp/ecal_writer_udp_mc.h +) + +###################################### +# registration +###################################### +set(ecal_registration_src + src/registration/ecal_registration_provider.cpp + src/registration/ecal_registration_provider.h + src/registration/ecal_registration_receiver.cpp + src/registration/ecal_registration_receiver.h ) ###################################### @@ -245,49 +278,51 @@ set(ecal_service_src src/service/ecal_service_singleton_manager.h ) +###################################### +# time +###################################### +set(ecal_time_src + src/time/ecal_time.cpp + src/time/ecal_timegate.cpp + src/time/ecal_timegate.h + src/time/ecal_timer.cpp +) + +###################################### +# util +###################################### +set(ecal_util_src + src/util/advanced_tclap_output.cpp + src/util/advanced_tclap_output.h + src/util/convert_utf.cpp + src/util/convert_utf.h + src/util/ecal_expmap.h + src/util/ecal_thread.cpp + src/util/ecal_thread.h + src/util/getenvvar.h + src/util/sys_usage.cpp + src/util/sys_usage.h +) + ###################################### # common ###################################### set(ecal_cmn_src - src/convert_utf.cpp src/ecal.cpp src/ecal_clang.cpp - src/ecal_config.cpp - src/ecal_config_reader.cpp src/ecal_descgate.cpp src/ecal_event.cpp src/ecal_global_accessors.cpp src/ecal_globals.cpp - src/ecal_log.cpp - src/ecal_log_impl.cpp src/ecal_process.cpp - src/ecal_registration_provider.cpp - src/ecal_registration_receiver.cpp - src/ecal_thread.cpp - src/ecal_time.cpp - src/ecal_timegate.cpp - src/ecal_timer.cpp src/ecal_util.cpp src/ecalc.cpp - src/sys_usage.cpp - src/convert_utf.h - src/ecal_buffer_payload_writer.h - src/ecal_config_reader.h - src/ecal_config_reader_hlp.h src/ecal_def.h src/ecal_def_ini.h src/ecal_descgate.h - src/ecal_expmap.h src/ecal_global_accessors.h src/ecal_globals.h - src/ecal_log_impl.h - src/ecal_registration_provider.h - src/ecal_registration_receiver.h src/ecal_sample_to_topicinfo.h - src/ecal_thread.h - src/ecal_timegate.h - src/getenvvar.h - src/sys_usage.h src/topic2mcast.h ) if (WIN32) @@ -322,7 +357,6 @@ set(ecal_header_cmn include/ecal/ecal.h include/ecal/ecal_callback.h include/ecal/ecal_clang.h - include/ecal/ecal_config.h include/ecal/ecal_client.h include/ecal/ecal_config.h include/ecal/ecal_core.h @@ -407,7 +441,7 @@ set(ecal_header_public ) ecal_add_ecal_shared_library(${PROJECT_NAME} - ${ecal_custom_tclap_src} + ${ecal_config_src} ${ecal_io_mtx_src} ${ecal_io_mtx_linux_src} ${ecal_io_mtx_win_src} @@ -416,17 +450,25 @@ ecal_add_ecal_shared_library(${PROJECT_NAME} ${ecal_io_shm_win_src} ${ecal_io_udp_src} ${ecal_io_udp_linux_src} - ${ecal_mon_src} + ${ecal_logging_src} + ${ecal_monitoring_src} ${ecal_pubsub_src} ${ecal_readwrite_src} + ${ecal_readwrite_inproc_src} + ${ecal_readwrite_shm_src} + ${ecal_readwrite_tcp_src} + ${ecal_readwrite_udp_src} + ${ecal_registration_src} ${ecal_service_src} + ${ecal_time_src} + ${ecal_util_src} ${ecal_cmn_src} ${ecal_header_public} ${CMAKE_CURRENT_BINARY_DIR}/include/ecal/ecal_defs.h ) if(UNIX) - set_source_files_properties(src/convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough) + set_source_files_properties(src/util/convert_utf.cpp PROPERTIES COMPILE_FLAGS -Wno-implicit-fallthrough) endif() ecal_add_ecal_shared_library(${PROJECT_NAME}_c ${ecal_c_src} ${ecal_c_win_src}) @@ -518,8 +560,7 @@ install(DIRECTORY if(NOT ${CMAKE_VERSION} VERSION_LESS "3.8.0") source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}" FILES - ${ecal_custom_tclap_src} - ${ecal_io_cpp_src} + ${ecal_config_src} ${ecal_io_mtx_src} ${ecal_io_mtx_linux_src} ${ecal_io_mtx_win_src} @@ -527,10 +568,18 @@ if(NOT ${CMAKE_VERSION} VERSION_LESS "3.8.0") ${ecal_io_shm_linux_src} ${ecal_io_shm_win_src} ${ecal_io_udp_src} - ${ecal_mon_src} + ${ecal_logging_src} + ${ecal_monitoring_src} ${ecal_pubsub_src} ${ecal_readwrite_src} + ${ecal_readwrite_inproc_src} + ${ecal_readwrite_shm_src} + ${ecal_readwrite_tcp_src} + ${ecal_readwrite_udp_src} + ${ecal_registration_src} ${ecal_service_src} + ${ecal_time_src} + ${ecal_util_src} ${ecal_cmn_src} ${ecal_c_src} ${ecal_c_win_src} diff --git a/ecal/core/src/ecal_config.cpp b/ecal/core/src/config/ecal_config.cpp similarity index 100% rename from ecal/core/src/ecal_config.cpp rename to ecal/core/src/config/ecal_config.cpp diff --git a/ecal/core/src/ecal_config_reader.cpp b/ecal/core/src/config/ecal_config_reader.cpp similarity index 99% rename from ecal/core/src/ecal_config_reader.cpp rename to ecal/core/src/config/ecal_config_reader.cpp index fb0cc3a519..a5406c1dcf 100644 --- a/ecal/core/src/ecal_config_reader.cpp +++ b/ecal/core/src/config/ecal_config_reader.cpp @@ -27,7 +27,7 @@ #include "ecal_def.h" #include "ecal_config_reader.h" #include "ecal_global_accessors.h" -#include "getenvvar.h" +#include "util/getenvvar.h" #include #include diff --git a/ecal/core/src/ecal_config_reader.h b/ecal/core/src/config/ecal_config_reader.h similarity index 100% rename from ecal/core/src/ecal_config_reader.h rename to ecal/core/src/config/ecal_config_reader.h diff --git a/ecal/core/src/ecal_config_reader_hlp.h b/ecal/core/src/config/ecal_config_reader_hlp.h similarity index 100% rename from ecal/core/src/ecal_config_reader_hlp.h rename to ecal/core/src/config/ecal_config_reader_hlp.h diff --git a/ecal/core/src/ecal.cpp b/ecal/core/src/ecal.cpp index 2071d011dc..a4c7ee299d 100644 --- a/ecal/core/src/ecal.cpp +++ b/ecal/core/src/ecal.cpp @@ -24,7 +24,7 @@ #include "ecal_globals.h" #include -#include +#include "util/advanced_tclap_output.h" namespace eCAL { diff --git a/ecal/core/src/ecal_descgate.h b/ecal/core/src/ecal_descgate.h index 93470d6b34..9a4f162eb0 100644 --- a/ecal/core/src/ecal_descgate.h +++ b/ecal/core/src/ecal_descgate.h @@ -28,7 +28,7 @@ #include "ecal_global_accessors.h" #include "ecal_def.h" -#include "ecal_expmap.h" +#include "util/ecal_expmap.h" #include #include diff --git a/ecal/core/src/ecal_globals.cpp b/ecal/core/src/ecal_globals.cpp index 47197b7fd3..fb12903713 100644 --- a/ecal/core/src/ecal_globals.cpp +++ b/ecal/core/src/ecal_globals.cpp @@ -23,7 +23,7 @@ #include "ecal_globals.h" #include "io/udp/udp_init.h" -#include "ecal_config_reader.h" +#include "config/ecal_config_reader.h" #include diff --git a/ecal/core/src/ecal_globals.h b/ecal/core/src/ecal_globals.h index a149e7d715..21a5ecf107 100644 --- a/ecal/core/src/ecal_globals.h +++ b/ecal/core/src/ecal_globals.h @@ -24,12 +24,12 @@ #pragma once #include "ecal_global_accessors.h" -#include "ecal_registration_provider.h" -#include "ecal_registration_receiver.h" +#include "registration/ecal_registration_provider.h" +#include "registration/ecal_registration_receiver.h" #include "ecal_descgate.h" -#include "ecal_timegate.h" -#include "ecal_log_impl.h" -#include "mon/ecal_monitoring_def.h" +#include "time/ecal_timegate.h" +#include "logging/ecal_log_impl.h" +#include "monitoring/ecal_monitoring_def.h" #include "pubsub/ecal_pubgate.h" #include "pubsub/ecal_subgate.h" #include "service/ecal_servicegate.h" diff --git a/ecal/core/src/ecal_process.cpp b/ecal/core/src/ecal_process.cpp index 01dd91d714..f631a201c6 100644 --- a/ecal/core/src/ecal_process.cpp +++ b/ecal/core/src/ecal_process.cpp @@ -25,8 +25,8 @@ #include #include "ecal_def.h" -#include "ecal_config_reader_hlp.h" -#include "ecal_registration_receiver.h" +#include "config/ecal_config_reader_hlp.h" +#include "registration/ecal_registration_receiver.h" #include "ecal_globals.h" #include "ecal_process.h" #include "io/udp/udp_configurations.h" @@ -40,7 +40,7 @@ #include #include -#include "sys_usage.h" +#include "util/sys_usage.h" #include #include diff --git a/ecal/core/src/ecal_util.cpp b/ecal/core/src/ecal_util.cpp index aa18a13118..f85760bb4d 100644 --- a/ecal/core/src/ecal_util.cpp +++ b/ecal/core/src/ecal_util.cpp @@ -25,9 +25,9 @@ #include "ecal_event_internal.h" #include "ecal_descgate.h" #include "ecal_process.h" -#include "ecal_registration_receiver.h" +#include "registration/ecal_registration_receiver.h" #include "pubsub/ecal_pubgate.h" -#include "mon/ecal_monitoring_def.h" +#include "monitoring/ecal_monitoring_def.h" #include #include 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 6e111bec47..16fba6c6ee 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 @@ -23,7 +23,7 @@ #pragma once -#include "../ecal_named_mutex_base.h" +#include "io/mtx/ecal_named_mutex_base.h" 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 453294322c..81e676900e 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 @@ -23,7 +23,7 @@ #pragma once -#include "../ecal_named_mutex_base.h" +#include "io/mtx/ecal_named_mutex_base.h" typedef struct named_mutex named_mutex_t; diff --git a/ecal/core/src/io/mtx/win32/ecal_named_mutex_impl.h b/ecal/core/src/io/mtx/win32/ecal_named_mutex_impl.h index 56459ae6b7..625ab6b5f1 100644 --- a/ecal/core/src/io/mtx/win32/ecal_named_mutex_impl.h +++ b/ecal/core/src/io/mtx/win32/ecal_named_mutex_impl.h @@ -23,7 +23,7 @@ #pragma once -#include "../ecal_named_mutex_base.h" +#include "io/mtx/ecal_named_mutex_base.h" namespace eCAL { 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 5d2fb89132..5a80490882 100644 --- a/ecal/core/src/io/shm/linux/ecal_memfile_os.cpp +++ b/ecal/core/src/io/shm/linux/ecal_memfile_os.cpp @@ -21,7 +21,7 @@ * @brief memory file utility functions for posix platform **/ -#include "../ecal_memfile.h" +#include "io/shm/ecal_memfile.h" #include #include diff --git a/ecal/core/src/io/shm/win32/ecal_memfile_os.cpp b/ecal/core/src/io/shm/win32/ecal_memfile_os.cpp index 336d0db6d9..58c3b90e0a 100644 --- a/ecal/core/src/io/shm/win32/ecal_memfile_os.cpp +++ b/ecal/core/src/io/shm/win32/ecal_memfile_os.cpp @@ -21,7 +21,7 @@ * @brief memory file utility functions for windows platform **/ -#include "../ecal_memfile.h" +#include "io/shm/ecal_memfile.h" namespace eCAL { diff --git a/ecal/core/src/io/udp/rcv_sample.h b/ecal/core/src/io/udp/rcv_sample.h index 9374cb1860..b3cb2b02d0 100644 --- a/ecal/core/src/io/udp/rcv_sample.h +++ b/ecal/core/src/io/udp/rcv_sample.h @@ -25,7 +25,7 @@ #include "ecal_def.h" #include "udp_receiver.h" -#include "ecal_thread.h" +#include "util/ecal_thread.h" #include "msg_type.h" #include diff --git a/ecal/core/src/io/udp/udp_receiver_npcap.h b/ecal/core/src/io/udp/udp_receiver_npcap.h index fa20d04210..c678dd1613 100644 --- a/ecal/core/src/io/udp/udp_receiver_npcap.h +++ b/ecal/core/src/io/udp/udp_receiver_npcap.h @@ -22,7 +22,7 @@ #include "io/udp/udp_receiver_base.h" -#include "ecal_config_reader_hlp.h" +#include "config/ecal_config_reader_hlp.h" #include #include diff --git a/ecal/core/src/ecal_log.cpp b/ecal/core/src/logging/ecal_log.cpp similarity index 100% rename from ecal/core/src/ecal_log.cpp rename to ecal/core/src/logging/ecal_log.cpp diff --git a/ecal/core/src/ecal_log_impl.cpp b/ecal/core/src/logging/ecal_log_impl.cpp similarity index 100% rename from ecal/core/src/ecal_log_impl.cpp rename to ecal/core/src/logging/ecal_log_impl.cpp diff --git a/ecal/core/src/ecal_log_impl.h b/ecal/core/src/logging/ecal_log_impl.h similarity index 100% rename from ecal/core/src/ecal_log_impl.h rename to ecal/core/src/logging/ecal_log_impl.h diff --git a/ecal/core/src/mon/ecal_monitoring_def.cpp b/ecal/core/src/monitoring/ecal_monitoring_def.cpp similarity index 100% rename from ecal/core/src/mon/ecal_monitoring_def.cpp rename to ecal/core/src/monitoring/ecal_monitoring_def.cpp diff --git a/ecal/core/src/mon/ecal_monitoring_def.h b/ecal/core/src/monitoring/ecal_monitoring_def.h similarity index 100% rename from ecal/core/src/mon/ecal_monitoring_def.h rename to ecal/core/src/monitoring/ecal_monitoring_def.h diff --git a/ecal/core/src/mon/ecal_monitoring_impl.cpp b/ecal/core/src/monitoring/ecal_monitoring_impl.cpp similarity index 99% rename from ecal/core/src/mon/ecal_monitoring_impl.cpp rename to ecal/core/src/monitoring/ecal_monitoring_impl.cpp index 109c7a843b..addaff80fa 100644 --- a/ecal/core/src/mon/ecal_monitoring_impl.cpp +++ b/ecal/core/src/monitoring/ecal_monitoring_impl.cpp @@ -24,12 +24,12 @@ #include #include -#include "ecal_config_reader_hlp.h" +#include "config/ecal_config_reader_hlp.h" #include "ecal_monitoring_impl.h" #include -#include "../ecal_registration_receiver.h" +#include "registration/ecal_registration_receiver.h" namespace eCAL diff --git a/ecal/core/src/mon/ecal_monitoring_impl.h b/ecal/core/src/monitoring/ecal_monitoring_impl.h similarity index 99% rename from ecal/core/src/mon/ecal_monitoring_impl.h rename to ecal/core/src/monitoring/ecal_monitoring_impl.h index a0e7392829..8377b35c54 100644 --- a/ecal/core/src/mon/ecal_monitoring_impl.h +++ b/ecal/core/src/monitoring/ecal_monitoring_impl.h @@ -26,7 +26,7 @@ #include #include "ecal_monitoring_threads.h" -#include "ecal_expmap.h" +#include "util/ecal_expmap.h" #include "io/udp/rcv_sample.h" #include diff --git a/ecal/core/src/mon/ecal_monitoring_threads.cpp b/ecal/core/src/monitoring/ecal_monitoring_threads.cpp similarity index 100% rename from ecal/core/src/mon/ecal_monitoring_threads.cpp rename to ecal/core/src/monitoring/ecal_monitoring_threads.cpp diff --git a/ecal/core/src/mon/ecal_monitoring_threads.h b/ecal/core/src/monitoring/ecal_monitoring_threads.h similarity index 98% rename from ecal/core/src/mon/ecal_monitoring_threads.h rename to ecal/core/src/monitoring/ecal_monitoring_threads.h index 4ff69c0ea6..b139180c83 100644 --- a/ecal/core/src/mon/ecal_monitoring_threads.h +++ b/ecal/core/src/monitoring/ecal_monitoring_threads.h @@ -26,7 +26,7 @@ #include #include -#include "ecal_thread.h" +#include "util/ecal_thread.h" #include "io/udp/udp_receiver.h" #ifdef _MSC_VER diff --git a/ecal/core/src/pubsub/ecal_pubgate.cpp b/ecal/core/src/pubsub/ecal_pubgate.cpp index 3e239a10b5..28d59200c7 100644 --- a/ecal/core/src/pubsub/ecal_pubgate.cpp +++ b/ecal/core/src/pubsub/ecal_pubgate.cpp @@ -21,7 +21,7 @@ * @brief eCAL publisher gateway class **/ -#include "ecal_config_reader_hlp.h" +#include "config/ecal_config_reader_hlp.h" #include "ecal_pubgate.h" #include "ecal_descgate.h" #include "ecal_sample_to_topicinfo.h" diff --git a/ecal/core/src/pubsub/ecal_publisher.cpp b/ecal/core/src/pubsub/ecal_publisher.cpp index 3e04d07ff3..df1b34babb 100644 --- a/ecal/core/src/pubsub/ecal_publisher.cpp +++ b/ecal/core/src/pubsub/ecal_publisher.cpp @@ -25,8 +25,8 @@ #include #include -#include "ecal_config_reader_hlp.h" -#include "ecal_buffer_payload_writer.h" +#include "config/ecal_config_reader_hlp.h" +#include "readwrite/ecal_buffer_payload_writer.h" #include "ecal_globals.h" #include "readwrite/ecal_writer.h" diff --git a/ecal/core/src/pubsub/ecal_subgate.h b/ecal/core/src/pubsub/ecal_subgate.h index 74712e9829..0593179f75 100644 --- a/ecal/core/src/pubsub/ecal_subgate.h +++ b/ecal/core/src/pubsub/ecal_subgate.h @@ -23,7 +23,7 @@ #pragma once -#include "ecal_thread.h" +#include "util/ecal_thread.h" #include "readwrite/ecal_reader.h" diff --git a/ecal/core/src/ecal_buffer_payload_writer.h b/ecal/core/src/readwrite/ecal_buffer_payload_writer.h similarity index 100% rename from ecal/core/src/ecal_buffer_payload_writer.h rename to ecal/core/src/readwrite/ecal_buffer_payload_writer.h diff --git a/ecal/core/src/readwrite/ecal_reader.cpp b/ecal/core/src/readwrite/ecal_reader.cpp index d870667692..0b44ca0080 100644 --- a/ecal/core/src/readwrite/ecal_reader.cpp +++ b/ecal/core/src/readwrite/ecal_reader.cpp @@ -25,14 +25,14 @@ #include #include "ecal_def.h" -#include "ecal_registration_provider.h" +#include "registration/ecal_registration_provider.h" #include "ecal_descgate.h" #include "ecal_reader.h" #include "ecal_process.h" -#include "readwrite/ecal_reader_udp_mc.h" -#include "readwrite/ecal_reader_shm.h" -#include "readwrite/ecal_reader_tcp.h" +#include "readwrite/udp/ecal_reader_udp_mc.h" +#include "readwrite/shm/ecal_reader_shm.h" +#include "readwrite/tcp/ecal_reader_tcp.h" #include #include diff --git a/ecal/core/src/readwrite/ecal_reader.h b/ecal/core/src/readwrite/ecal_reader.h index d36cef2ca7..90ef62f798 100644 --- a/ecal/core/src/readwrite/ecal_reader.h +++ b/ecal/core/src/readwrite/ecal_reader.h @@ -35,7 +35,7 @@ #pragma warning(pop) #endif -#include "ecal_expmap.h" +#include "util/ecal_expmap.h" #include #include diff --git a/ecal/core/src/readwrite/ecal_writer.cpp b/ecal/core/src/readwrite/ecal_writer.cpp index aa289ffcdb..c1502cab32 100644 --- a/ecal/core/src/readwrite/ecal_writer.cpp +++ b/ecal/core/src/readwrite/ecal_writer.cpp @@ -27,10 +27,10 @@ #include "ecal_def.h" #include "ecal_buffer_payload_writer.h" -#include "ecal_config_reader_hlp.h" +#include "config/ecal_config_reader_hlp.h" -#include "ecal_registration_provider.h" -#include "ecal_registration_receiver.h" +#include "registration/ecal_registration_provider.h" +#include "registration/ecal_registration_receiver.h" #include "ecal_writer.h" #include "ecal_writer_base.h" diff --git a/ecal/core/src/readwrite/ecal_writer.h b/ecal/core/src/readwrite/ecal_writer.h index ec0661c601..cd5b0f6f94 100644 --- a/ecal/core/src/readwrite/ecal_writer.h +++ b/ecal/core/src/readwrite/ecal_writer.h @@ -29,12 +29,12 @@ #include #include "ecal_def.h" -#include "ecal_expmap.h" +#include "util/ecal_expmap.h" -#include "ecal_writer_udp_mc.h" -#include "ecal_writer_shm.h" -#include "ecal_writer_tcp.h" -#include "ecal_writer_inproc.h" +#include "udp/ecal_writer_udp_mc.h" +#include "shm/ecal_writer_shm.h" +#include "tcp/ecal_writer_tcp.h" +#include "inproc/ecal_writer_inproc.h" #include #include diff --git a/ecal/core/src/readwrite/ecal_writer_inproc.cpp b/ecal/core/src/readwrite/inproc/ecal_writer_inproc.cpp similarity index 98% rename from ecal/core/src/readwrite/ecal_writer_inproc.cpp rename to ecal/core/src/readwrite/inproc/ecal_writer_inproc.cpp index 5ed9be4408..be76df1510 100644 --- a/ecal/core/src/readwrite/ecal_writer_inproc.cpp +++ b/ecal/core/src/readwrite/inproc/ecal_writer_inproc.cpp @@ -26,7 +26,7 @@ #include "ecal_global_accessors.h" #include "pubsub/ecal_subgate.h" -#include "readwrite/ecal_writer_inproc.h" +#include "readwrite/inproc/ecal_writer_inproc.h" namespace eCAL { diff --git a/ecal/core/src/readwrite/ecal_writer_inproc.h b/ecal/core/src/readwrite/inproc/ecal_writer_inproc.h similarity index 100% rename from ecal/core/src/readwrite/ecal_writer_inproc.h rename to ecal/core/src/readwrite/inproc/ecal_writer_inproc.h diff --git a/ecal/core/src/readwrite/ecal_reader_shm.cpp b/ecal/core/src/readwrite/shm/ecal_reader_shm.cpp similarity index 99% rename from ecal/core/src/readwrite/ecal_reader_shm.cpp rename to ecal/core/src/readwrite/shm/ecal_reader_shm.cpp index 6190e696f8..cb8b3ab63c 100644 --- a/ecal/core/src/readwrite/ecal_reader_shm.cpp +++ b/ecal/core/src/readwrite/shm/ecal_reader_shm.cpp @@ -34,7 +34,7 @@ #include "ecal_global_accessors.h" #include "pubsub/ecal_subgate.h" #include "io/shm/ecal_memfile_pool.h" -#include "readwrite/ecal_reader_shm.h" +#include "ecal_reader_shm.h" #include diff --git a/ecal/core/src/readwrite/ecal_reader_shm.h b/ecal/core/src/readwrite/shm/ecal_reader_shm.h similarity index 100% rename from ecal/core/src/readwrite/ecal_reader_shm.h rename to ecal/core/src/readwrite/shm/ecal_reader_shm.h diff --git a/ecal/core/src/readwrite/ecal_writer_shm.cpp b/ecal/core/src/readwrite/shm/ecal_writer_shm.cpp similarity index 99% rename from ecal/core/src/readwrite/ecal_writer_shm.cpp rename to ecal/core/src/readwrite/shm/ecal_writer_shm.cpp index fd3efdac5f..6851e2d21a 100644 --- a/ecal/core/src/readwrite/ecal_writer_shm.cpp +++ b/ecal/core/src/readwrite/shm/ecal_writer_shm.cpp @@ -34,7 +34,7 @@ #endif #include "ecal_def.h" -#include "ecal_writer.h" +#include "readwrite/ecal_writer.h" #include "ecal_writer_shm.h" namespace eCAL diff --git a/ecal/core/src/readwrite/ecal_writer_shm.h b/ecal/core/src/readwrite/shm/ecal_writer_shm.h similarity index 100% rename from ecal/core/src/readwrite/ecal_writer_shm.h rename to ecal/core/src/readwrite/shm/ecal_writer_shm.h diff --git a/ecal/core/src/readwrite/ecal_reader_tcp.cpp b/ecal/core/src/readwrite/tcp/ecal_reader_tcp.cpp similarity index 98% rename from ecal/core/src/readwrite/ecal_reader_tcp.cpp rename to ecal/core/src/readwrite/tcp/ecal_reader_tcp.cpp index ffc1b02a07..ce240dcc3f 100644 --- a/ecal/core/src/readwrite/ecal_reader_tcp.cpp +++ b/ecal/core/src/readwrite/tcp/ecal_reader_tcp.cpp @@ -28,8 +28,8 @@ #include "pubsub/ecal_subgate.h" #include "readwrite/ecal_writer_base.h" -#include "readwrite/ecal_reader_tcp.h" -#include "readwrite/ecal_tcp_pubsub_logger.h" +#include "ecal_reader_tcp.h" +#include "ecal_tcp_pubsub_logger.h" #include "ecal_utils/portable_endian.h" diff --git a/ecal/core/src/readwrite/ecal_reader_tcp.h b/ecal/core/src/readwrite/tcp/ecal_reader_tcp.h similarity index 100% rename from ecal/core/src/readwrite/ecal_reader_tcp.h rename to ecal/core/src/readwrite/tcp/ecal_reader_tcp.h diff --git a/ecal/core/src/readwrite/ecal_tcp_pubsub_logger.h b/ecal/core/src/readwrite/tcp/ecal_tcp_pubsub_logger.h similarity index 100% rename from ecal/core/src/readwrite/ecal_tcp_pubsub_logger.h rename to ecal/core/src/readwrite/tcp/ecal_tcp_pubsub_logger.h diff --git a/ecal/core/src/readwrite/ecal_writer_tcp.cpp b/ecal/core/src/readwrite/tcp/ecal_writer_tcp.cpp similarity index 98% rename from ecal/core/src/readwrite/ecal_writer_tcp.cpp rename to ecal/core/src/readwrite/tcp/ecal_writer_tcp.cpp index acbf6e6fdb..13ca9ca582 100644 --- a/ecal/core/src/readwrite/ecal_writer_tcp.cpp +++ b/ecal/core/src/readwrite/tcp/ecal_writer_tcp.cpp @@ -29,12 +29,12 @@ #pragma warning(pop) #endif -#include "ecal_config_reader_hlp.h" +#include "config/ecal_config_reader_hlp.h" #include -#include "readwrite/ecal_writer_tcp.h" -#include "readwrite/ecal_tcp_pubsub_logger.h" +#include "ecal_writer_tcp.h" +#include "ecal_tcp_pubsub_logger.h" #include "ecal_utils/portable_endian.h" diff --git a/ecal/core/src/readwrite/ecal_writer_tcp.h b/ecal/core/src/readwrite/tcp/ecal_writer_tcp.h similarity index 100% rename from ecal/core/src/readwrite/ecal_writer_tcp.h rename to ecal/core/src/readwrite/tcp/ecal_writer_tcp.h diff --git a/ecal/core/src/readwrite/ecal_reader_udp_mc.cpp b/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.cpp similarity index 98% rename from ecal/core/src/readwrite/ecal_reader_udp_mc.cpp rename to ecal/core/src/readwrite/udp/ecal_reader_udp_mc.cpp index b372ca9ef6..1f242bb821 100644 --- a/ecal/core/src/readwrite/ecal_reader_udp_mc.cpp +++ b/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.cpp @@ -21,7 +21,7 @@ * @brief udp multicast reader and layer **/ -#include "readwrite/ecal_reader_udp_mc.h" +#include "ecal_reader_udp_mc.h" #include "ecal_global_accessors.h" #include "pubsub/ecal_subgate.h" diff --git a/ecal/core/src/readwrite/ecal_reader_udp_mc.h b/ecal/core/src/readwrite/udp/ecal_reader_udp_mc.h similarity index 100% rename from ecal/core/src/readwrite/ecal_reader_udp_mc.h rename to ecal/core/src/readwrite/udp/ecal_reader_udp_mc.h diff --git a/ecal/core/src/readwrite/ecal_writer_udp_mc.cpp b/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.cpp similarity index 100% rename from ecal/core/src/readwrite/ecal_writer_udp_mc.cpp rename to ecal/core/src/readwrite/udp/ecal_writer_udp_mc.cpp diff --git a/ecal/core/src/readwrite/ecal_writer_udp_mc.h b/ecal/core/src/readwrite/udp/ecal_writer_udp_mc.h similarity index 100% rename from ecal/core/src/readwrite/ecal_writer_udp_mc.h rename to ecal/core/src/readwrite/udp/ecal_writer_udp_mc.h diff --git a/ecal/core/src/ecal_registration_provider.cpp b/ecal/core/src/registration/ecal_registration_provider.cpp similarity index 100% rename from ecal/core/src/ecal_registration_provider.cpp rename to ecal/core/src/registration/ecal_registration_provider.cpp diff --git a/ecal/core/src/ecal_registration_provider.h b/ecal/core/src/registration/ecal_registration_provider.h similarity index 99% rename from ecal/core/src/ecal_registration_provider.h rename to ecal/core/src/registration/ecal_registration_provider.h index dec83eb009..435b38ddc4 100644 --- a/ecal/core/src/ecal_registration_provider.h +++ b/ecal/core/src/registration/ecal_registration_provider.h @@ -28,7 +28,7 @@ #pragma once -#include "ecal_thread.h" +#include "util/ecal_thread.h" #include "io/udp/snd_sample.h" #include "io/udp/udp_sender.h" diff --git a/ecal/core/src/ecal_registration_receiver.cpp b/ecal/core/src/registration/ecal_registration_receiver.cpp similarity index 100% rename from ecal/core/src/ecal_registration_receiver.cpp rename to ecal/core/src/registration/ecal_registration_receiver.cpp diff --git a/ecal/core/src/ecal_registration_receiver.h b/ecal/core/src/registration/ecal_registration_receiver.h similarity index 99% rename from ecal/core/src/ecal_registration_receiver.h rename to ecal/core/src/registration/ecal_registration_receiver.h index 162c829d69..a3d1ee85cf 100644 --- a/ecal/core/src/ecal_registration_receiver.h +++ b/ecal/core/src/registration/ecal_registration_receiver.h @@ -30,7 +30,7 @@ #include #include "ecal_def.h" -#include "ecal_thread.h" +#include "util/ecal_thread.h" #include "io/udp/rcv_sample.h" diff --git a/ecal/core/src/service/ecal_clientgate.h b/ecal/core/src/service/ecal_clientgate.h index 2013c13d40..ecc1bb7aac 100644 --- a/ecal/core/src/service/ecal_clientgate.h +++ b/ecal/core/src/service/ecal_clientgate.h @@ -24,7 +24,7 @@ #pragma once #include "ecal_def.h" -#include "ecal_expmap.h" +#include "util/ecal_expmap.h" #include diff --git a/ecal/core/src/service/ecal_service_client_impl.cpp b/ecal/core/src/service/ecal_service_client_impl.cpp index 1d5553edde..789193254e 100644 --- a/ecal/core/src/service/ecal_service_client_impl.cpp +++ b/ecal/core/src/service/ecal_service_client_impl.cpp @@ -23,7 +23,7 @@ #include "ecal_global_accessors.h" -#include "ecal_registration_provider.h" +#include "registration/ecal_registration_provider.h" #include "ecal_clientgate.h" #include "ecal_service_client_impl.h" diff --git a/ecal/core/src/service/ecal_service_server_impl.cpp b/ecal/core/src/service/ecal_service_server_impl.cpp index ba3141b5b1..12571332c2 100644 --- a/ecal/core/src/service/ecal_service_server_impl.cpp +++ b/ecal/core/src/service/ecal_service_server_impl.cpp @@ -24,7 +24,7 @@ #include #include "ecal_descgate.h" -#include "ecal_registration_provider.h" +#include "registration/ecal_registration_provider.h" #include "ecal_servicegate.h" #include "ecal_global_accessors.h" #include "ecal_service_server_impl.h" diff --git a/ecal/core/src/ecal_time.cpp b/ecal/core/src/time/ecal_time.cpp similarity index 100% rename from ecal/core/src/ecal_time.cpp rename to ecal/core/src/time/ecal_time.cpp diff --git a/ecal/core/src/ecal_timegate.cpp b/ecal/core/src/time/ecal_timegate.cpp similarity index 99% rename from ecal/core/src/ecal_timegate.cpp rename to ecal/core/src/time/ecal_timegate.cpp index 1fc4220997..cc6c1ebf08 100644 --- a/ecal/core/src/ecal_timegate.cpp +++ b/ecal/core/src/time/ecal_timegate.cpp @@ -26,11 +26,11 @@ #include -#include "ecal_config_reader_hlp.h" +#include "config/ecal_config_reader_hlp.h" #include "ecal_def.h" #include "ecal_process.h" #include "ecal_timegate.h" -#include "getenvvar.h" +#include "util/getenvvar.h" #include #include diff --git a/ecal/core/src/ecal_timegate.h b/ecal/core/src/time/ecal_timegate.h similarity index 100% rename from ecal/core/src/ecal_timegate.h rename to ecal/core/src/time/ecal_timegate.h diff --git a/ecal/core/src/ecal_timer.cpp b/ecal/core/src/time/ecal_timer.cpp similarity index 100% rename from ecal/core/src/ecal_timer.cpp rename to ecal/core/src/time/ecal_timer.cpp diff --git a/ecal/core/src/custom_tclap/advanced_tclap_output.cpp b/ecal/core/src/util/advanced_tclap_output.cpp similarity index 99% rename from ecal/core/src/custom_tclap/advanced_tclap_output.cpp rename to ecal/core/src/util/advanced_tclap_output.cpp index 918cd43d4f..b0917f6026 100644 --- a/ecal/core/src/custom_tclap/advanced_tclap_output.cpp +++ b/ecal/core/src/util/advanced_tclap_output.cpp @@ -17,7 +17,7 @@ * ========================= eCAL LICENSE ================================= */ -#include +#include "advanced_tclap_output.h" #include diff --git a/ecal/core/src/custom_tclap/advanced_tclap_output.h b/ecal/core/src/util/advanced_tclap_output.h similarity index 100% rename from ecal/core/src/custom_tclap/advanced_tclap_output.h rename to ecal/core/src/util/advanced_tclap_output.h diff --git a/ecal/core/src/convert_utf.cpp b/ecal/core/src/util/convert_utf.cpp similarity index 100% rename from ecal/core/src/convert_utf.cpp rename to ecal/core/src/util/convert_utf.cpp diff --git a/ecal/core/src/convert_utf.h b/ecal/core/src/util/convert_utf.h similarity index 100% rename from ecal/core/src/convert_utf.h rename to ecal/core/src/util/convert_utf.h diff --git a/ecal/core/src/ecal_expmap.h b/ecal/core/src/util/ecal_expmap.h similarity index 100% rename from ecal/core/src/ecal_expmap.h rename to ecal/core/src/util/ecal_expmap.h diff --git a/ecal/core/src/ecal_thread.cpp b/ecal/core/src/util/ecal_thread.cpp similarity index 100% rename from ecal/core/src/ecal_thread.cpp rename to ecal/core/src/util/ecal_thread.cpp diff --git a/ecal/core/src/ecal_thread.h b/ecal/core/src/util/ecal_thread.h similarity index 100% rename from ecal/core/src/ecal_thread.h rename to ecal/core/src/util/ecal_thread.h diff --git a/ecal/core/src/getenvvar.h b/ecal/core/src/util/getenvvar.h similarity index 100% rename from ecal/core/src/getenvvar.h rename to ecal/core/src/util/getenvvar.h diff --git a/ecal/core/src/sys_usage.cpp b/ecal/core/src/util/sys_usage.cpp similarity index 100% rename from ecal/core/src/sys_usage.cpp rename to ecal/core/src/util/sys_usage.cpp diff --git a/ecal/core/src/sys_usage.h b/ecal/core/src/util/sys_usage.h similarity index 100% rename from ecal/core/src/sys_usage.h rename to ecal/core/src/util/sys_usage.h diff --git a/testing/ecal/expmap_test/src/expmap_test.cpp b/testing/ecal/expmap_test/src/expmap_test.cpp index c31d89fe2e..9654f0e2dd 100644 --- a/testing/ecal/expmap_test/src/expmap_test.cpp +++ b/testing/ecal/expmap_test/src/expmap_test.cpp @@ -18,7 +18,7 @@ */ #include -#include "ecal_expmap.h" +#include "util/ecal_expmap.h" #include #include