From: Elena Mamontova Date: Thu, 19 Jan 2017 14:00:03 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into ticket X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/refs/heads/ticket?hp=954d3cb777db09587845bcc8b2d959d7a48e5bed Merge remote-tracking branch 'origin/master' into ticket --- diff --git a/stglibs/srvconf.lib/parsers/get_tariff.cpp b/stglibs/srvconf.lib/parsers/get_tariff.cpp index e2066363..a13205b3 100644 --- a/stglibs/srvconf.lib/parsers/get_tariff.cpp +++ b/stglibs/srvconf.lib/parsers/get_tariff.cpp @@ -116,15 +116,6 @@ else return true; } -template -bool GetChangePolicyTimeout(const char ** attr, T & value, const std::string & attrName) -{ -if (!CheckValue(attr, attrName)) - return false; -value = readTime(attr[1]); -return true; -} - template bool GetSlashedValue(const char ** attr, A & array, T A::value_type:: * field) { @@ -160,7 +151,7 @@ GET_TARIFF::PARSER::PARSER(CALLBACK f, void * d, const std::string & e) AddParser(propertyParsers, "traffType", info.tariffConf.traffType, GetTraffType); AddParser(propertyParsers, "period", info.tariffConf.period, GetPeriod); AddParser(propertyParsers, "changePolicy", info.tariffConf.changePolicy, GetChangePolicy); - AddParser(propertyParsers, "changePolicyTimeout", info.tariffConf.changePolicyTimeout, GetChangePolicyTimeout); + AddParser(propertyParsers, "changePolicyTimeout", info.tariffConf.changePolicyTimeout); for (size_t i = 0; i < DIR_NUM; ++i) AddParser(propertyParsers, "time" + unsigned2str(i), info.dirPrice[i], GetTimeSpan); AddAOSParser(propertyParsers, "priceDayA", info.dirPrice, &DIRPRICE_DATA::priceDayA, GetSlashedValue);