summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@googlemail.com>2012-07-23 21:29:10 +0100
committerDominik Picheta <dominikpicheta@googlemail.com>2012-07-23 21:29:10 +0100
commit3ffff9ec43fd68a4b9f70908aa6673c857fbfc8b (patch)
tree077b0010e2da402430548be38ae14672bf3ac426
parent1be06ee2ded53f5048bd6a901e6d19fc75fb3067 (diff)
downloadNim-3ffff9ec43fd68a4b9f70908aa6673c857fbfc8b.tar.gz
More deprecation warnings fixed.
-rwxr-xr-xexamples/httpserver2.nim4
-rw-r--r--lib/pure/asyncio.nim10
2 files changed, 10 insertions, 4 deletions
diff --git a/examples/httpserver2.nim b/examples/httpserver2.nim
index 45c57a755..45350ac89 100755
--- a/examples/httpserver2.nim
+++ b/examples/httpserver2.nim
@@ -232,7 +232,9 @@ when isMainModule:
     # check for new new connection & handle it
     var list: seq[TSocket] = @[server.socket]
     if select(list, 10) > 0:
-      var client = accept(server.socket)
+      var client: TSocket
+      new(client)
+      accept(server.socket, client)
       try:
         acceptRequest(server, client)
       except:
diff --git a/lib/pure/asyncio.nim b/lib/pure/asyncio.nim
index 025ff5de0..2ac03061c 100644
--- a/lib/pure/asyncio.nim
+++ b/lib/pure/asyncio.nim
@@ -262,8 +262,9 @@ proc accept*(server: PAsyncSocket): PAsyncSocket {.deprecated.} =
   ## Equivalent to ``sockets.accept``.
   ##
   ## **Warning**: This is deprecated.
-  var (client, a) = server.acceptAddr()
-  return client
+  new(result)
+  var address = ""
+  server.acceptAddr(result, address)
 
 proc newDispatcher*(): PDispatcher =
   new(result)
@@ -435,7 +436,10 @@ when isMainModule:
 
   proc testAccept(s: PAsyncSocket, arg: PObject) =
     echo("Accepting client! " & $PMyArg(arg).val)
-    var (client, address) = s.acceptAddr()
+    var client: PAsyncSocket
+    new(client)
+    var address = ""
+    s.acceptAddr(client, address)
     echo("Accepted ", address)
     client.handleRead = testRead
     var userArg: PIntType