summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-07-13 23:50:42 +0300
committerAndrei Karas <akaras@inbox.ru>2017-07-13 23:50:42 +0300
commit16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (patch)
tree1db34fd6c50a1421ac186a3652f1e43494881286 /src/net
parentf5c004a94061cab1685fa063b039dc2eec29cbbe (diff)
downloadmv-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.tar.gz
mv-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.tar.bz2
mv-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.tar.xz
mv-16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1.zip
Add vector.h for use different vectors.
Also replace <vector> include into "utils/vector.h"
Diffstat (limited to 'src/net')
-rw-r--r--src/net/buyingstorehandler.h3
-rw-r--r--src/net/cashshophandler.h2
-rw-r--r--src/net/charserverhandler.h3
-rw-r--r--src/net/ea/inventoryitem.h4
-rw-r--r--src/net/inventoryhandler.h4
-rw-r--r--src/net/ipc.h3
-rw-r--r--src/net/markethandler.h2
-rw-r--r--src/net/npchandler.h2
-rw-r--r--src/net/vendinghandler.h3
-rw-r--r--src/net/worldinfo.h3
10 files changed, 17 insertions, 12 deletions
diff --git a/src/net/buyingstorehandler.h b/src/net/buyingstorehandler.h
index 007207480..3d2b2b0e9 100644
--- a/src/net/buyingstorehandler.h
+++ b/src/net/buyingstorehandler.h
@@ -21,8 +21,9 @@
#ifndef NET_BUYINGSTOREHANDLER_H
#define NET_BUYINGSTOREHANDLER_H
+#include "utils/vector.h"
+
#include <string>
-#include <vector>
#include "localconsts.h"
diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h
index 2d07be871..c34548088 100644
--- a/src/net/cashshophandler.h
+++ b/src/net/cashshophandler.h
@@ -23,7 +23,7 @@
#include "enums/simpletypes/itemcolor.h"
-#include <vector>
+#include "utils/vector.h"
#include "localconsts.h"
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 295e3e512..ac07909be 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -29,8 +29,9 @@
#include "net/characters.h"
+#include "utils/vector.h"
+
#include <string>
-#include <vector>
class CharCreateDialog;
class CharSelectDialog;
diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h
index 6daa26eb7..cbf5d1560 100644
--- a/src/net/ea/inventoryitem.h
+++ b/src/net/ea/inventoryitem.h
@@ -33,9 +33,9 @@
#include "enums/simpletypes/identified.h"
#include "enums/simpletypes/itemcolor.h"
-#include "resources/item/itemoptionslist.h"
+#include "utils/vector.h"
-#include <vector>
+#include "resources/item/itemoptionslist.h"
#include "localconsts.h"
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 4c0799b7b..b1b7591f2 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -25,9 +25,9 @@
#include "enums/simpletypes/beingid.h"
-#include "resources/inventory/inventory.h"
+#include "utils/vector.h"
-#include <vector>
+#include "resources/inventory/inventory.h"
namespace Net
{
diff --git a/src/net/ipc.h b/src/net/ipc.h
index 4a346e890..0d45e781f 100644
--- a/src/net/ipc.h
+++ b/src/net/ipc.h
@@ -28,8 +28,9 @@ PRAGMACLANG6GCC(GCC diagnostic ignored "-Wold-style-cast")
#include "net/sdltcpnet.h"
PRAGMACLANG6GCC(GCC diagnostic pop)
+#include "utils/vector.h"
+
#include <string>
-#include <vector>
class IPC final
{
diff --git a/src/net/markethandler.h b/src/net/markethandler.h
index 6ace1e117..73040102f 100644
--- a/src/net/markethandler.h
+++ b/src/net/markethandler.h
@@ -25,7 +25,7 @@
#include "enums/simpletypes/itemcolor.h"
-#include <vector>
+#include "utils/vector.h"
#include "localconsts.h"
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index af92eb0b1..d332fba95 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -32,7 +32,7 @@
#include "enums/simpletypes/beingid.h"
#include "enums/simpletypes/itemcolor.h"
-#include <vector>
+#include "utils/vector.h"
#include "localconsts.h"
diff --git a/src/net/vendinghandler.h b/src/net/vendinghandler.h
index f2348607d..3caeaf2b3 100644
--- a/src/net/vendinghandler.h
+++ b/src/net/vendinghandler.h
@@ -21,8 +21,9 @@
#ifndef NET_VENDINGHANDLER_H
#define NET_VENDINGHANDLER_H
+#include "utils/vector.h"
+
#include <string>
-#include <vector>
#include "localconsts.h"
diff --git a/src/net/worldinfo.h b/src/net/worldinfo.h
index 7a1e21c9a..fbbb30bfa 100644
--- a/src/net/worldinfo.h
+++ b/src/net/worldinfo.h
@@ -23,6 +23,8 @@
#ifndef NET_WORLDINFO_H
#define NET_WORLDINFO_H
+#include "utils/vector.h"
+
#if defined(__GXX_EXPERIMENTAL_CXX0X__)
#if defined(__APPLE__)
#include <tr1/cstdint>
@@ -30,7 +32,6 @@
#endif // defined(__GXX_EXPERIMENTAL_CXX0X__)
#include <string>
-#include <vector>
#include "localconsts.h"