Fix msvc++'s complaint -- ambiguous namespace proxy.

examples/client/client.cpp

@@ -40,7 +40,7 @@ public:
 #include <ascs/ext/tcp.h>
 #include <ascs/ext/callbacks.h>
 using namespace ascs;
-using namespace ascs::tcp;
+//using namespace ascs::tcp;
 using namespace ascs::ext;
 using namespace ascs::ext::tcp;
 using namespace ascs::ext::tcp::proxy;
@@ -53,7 +53,7 @@ using namespace ascs::ext::tcp::proxy;
 //we only want close reconnecting mechanism on these sockets, so it cannot be done by defining macro ASCS_RECONNECT to false
 ///*
 //method 1
-class short_client : public multi_client_base<callbacks::c_socket<socks4::client_socket>>
+class short_client : public ascs::tcp::multi_client_base<callbacks::c_socket<socks4::client_socket>>
 {
 public:
 	short_client(service_pump& service_pump_) : multi_client_base(service_pump_) {set_server_addr(ASCS_SERVER_PORT);}

examples/concurrent_client/concurrent_client.cpp

@@ -17,7 +17,7 @@
 
 #include <ascs/ext/tcp.h>
 using namespace ascs;
-using namespace ascs::tcp;
+//using namespace ascs::tcp;
 using namespace ascs::ext;
 using namespace ascs::ext::tcp;
 
@@ -102,7 +102,7 @@ private:
 	std::mutex mutex;
 };
 
-class echo_client : public multi_client_base<echo_socket>
+class echo_client : public ascs::tcp::multi_client_base<echo_socket>
 {
 public:
 	echo_client(service_pump& service_pump_) : multi_client_base<echo_socket>(service_pump_) {}

examples/concurrent_server/concurrent_server.cpp

@@ -18,7 +18,7 @@
 
 #include <ascs/ext/tcp.h>
 using namespace ascs;
-using namespace ascs::tcp;
+//using namespace ascs::tcp;
 using namespace ascs::ext::tcp;
 
 #define QUIT_COMMAND	"quit"
@@ -31,7 +31,7 @@ using namespace ascs::ext::tcp;
 class echo_socket : public server_socket
 {
 public:
-	echo_socket(i_server& server_) : server_socket(server_) {unpacker()->stripped(false);}
+	echo_socket(tcp::i_server& server_) : server_socket(server_) {unpacker()->stripped(false);}
 	//other heavy things can be done in the constructor too, because we pre-created ASCS_ASYNC_ACCEPT_NUM echo_socket objects
 
 protected:
@@ -61,7 +61,7 @@ protected:
 	//msg handling end
 };
 
-class echo_server : public server_base<echo_socket>
+class echo_server : public tcp::server_base<echo_socket>
 {
 public:
 	echo_server(service_pump& service_pump_) : server_base<echo_socket>(service_pump_) {}

examples/debug_assistant/debug_assistant.cpp

@@ -14,7 +14,7 @@
 using namespace ascs;
 using namespace ascs::tcp;
 using namespace ascs::ext;
-using namespace ascs::ext::tcp;
+//sing namespace ascs::ext::tcp;
 
 #define QUIT_COMMAND	"quit"
 #define STATUS			"status"
@@ -45,10 +45,10 @@ protected:
 	}
 };
 
-class echo_socket : public server_socket
+class echo_socket : public ext::tcp::server_socket
 {
 public:
-	echo_socket(i_server& server_) : server_socket(server_) {}
+	echo_socket(i_server& server_) : ext::tcp::server_socket(server_) {}
 
 protected:
 	//msg handling: send the original msg back(echo server)

examples/echo_client/echo_client.cpp

@@ -50,7 +50,7 @@
 
 #include <ascs/ext/tcp.h>
 using namespace ascs;
-using namespace ascs::tcp;
+//using namespace ascs::tcp;
 using namespace ascs::ext;
 using namespace ascs::ext::tcp;
 
@@ -184,7 +184,7 @@ private:
 	size_t recv_index, msg_num;
 };
 
-class echo_client : public multi_client_base<echo_socket>
+class echo_client : public ascs::tcp::multi_client_base<echo_socket>
 {
 public:
 	echo_client(service_pump& service_pump_) : multi_client_base<echo_socket>(service_pump_) {}

examples/echo_server/echo_server.cpp

@@ -52,7 +52,7 @@
 using namespace ascs;
 using namespace ascs::tcp;
 using namespace ascs::ext;
-using namespace ascs::ext::tcp;
+//using namespace ascs::ext::tcp;
 
 #define QUIT_COMMAND	"quit"
 #define RESTART_COMMAND	"restart"
@@ -76,10 +76,10 @@ public:
 	virtual void test() = 0;
 };
 
-class echo_socket : public server_socket2<i_echo_server>
+class echo_socket : public ext::tcp::server_socket2<i_echo_server>
 {
 private:
-	typedef server_socket2<i_echo_server> super;
+	typedef ext::tcp::server_socket2<i_echo_server> super;
 
 public:
 	echo_socket(i_echo_server& server_) : super(server_)
@@ -155,10 +155,10 @@ protected:
 	//msg handling end
 };
 
