From a16ce94158c9cf22a19c0e73dfe2e992a8302af1 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 8 Dec 2018 22:05:31 +0800
Subject: =?UTF-8?q?*=E5=8E=BB=E9=99=A4shared=20template?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lua/modules/net/je_lua_socket.cpp | 36 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'src/lua/modules/net/je_lua_socket.cpp')

diff --git a/src/lua/modules/net/je_lua_socket.cpp b/src/lua/modules/net/je_lua_socket.cpp
index 8eb4051..af0cef0 100644
--- a/src/lua/modules/net/je_lua_socket.cpp
+++ b/src/lua/modules/net/je_lua_socket.cpp
@@ -13,61 +13,59 @@ namespace JinEngine
 
         const char* Jin_Lua_Socket = "Socket";
 
-	    typedef Shared<Socket>& SharedSocket;
-
         const int BUFFER_SIZE = 1024;
 
-        LUA_IMPLEMENT inline SharedSocket checkSocket(lua_State* L, int pos = 1)
+        LUA_IMPLEMENT inline Socket* checkSocket(lua_State* L, int pos = 1)
         {
             LuaObject* luaObj = (LuaObject*)luax_checktype(L, pos, Jin_Lua_Socket);
-		    return luaObj->getShared<Socket>();
+		    return luaObj->getObject<Socket>();
         }
 
-        LUA_IMPLEMENT inline Shared<Buffer>& checkNetBuffer(lua_State* L, int pos = 1)
+        LUA_IMPLEMENT inline Buffer* checkNetBuffer(lua_State* L, int pos = 1)
         {
             LuaObject* luaObj = (LuaObject*)luax_checktype(L, pos, Jin_Lua_Buffer);
-		    return luaObj->getShared<Buffer>();
+		    return luaObj->getObject<Buffer>();
         }
 
         // return net.Socket
         LUA_IMPLEMENT int l_accept(lua_State* L) 
         {
-		    SharedSocket socket = checkSocket(L);
+		    Socket* socket = checkSocket(L);
             Socket* client = socket->accept();
-            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Socket, new Shared<Socket>(client, Jin_Lua_Socket));
+            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Socket, new Shared(client, Jin_Lua_Socket));
             return 1;
         }
     
         // return net.Buffer
         LUA_IMPLEMENT int l_receive(lua_State* L) 
         {
-		    SharedSocket socket = checkSocket(L);
+		    Socket* socket = checkSocket(L);
             char buffer[BUFFER_SIZE] = {0};
             int size = socket->receive(buffer, BUFFER_SIZE);
             Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
-            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared<Buffer>(netBuffer, Jin_Lua_Buffer));
+            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared(netBuffer, Jin_Lua_Buffer));
             return 1;
         }
     
         // Socket:receiveFrom(address, port)
         LUA_IMPLEMENT int l_receiveFrom(lua_State* L) 
         {
-		    SharedSocket socket = checkSocket(L);
+		    Socket* socket = checkSocket(L);
             int address = luax_checkinteger(L, 2);
             int port = luax_checkinteger(L, 3);
             char buffer[BUFFER_SIZE];
             int size = socket->receiveFrom(buffer, BUFFER_SIZE, address, port);
             Net::Buffer* netBuffer = new Net::Buffer(buffer, size);
-            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared<Buffer>(netBuffer, Jin_Lua_Buffer));
+            LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Buffer, new Shared(netBuffer, Jin_Lua_Buffer));
             return 1;
         }
 
         // Socket:send(net.Buffer) -> data_length
         LUA_IMPLEMENT int l_send(lua_State* L) 
         {
-		    SharedSocket socket = checkSocket(L);
-		    Shared<Buffer>& shared = checkNetBuffer(L, 2);
-            int len = socket->send(shared->buffer, shared->size);
+		    Socket* socket = checkSocket(L);
+		    Buffer* buffer = checkNetBuffer(L, 2);
+            int len = socket->send(buffer->buffer, buffer->size);
             luax_pushinteger(L, len);
             return 1;
         }
@@ -75,24 +73,24 @@ namespace JinEngine
         // Socket:sendTo(address, port, net.Buffer)
         LUA_IMPLEMENT int l_sendTo(lua_State* L) 
         {
-		    SharedSocket socket = checkSocket(L);
+		    Socket* socket = checkSocket(L);
             int address = luax_checkinteger(L, 2);
             int port = luax_checkinteger(L, 3);
-		    Shared<Buffer>& buffer = checkNetBuffer(L, 4);
+		    Buffer* buffer = checkNetBuffer(L, 4);
             socket->sendTo(buffer->buffer, buffer->size, address, port);
             return 0;
         }
     
         LUA_IMPLEMENT int l_close(lua_State* L) 
         {
-		    SharedSocket socket = checkSocket(L);
+		    Socket* socket = checkSocket(L);
             socket->close();
             return 0;
         }
 
         LUA_IMPLEMENT int l_configBlocking(lua_State* L) 
         {
-		    SharedSocket socket = checkSocket(L);
+		    Socket* socket = checkSocket(L);
             bool blocking = luax_checkbool(L, 2);
             socket->configureBlocking(blocking);
             return 0;
-- 
cgit v1.1-26-g67d0