diff --git a/src/yw-config/setting.cpp b/src/yw-config/setting.cpp index f883c1d..2d31ae4 100644 --- a/src/yw-config/setting.cpp +++ b/src/yw-config/setting.cpp @@ -1,5 +1,6 @@ #include "setting.h" #include "yw_text.h" +#include #include namespace yw { @@ -19,8 +20,11 @@ namespace yw { Visibility visibility ) : key(yw::tolower(key)), valueText((allowed.size() > 0 && valueText.hasValue())? yw::toupper(valueText.getValue()) : valueText), - source(source), resource(resource), valueVector(values), - description(description), allowedValues(allowedValues), visibility(visibility) + source(source), + resource(resource), + valueVector(values), + description(description), + visibility(visibility) { if (valueText.hasValue() && values.size() == 0) { valueVector = std::vector{ valueText.getValue() }; diff --git a/src/yw-config/setting.h b/src/yw-config/setting.h index 1c43779..b44917e 100644 --- a/src/yw-config/setting.h +++ b/src/yw-config/setting.h @@ -34,6 +34,7 @@ namespace yw { const nullable_string valueText; const SettingSource source; const std::string resource; + std::vector valueVector; const std::string description; const Visibility visibility; @@ -71,7 +72,6 @@ namespace yw { private: std::vector allowedValues; - std::vector valueVector; size_t defaultIndex{ std::numeric_limits::max() }; }; } diff --git a/test/yw-config-tests/configuration_file_tests.cpp b/test/yw-config-tests/configuration_file_tests.cpp index 528aa9b..35f24e1 100644 --- a/test/yw-config-tests/configuration_file_tests.cpp +++ b/test/yw-config-tests/configuration_file_tests.cpp @@ -1,5 +1,5 @@ -#include "yw_config_tests.h" #include +#include "yw_config_tests.h" using namespace yw; using namespace yw::config; diff --git a/test/yw-config-tests/yw_config_tests.h b/test/yw-config-tests/yw_config_tests.h index 2c403b6..623787b 100644 --- a/test/yw-config-tests/yw_config_tests.h +++ b/test/yw-config-tests/yw_config_tests.h @@ -6,6 +6,7 @@ #include #include +#include #include "configuration.h" #include "yw_io.h"