eddy/mountcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Timur A. Fatkhullin 2025-02-25 09:17:10 +03:00
parent 5b89a968eb
commit c64baf6e35
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cxx/comm_server_configfile.h
View File

@ -185,12 +185,12 @@ public:
fst << "#\n"; fst << "#\n";
for (auto& [key, value] : _currentConfig) { for (auto& [key, value] : _currentConfig) {
fst << key << " = "; fst << key;
if (auto v_str = std::get_if<1>(&value)) { if (auto v_str = std::get_if<1>(&value)) {
fst << *v_str; fst << " = " << *v_str;
} else if (auto v_vec = std::get_if<2>(&value)) { } else if (auto v_vec = std::get_if<2>(&value)) {
fst << (*v_vec)[0]; fst << " = " << (*v_vec)[0];
for (size_t i = 1; i < v_vec->size(); ++i) { for (size_t i = 1; i < v_vec->size(); ++i) {
fst << ", " << (*v_vec)[i]; fst << ", " << (*v_vec)[i];
} }

9
cxx/tests/configfile_test.cpp
View File

@ -1,5 +1,4 @@
#include <iostream> #include <iostream>
#include <strstream>
#include "../comm_server_configfile.h" #include "../comm_server_configfile.h"
@ -14,10 +13,11 @@ int main(int argc, char* argv[])
auto print_cfg = [](auto const& cfg) { auto print_cfg = [](auto const& cfg) {
for (auto& [key, v] : cfg.config()) { for (auto& [key, v] : cfg.config()) {
std::cout << key << " = "; std::cout << key;
if (auto v_str = std::get_if<1>(&v)) { if (auto v_str = std::get_if<1>(&v)) {
std::cout << *v_str; std::cout << " = " << *v_str;
} else if (auto v_vec = std::get_if<2>(&v)) { } else if (auto v_vec = std::get_if<2>(&v)) {
std::cout << " = ";
for (auto& el : *v_vec) { for (auto& el : *v_vec) {
std::cout << "<" << el << "> "; std::cout << "<" << el << "> ";
} }
@ -36,7 +36,8 @@ int main(int argc, char* argv[])
vec_key = 1,2,3 , 345, 4576, 79 vec_key = 1,2,3 , 345, 4576, 79
)--"; )--";
std::istrstream ist(str.c_str()); std::stringstream ist;
ist << str;
cfg.load(ist); cfg.load(ist);
std::cout << "From input stream: \n"; std::cout << "From input stream: \n";