From 40fc27154fe754181934dc7ee31375e6bdfb33fc Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 23 Oct 2018 12:23:58 +0800 Subject: *merge from minimal --- src/lua/modules/net/net.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/lua/modules/net/net.cpp') diff --git a/src/lua/modules/net/net.cpp b/src/lua/modules/net/net.cpp index a984920..4ef9ece 100644 --- a/src/lua/modules/net/net.cpp +++ b/src/lua/modules/net/net.cpp @@ -4,16 +4,17 @@ #include "lua/common/common.h" #include "Buffer.h" -namespace jin +namespace JinEngine { -namespace lua +namespace Lua { - using namespace jin::lua::net; - using namespace jin::net; + + using namespace JinEngine::Lua::Net; + using namespace JinEngine::Net; static int l_initNetwork(lua_State* L) { - jin::net::Net::get()->init(); + JinEngine::Net::NetManager::get()->init(); return 1; } @@ -56,7 +57,7 @@ namespace lua { int size = luax_checkinteger(L, 1); Proxy* proxy = (Proxy*)luax_newinstance(L, JIN_NETWORK_BUFFER, sizeof(Proxy)); - net::Buffer* buffer = new net::Buffer(size); + Net::Buffer* buffer = new Net::Buffer(size); proxy->bind(new Ref(buffer, JIN_NETWORK_BUFFER)); return 1; } @@ -81,5 +82,5 @@ namespace lua return 1; } -} // lua -} // jin \ No newline at end of file +} // namespace Lua +} // namespace JinEngine \ No newline at end of file -- cgit v1.1-26-g67d0