git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ticket 37. The stgTime argument added in TariffChangeIsAllowed()
[stg.git]
/
include
/
stg
/
tariff_conf.h
diff --git
a/include/stg/tariff_conf.h
b/include/stg/tariff_conf.h
index cee3b4a5237d9f446caec2580cd6ef7c6fde54c2..79ade2eb44bef6ddaee90bf705a8d421297b7dcf 100644
(file)
--- a/
include/stg/tariff_conf.h
+++ b/
include/stg/tariff_conf.h
@@
-149,6
+149,7
@@
struct TARIFF_CONF
std::string name;
TARIFF::PERIOD period;
TARIFF::CHANGE_POLICY changePolicy;
std::string name;
TARIFF::PERIOD period;
TARIFF::CHANGE_POLICY changePolicy;
+ time_t changePolicyTimeout;
TARIFF_CONF()
: fee(0),
TARIFF_CONF()
: fee(0),
@@
-157,7
+158,8
@@
struct TARIFF_CONF
passiveCost(0),
name(),
period(TARIFF::MONTH),
passiveCost(0),
name(),
period(TARIFF::MONTH),
- changePolicy(TARIFF::ALLOW)
+ changePolicy(TARIFF::ALLOW),
+ changePolicyTimeout(0)
{}
TARIFF_CONF(const std::string & n)
{}
TARIFF_CONF(const std::string & n)
@@
-167,7
+169,8
@@
struct TARIFF_CONF
passiveCost(0),
name(n),
period(TARIFF::MONTH),
passiveCost(0),
name(n),
period(TARIFF::MONTH),
- changePolicy(TARIFF::ALLOW)
+ changePolicy(TARIFF::ALLOW),
+ changePolicyTimeout(0)
{}
};
//-----------------------------------------------------------------------------
{}
};
//-----------------------------------------------------------------------------
@@
-180,7
+183,8
@@
struct TARIFF_CONF_RES
passiveCost(),
name(),
period(),
passiveCost(),
name(),
period(),
- changePolicy()
+ changePolicy(),
+ changePolicyTimeout()
{}
TARIFF_CONF_RES & operator=(const TARIFF_CONF & tc)
{}
TARIFF_CONF_RES & operator=(const TARIFF_CONF & tc)
@@
-192,6
+196,7
@@
struct TARIFF_CONF_RES
name = tc.name;
period = tc.period;
changePolicy = tc.changePolicy;
name = tc.name;
period = tc.period;
changePolicy = tc.changePolicy;
+ changePolicyTimeout = tc.changePolicyTimeout;
return *this;
}
return *this;
}
@@
-205,6
+210,7
@@
struct TARIFF_CONF_RES
traffType.maybeSet(tc.traffType);
period.maybeSet(tc.period);
changePolicy.maybeSet(tc.changePolicy);
traffType.maybeSet(tc.traffType);
period.maybeSet(tc.period);
changePolicy.maybeSet(tc.changePolicy);
+ changePolicyTimeout.maybeSet(tc.changePolicyTimeout);
return tc;
}
return tc;
}
@@
-215,6
+221,7
@@
struct TARIFF_CONF_RES
RESETABLE<std::string> name;
RESETABLE<TARIFF::PERIOD> period;
RESETABLE<TARIFF::CHANGE_POLICY> changePolicy;
RESETABLE<std::string> name;
RESETABLE<TARIFF::PERIOD> period;
RESETABLE<TARIFF::CHANGE_POLICY> changePolicy;
+ RESETABLE<time_t> changePolicyTimeout;
};
//-----------------------------------------------------------------------------
struct TARIFF_DATA
};
//-----------------------------------------------------------------------------
struct TARIFF_DATA