Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / tariff_impl.h

diff --git a/projects/stargazer/tariff_impl.h b/projects/stargazer/tariff_impl.h
index b8d0a776d729407a206cebe5d5110b1ab99933a6..f33c08af0aa1340b3ba1bf0db72e60e964d0709c 100644 (file)
--- a/projects/stargazer/tariff_impl.h
+++ b/projects/stargazer/tariff_impl.h
@@ -46,16 +46,20 @@
 class TARIFF_IMPL : public TARIFF {
 public:
     TARIFF_IMPL()
 class TARIFF_IMPL : public TARIFF {
 public:
     TARIFF_IMPL()

-        : tariffData()
+        : TARIFF(),
+          tariffData()

     {};
     TARIFF_IMPL(const std::string & name)
     {};
     TARIFF_IMPL(const std::string & name)

-        : tariffData(name)
+        : TARIFF(),
+          tariffData(name)

     {};
     TARIFF_IMPL(const TARIFF_DATA & td)
     {};
     TARIFF_IMPL(const TARIFF_DATA & td)

-        : tariffData(td)
+        : TARIFF(),
+          tariffData(td)

     {};
     TARIFF_IMPL(const TARIFF_IMPL & t)
     {};
     TARIFF_IMPL(const TARIFF_IMPL & t)

-        : tariffData(t.tariffData)
+        : TARIFF(),
+          tariffData(t.tariffData)

     {};
     virtual ~TARIFF_IMPL() {};
 
     {};
     virtual ~TARIFF_IMPL() {};
 


@@ -78,10 +82,10 @@ public:
     int     GetThreshold(int dir) const;
     const TARIFF_DATA & GetTariffData() const { return tariffData; }
 
     int     GetThreshold(int dir) const;
     const TARIFF_DATA & GetTariffData() const { return tariffData; }
 

-    TARIFF & operator=(const TARIFF_DATA & td);
-    TARIFF & operator=(const TARIFF & t);
-    bool     operator==(const TARIFF & rhs) const { return GetName() == rhs.GetName(); }
-    bool     operator!=(const TARIFF & rhs) const { return GetName() != rhs.GetName(); }
+    TARIFF_IMPL & operator=(const TARIFF_DATA & td);
+    TARIFF_IMPL & operator=(const TARIFF_IMPL & t);
+    bool     operator==(const TARIFF_IMPL & rhs) const { return GetName() == rhs.GetName(); }
+    bool     operator!=(const TARIFF_IMPL & rhs) const { return GetName() != rhs.GetName(); }

 
 private:
     TARIFF_DATA     tariffData;
 
 private:
     TARIFF_DATA     tariffData;