TEST_SETTINGS_LOCAL moved outside the namespace, more assertions added

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

diff --git a/projects/stargazer/tariffs_impl.h b/projects/stargazer/tariffs_impl.h
index 5778945dc4e77546c4a8bf1a62c2eb0c89ffb31a..b8aac298bf03788394f99dd7a641a917bd8d4e19 100644 (file)
--- a/projects/stargazer/tariffs_impl.h
+++ b/projects/stargazer/tariffs_impl.h
@@ -41,10 +41,10 @@
 #include <string>
 #include <list>
 
 #include <string>
 #include <list>
 

-#include "tariff.h"
+#include "stg/tariff.h"
+#include "stg/tariffs.h"
+#include "stg/tariff_conf.h"

 #include "tariff_impl.h"
 #include "tariff_impl.h"

-#include "tariffs.h"
-#include "tariff_conf.h"

 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1
 
 #define TARIFF_DAY     0
 #define TARIFF_NIGHT   1