From 5f561af792eac397c5561c8c2b5087d4520c29f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D0=B5=D0=BC=20=D0=A1=D1=82=D1=80=D0=B5?= =?UTF-8?q?=D0=BB=D1=8C=D1=86=D0=BE=D0=B2?= Date: Thu, 2 Apr 2020 01:10:22 +0300 Subject: [PATCH] some fix for errors with shadowing name --- dbms/src/Dictionaries/DictionaryStructure.cpp | 4 ++-- dbms/src/Dictionaries/DictionaryStructure.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/Dictionaries/DictionaryStructure.cpp b/dbms/src/Dictionaries/DictionaryStructure.cpp index 132b9effcb7..33196f627d8 100644 --- a/dbms/src/Dictionaries/DictionaryStructure.cpp +++ b/dbms/src/Dictionaries/DictionaryStructure.cpp @@ -364,7 +364,7 @@ std::vector DictionaryStructure::getAttributes( void DictionaryStructure::getSettings( const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, - Settings & settings) + Settings & dict_settings) { Poco::Util::AbstractConfiguration::Keys config_elems; config.keys(config_prefix, config_elems); @@ -379,7 +379,7 @@ void DictionaryStructure::getSettings( const auto prefix = config_prefix + '.' + config_elem; Poco::Util::AbstractConfiguration::Keys setting_keys; config.keys(prefix, setting_keys); - settings.loadSettingsFromConfig(prefix, config); + dict_settings.loadSettingsFromConfig(prefix, config); } } diff --git a/dbms/src/Dictionaries/DictionaryStructure.h b/dbms/src/Dictionaries/DictionaryStructure.h index 9a7428959a6..cd9d41f67ee 100644 --- a/dbms/src/Dictionaries/DictionaryStructure.h +++ b/dbms/src/Dictionaries/DictionaryStructure.h @@ -124,7 +124,7 @@ private: void getSettings( const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, - Settings & settings); + Settings & dict_settings); }; }