From 9ced2614d434e9c04a232b31eb4a36256ef9bf7e Mon Sep 17 00:00:00 2001 From: rex-schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:12:53 +0100 Subject: [PATCH 1/2] msg/proto/message.h -> msg/protobuf/common_message.h --- .../cpp/measurement/measurement_read/src/measurement_read.cpp | 2 +- .../cpp/measurement/measurement_write/src/measurement_write.cpp | 2 +- serialization/protobuf/protobuf/CMakeLists.txt | 1 + .../ecal/msg/{proto/message.h => protobuf/common_message.h} | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename serialization/protobuf/protobuf/include/ecal/msg/{proto/message.h => protobuf/common_message.h} (100%) diff --git a/samples/cpp/measurement/measurement_read/src/measurement_read.cpp b/samples/cpp/measurement/measurement_read/src/measurement_read.cpp index 1b776752f5..fad96fa02e 100644 --- a/samples/cpp/measurement/measurement_read/src/measurement_read.cpp +++ b/samples/cpp/measurement/measurement_read/src/measurement_read.cpp @@ -17,7 +17,7 @@ * ========================= eCAL LICENSE ================================= */ -#include +#include #include #include diff --git a/samples/cpp/measurement/measurement_write/src/measurement_write.cpp b/samples/cpp/measurement/measurement_write/src/measurement_write.cpp index d6fa5f9ef0..fa368053b7 100644 --- a/samples/cpp/measurement/measurement_write/src/measurement_write.cpp +++ b/samples/cpp/measurement/measurement_write/src/measurement_write.cpp @@ -17,7 +17,7 @@ * ========================= eCAL LICENSE ================================= */ -#include +#include #include #include diff --git a/serialization/protobuf/protobuf/CMakeLists.txt b/serialization/protobuf/protobuf/CMakeLists.txt index 4fd765f06b..978f99787c 100644 --- a/serialization/protobuf/protobuf/CMakeLists.txt +++ b/serialization/protobuf/protobuf/CMakeLists.txt @@ -82,6 +82,7 @@ target_sources(protobuf_core include/ecal/msg/protobuf/client_protobuf_utils.h include/ecal/msg/protobuf/client_untyped.h include/ecal/msg/protobuf/client_untyped_instance.h + include/ecal/msg/protobuf/common_message.h include/ecal/msg/protobuf/dynamic_json_subscriber.h include/ecal/msg/protobuf/dynamic_publisher.h include/ecal/msg/protobuf/dynamic_subscriber.h diff --git a/serialization/protobuf/protobuf/include/ecal/msg/proto/message.h b/serialization/protobuf/protobuf/include/ecal/msg/protobuf/common_message.h similarity index 100% rename from serialization/protobuf/protobuf/include/ecal/msg/proto/message.h rename to serialization/protobuf/protobuf/include/ecal/msg/protobuf/common_message.h From b0f6f1cff89b8d670c277091969ddf231f18bc1e Mon Sep 17 00:00:00 2001 From: rex-schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Fri, 14 Feb 2025 13:29:32 +0100 Subject: [PATCH 2/2] whitespaces --- serialization/protobuf/protobuf/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/serialization/protobuf/protobuf/CMakeLists.txt b/serialization/protobuf/protobuf/CMakeLists.txt index 978f99787c..be7464b53c 100644 --- a/serialization/protobuf/protobuf/CMakeLists.txt +++ b/serialization/protobuf/protobuf/CMakeLists.txt @@ -80,9 +80,9 @@ target_sources(protobuf_core include/ecal/msg/protobuf/client_instance.h include/ecal/msg/protobuf/client_protobuf_types.h include/ecal/msg/protobuf/client_protobuf_utils.h - include/ecal/msg/protobuf/client_untyped.h - include/ecal/msg/protobuf/client_untyped_instance.h - include/ecal/msg/protobuf/common_message.h + include/ecal/msg/protobuf/client_untyped.h + include/ecal/msg/protobuf/client_untyped_instance.h + include/ecal/msg/protobuf/common_message.h include/ecal/msg/protobuf/dynamic_json_subscriber.h include/ecal/msg/protobuf/dynamic_publisher.h include/ecal/msg/protobuf/dynamic_subscriber.h