diff options
author | Diogo Pedrosa <48529452+DiogoPedrozza@users.noreply.github.com> | 2023-03-13 14:09:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-13 14:09:12 +0000 |
commit | 1b427801352b5dcfdc2277f6343166c01afe97d6 (patch) | |
tree | d4e984dd100f3257ce784c9e30aefb6e60a93ab5 /implementation/configuration/include/configuration_plugin_impl.hpp | |
parent | fc73f40fa1501dc53210c63cb7c0d7623d106370 (diff) | |
parent | 826ebb8d352245a36ecaec32b6af61e7abf4696e (diff) | |
download | vSomeIP-1b427801352b5dcfdc2277f6343166c01afe97d6.tar.gz |
Merge pull request #416 from COVESA/update_3.3.03.3.0
vsomeip 3.3.0
Diffstat (limited to 'implementation/configuration/include/configuration_plugin_impl.hpp')
-rw-r--r-- | implementation/configuration/include/configuration_plugin_impl.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/implementation/configuration/include/configuration_plugin_impl.hpp b/implementation/configuration/include/configuration_plugin_impl.hpp index fd95628..3fcfbef 100644 --- a/implementation/configuration/include/configuration_plugin_impl.hpp +++ b/implementation/configuration/include/configuration_plugin_impl.hpp @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) +// Copyright (C) 2019-2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG) // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -27,14 +27,15 @@ public: configuration_plugin_impl(); virtual ~configuration_plugin_impl(); - std::shared_ptr<configuration> get_configuration(const std::string &_name); + std::shared_ptr<configuration> get_configuration(const std::string &_name, + const std::string &_path); private: std::mutex mutex_; std::shared_ptr<cfg::configuration_impl> default_; -#ifdef VSOMEIP_ENABLE_CONFIGURATION_OVERLAYS +#if 0 std::map<std::string, std::shared_ptr<cfg::configuration_impl> > configurations_; -#endif // VSOMEIP_ENABLE_CONFIGURATION_OVERLAYS +#endif }; } // namespace vsomeip_v3 |