-class echo_server : public server2<echo_socket, i_echo_server>
+class echo_server : public ext::tcp::server2<echo_socket, i_echo_server>
 {
 public:
-	echo_server(service_pump& service_pump_) : server2<echo_socket, i_echo_server>(service_pump_) {}
+	echo_server(service_pump& service_pump_) : ext::tcp::server2<echo_socket, i_echo_server>(service_pump_) {}
 
 protected:
 	//from i_echo_server, pure virtual function, we must implement it.

examples/file_client/file_client.h

@@ -4,7 +4,7 @@
 
 #include <ascs/ext/tcp.h>
 using namespace ascs;
-using namespace ascs::tcp;
+//using namespace ascs::tcp;
 using namespace ascs::ext;
 using namespace ascs::ext::tcp;
 

examples/file_common/common.h

@@ -5,7 +5,7 @@
 
 #include <ascs/base.h>
 using namespace ascs;
-using namespace ascs::tcp;
+//using namespace ascs::tcp;
 
 #ifdef _MSC_VER
 #define fseeko _fseeki64

examples/file_server/file_server.cpp

@@ -50,7 +50,7 @@ int main(int argc, const char* argv[])
 	//with multiple io_context, please also define macro ASCS_AVOID_AUTO_STOP_SERVICE.
 	sp.set_io_context_num(8);
 #endif
-	server_base<file_socket> file_server_(sp);
+	tcp::server_base<file_socket> file_server_(sp);
 
 	if (argc > 2 + index)
 		file_server_.set_server_addr(atoi(argv[1 + index]), argv[2 + index]);

examples/file_server/file_socket.cpp

@@ -14,7 +14,7 @@
 
 #include "file_socket.h"
 
-file_socket::file_socket(i_server& server_) : server_socket(server_) {}
+file_socket::file_socket(tcp::i_server& server_) : server_socket(server_) {}
 file_socket::~file_socket() {clear();}
 
 void file_socket::reset() {trans_end(); server_socket::reset();}

examples/file_server/file_socket.h

@@ -3,7 +3,7 @@
 #define FILE_SOCKET_H_
 
 #include <ascs/ext/tcp.h>
-using namespace ascs::tcp;
+//using namespace ascs::tcp;
 using namespace ascs::ext::tcp;
 
 #include "../file_common/common.h"
@@ -11,7 +11,7 @@ using namespace ascs::ext::tcp;
 class file_socket : public base_socket, public server_socket
 {
 public:
-	file_socket(i_server& server_);
+	file_socket(tcp::i_server& server_);
 	virtual ~file_socket();
 
 public:

examples/pingpong_client/pingpong_client.cpp

@@ -15,7 +15,7 @@
 
 #include <ascs/ext/tcp.h>
 using namespace ascs;
-using namespace ascs::tcp;
+//using namespace ascs::tcp;
 using namespace ascs::ext;
 using namespace ascs::ext::tcp;
 
@@ -104,7 +104,7 @@ private:
 	uint64_t total_bytes, send_bytes, recv_bytes;
 };
 
-class echo_client : public multi_client_base<echo_socket>
+class echo_client : public ascs::tcp::multi_client_base<echo_socket>
 {
 public:
 	echo_client(service_pump& service_pump_) : multi_client_base<echo_socket>(service_pump_) {}

examples/pingpong_server/pingpong_server.cpp

@@ -13,7 +13,7 @@
 
 #include <ascs/ext/tcp.h>
 using namespace ascs;
-using namespace ascs::tcp;
+//using namespace ascs::tcp;
 using namespace ascs::ext::tcp;
 
 #define QUIT_COMMAND	"quit"
@@ -26,7 +26,7 @@ using namespace ascs::ext::tcp;
 class echo_socket : public server_socket
 {
 public:
-	echo_socket(i_server& server_) : server_socket(server_) {}
+	echo_socket(tcp::i_server& server_) : server_socket(server_) {}
 
 protected:
 	//msg handling: send the original msg back (echo server), must define macro ASCS_SYNC_DISPATCH
@@ -46,7 +46,7 @@ protected:
 	//msg handling end
 };
 
-class echo_server : public server_base<echo_socket>
+class echo_server : public tcp::server_base<echo_socket>
 {
 public:
 	echo_server(service_pump& service_pump_) : server_base<echo_socket>(service_pump_) {}

examples/socket_management/server.h

 #ifndef _SERVER_H_
 #define _SERVER_H_
 
-class my_server_socket : public server_socket
+class my_server_socket : public ext::tcp::server_socket
 {
 public:
-	my_server_socket(i_server& server_) : server_socket(server_)
+	my_server_socket(i_server& server_) : ext::tcp::server_socket(server_)
 	{
 #if 3 == PACKER_UNPACKER_TYPE
 		std::dynamic_pointer_cast<ASCS_DEFAULT_PACKER>(packer())->prefix_suffix("", "\n");

examples/socket_management/socket_management.cpp

@@ -36,7 +36,7 @@
 using namespace ascs;
 using namespace ascs::tcp;
 using namespace ascs::ext;
-using namespace ascs::ext::tcp;
+//using namespace ascs::ext::tcp;
 
 #include "server.h"
 #include "client.h"