From f7ede97c7409f731705ae9771c712ebe900dc4ad Mon Sep 17 00:00:00 2001
From: Elena Mamontova <helenh463@gmail.com>
Date: Thu, 19 Jan 2017 15:35:29 +0200
Subject: [PATCH] Ticket. GetChangePolicyTimeout() function removed.
GetChangePolicyTimeout parameter removed in AddParser() function in PARSER()
constructor.
---
stglibs/srvconf.lib/parsers/get_tariff.cpp | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
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 <typename T>
-bool GetChangePolicyTimeout(const char ** attr, T & value, const std::string & attrName)
-{
-if (!CheckValue(attr, attrName))
- return false;
-value = readTime(attr[1]);
-return true;
-}
-
template <typename A, typename T>
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);
--
2.44.2