1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
diff --git a/lib/serializer/Connection.h b/lib/serializer/Connection.h
index 5eaf286a..b1923bfd 100644
--- a/lib/serializer/Connection.h
+++ b/lib/serializer/Connection.h
@@ -14,31 +14,12 @@
#include "BinaryDeserializer.h"
#include "BinarySerializer.h"
-struct CPack;
+#include <boost/asio.hpp>
-namespace boost
-{
- namespace asio
- {
- namespace ip
- {
- class tcp;
- }
- class io_service;
-
- template <typename Protocol> class stream_socket_service;
- template <typename Protocol,typename StreamSocketService>
- class basic_stream_socket;
-
- template <typename Protocol> class socket_acceptor_service;
- template <typename Protocol,typename SocketAcceptorService>
- class basic_socket_acceptor;
- }
- class mutex;
-}
+struct CPack;
-typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp , boost::asio::stream_socket_service<boost::asio::ip::tcp> > TSocket;
-typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp, boost::asio::socket_acceptor_service<boost::asio::ip::tcp> > TAcceptor;
+typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp > TSocket;
+typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp> TAcceptor;
/// Main class for network communication
/// Allows establishing connection and bidirectional read-write
diff --git a/server/CVCMIServer.h b/server/CVCMIServer.h
index 5443d355..4614006b 100644
--- a/server/CVCMIServer.h
+++ b/server/CVCMIServer.h
@@ -11,6 +11,8 @@
* Full text of license available in license.txt file, in main folder
*
*/
+
+#include <boost/asio.hpp>
class CMapInfo;
@@ -18,28 +20,8 @@ class CConnection;
struct CPackForSelectionScreen;
class CGameHandler;
-namespace boost
-{
- namespace asio
- {
- namespace ip
- {
- class tcp;
- }
- class io_service;
-
- template <typename Protocol> class stream_socket_service;
- template <typename Protocol,typename StreamSocketService>
- class basic_stream_socket;
-
- template <typename Protocol> class socket_acceptor_service;
- template <typename Protocol,typename SocketAcceptorService>
- class basic_socket_acceptor;
- }
-};
-
-typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp, boost::asio::socket_acceptor_service<boost::asio::ip::tcp> > TAcceptor;
-typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp , boost::asio::stream_socket_service<boost::asio::ip::tcp> > TSocket;
+typedef boost::asio::basic_socket_acceptor<boost::asio::ip::tcp> TAcceptor;
+typedef boost::asio::basic_stream_socket < boost::asio::ip::tcp > TSocket;
class CVCMIServer
{
|