A map of ip-to-user replaced with vector of pairs

[stg.git] / projects / convertor / main.cpp

diff --git a/projects/convertor/main.cpp b/projects/convertor/main.cpp
index 9308ed3660713183ac5d1da23f88c126cff197bb..e0679d070fbf360fd11f1df31996fdba503849b5 100644 (file)
--- a/projects/convertor/main.cpp
+++ b/projects/convertor/main.cpp
@@ -32,19 +32,20 @@
 #include <ctime>
 #include <algorithm>
 
 #include <ctime>
 #include <algorithm>
 

-#include "common.h"
-#include "store.h"
+#include "stg/common.h"
+#include "stg/store.h"
+#include "stg/conffiles.h"
+
+#include "stg/user_stat.h"
+#include "stg/user_conf.h"
+#include "stg/corp_conf.h"
+#include "stg/service_conf.h"
+#include "stg/admin_conf.h"
+#include "stg/tariff_conf.h"
+#include "stg/settings.h"
+#include "stg/message.h"
+

 #include "settings_impl.h"
 #include "settings_impl.h"

-#include "conffiles.h"
-
-#include "user_stat.h"
-#include "user_conf.h"
-#include "corp_conf.h"
-#include "service_conf.h"
-#include "admin_conf.h"
-#include "tariff_conf.h"
-#include "settings.h"
-#include "stg_message.h"

 
 using namespace std;
 
 
 using namespace std;