Ticket 37. The true parameter changed to false in ensure_equals()

[stg.git] / include / stg / tariff.h

diff --git a/include/stg/tariff.h b/include/stg/tariff.h
index 1371190bc8ce5bbdc40e42bd6b7ec36c1382d7fe..9bd9973eaa5cedebbe33f91b236e3a1df3de1995 100644 (file)
--- a/include/stg/tariff.h
+++ b/include/stg/tariff.h
@@ -38,7 +38,7 @@ public:
 
     enum TRAFF_TYPE { TRAFF_UP = 0, TRAFF_DOWN, TRAFF_UP_DOWN, TRAFF_MAX };
 
 
     enum TRAFF_TYPE { TRAFF_UP = 0, TRAFF_DOWN, TRAFF_UP_DOWN, TRAFF_MAX };
 

-    static std::string ChangePolicyToString(CHANGE_POLICY change_policy);
+    static std::string ChangePolicyToString(CHANGE_POLICY changePolicy);

     static CHANGE_POLICY StringToChangePolicy(const std::string& value);
 
     static std::string PeriodToString(PERIOD period);
     static CHANGE_POLICY StringToChangePolicy(const std::string& value);
 
     static std::string PeriodToString(PERIOD period);


@@ -67,12 +67,13 @@ public:
     virtual int64_t GetTraffByType(uint64_t up, uint64_t down) const = 0;
     virtual int     GetThreshold(int dir) const = 0;
     virtual const TARIFF_DATA & GetTariffData() const = 0;
     virtual int64_t GetTraffByType(uint64_t up, uint64_t down) const = 0;
     virtual int     GetThreshold(int dir) const = 0;
     virtual const TARIFF_DATA & GetTariffData() const = 0;

+    virtual std::string TariffChangeIsAllowed(const TARIFF & to) const = 0;

 };
 
 inline
 };
 
 inline

-std::string TARIFF::ChangePolicyToString(TARIFF::CHANGE_POLICY change_policy)
+std::string TARIFF::ChangePolicyToString(TARIFF::CHANGE_POLICY changePolicy)

 {
 {

-switch (change_policy)
+switch (changePolicy)

     {
     case ALLOW: return "allow";
     case TO_CHEAP: return "to_cheap";
     {
     case ALLOW: return "allow";
     case TO_CHEAP: return "to_cheap";