From fc416a2e703b9cf196bb2f5c68c54b7467f580ae Mon Sep 17 00:00:00 2001 From: Kristof Hannemann <50989282+hannemn@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:47:56 +0100 Subject: [PATCH] Removed custom user cli arguments from configuration object --- ecal/core/CMakeLists.txt | 1 - ecal/core/include/ecal/config/configuration.h | 2 - .../core/include/ecal/config/user_arguments.h | 41 ------------------- ecal/core/src/ecal.cpp | 5 --- 4 files changed, 49 deletions(-) delete mode 100644 ecal/core/include/ecal/config/user_arguments.h diff --git a/ecal/core/CMakeLists.txt b/ecal/core/CMakeLists.txt index 378f710e9b..100623d5d0 100644 --- a/ecal/core/CMakeLists.txt +++ b/ecal/core/CMakeLists.txt @@ -517,7 +517,6 @@ set(ecal_header_cmn include/ecal/config/subscriber.h include/ecal/config/time.h include/ecal/config/transport_layer.h - include/ecal/config/user_arguments.h include/ecal/types/logging.h include/ecal/types/monitoring.h include/ecal/ecal.h diff --git a/ecal/core/include/ecal/config/configuration.h b/ecal/core/include/ecal/config/configuration.h index ac2ac324cb..1b231228a3 100644 --- a/ecal/core/include/ecal/config/configuration.h +++ b/ecal/core/include/ecal/config/configuration.h @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -55,7 +54,6 @@ namespace eCAL Time::Configuration timesync; Application::Configuration application; Logging::Configuration logging; - Cli::Configuration command_line_arguments; ECAL_API Configuration(); diff --git a/ecal/core/include/ecal/config/user_arguments.h b/ecal/core/include/ecal/config/user_arguments.h deleted file mode 100644 index 50eb06d211..0000000000 --- a/ecal/core/include/ecal/config/user_arguments.h +++ /dev/null @@ -1,41 +0,0 @@ -/* =========================== LICENSE ================================= - * - * Copyright (C) 2016 - 2024 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. - * - * =========================== LICENSE ================================= - */ - -/** - * @file user_arguments.h - * @brief Arguments given by the user via command line -**/ - -#pragma once - -#include -#include -#include - -namespace eCAL -{ - namespace Cli - { - struct Configuration - { - std::string user_yaml { "" }; //!< The used eCAL yaml file (Default: "") - bool dump_config { false }; //!< If specified, output configuration via standard output (Default: false) - }; - } -} \ No newline at end of file diff --git a/ecal/core/src/ecal.cpp b/ecal/core/src/ecal.cpp index 7cbad47e01..6797381ded 100644 --- a/ecal/core/src/ecal.cpp +++ b/ecal/core/src/ecal.cpp @@ -115,11 +115,6 @@ namespace eCAL // (post)initialize single components const auto success = g_globals()->Initialize(components_); - - if (config_.command_line_arguments.dump_config) - { - Process::DumpConfig(); - } return success; }