]> git.stg.codes - stg.git/blobdiff - projects/stargazer/tariff_impl.cpp
Merge branch 'master' into full-month-stats
[stg.git] / projects / stargazer / tariff_impl.cpp
index bfae5215885a0e5671d09d9fa0ada7f98023ab36..bf272f3128a34f9939ba136fa29e68a95044964e 100644 (file)
 #include <ctime>
 #include <algorithm> // std::max
 
 #include <ctime>
 #include <algorithm> // std::max
 
+#include "stg/common.h"
 #include "tariff_impl.h"
 #include "stg_timer.h"
 #include "tariff_impl.h"
 #include "stg_timer.h"
-#include "common.h"
 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
-TARIFF & TARIFF_IMPL::operator=(const TARIFF_DATA & td)
+TARIFF_IMPL & TARIFF_IMPL::operator=(const TARIFF_DATA & td)
 {
 tariffData = td;
 return *this;
 }
 //-----------------------------------------------------------------------------
 {
 tariffData = td;
 return *this;
 }
 //-----------------------------------------------------------------------------
-TARIFF & TARIFF_IMPL::operator=(const TARIFF & t)
+TARIFF_IMPL & TARIFF_IMPL::operator=(const TARIFF_IMPL & t)
 {
 {
-tariffData = t.GetTariffData();
+tariffData = t.tariffData;
 return *this;
 }
 //-----------------------------------------------------------------------------
 return *this;
 }
 //-----------------------------------------------------------------------------