From 3ffff9ec43fd68a4b9f70908aa6673c857fbfc8b Mon Sep 17 00:00:00 2001
From: Dominik Picheta <dominikpicheta@googlemail.com>
Date: Mon, 23 Jul 2012 21:29:10 +0100
Subject: [PATCH] More deprecation warnings fixed.

---
 examples/httpserver2.nim |  4 +++-
 lib/pure/asyncio.nim     | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/examples/httpserver2.nim b/examples/httpserver2.nim
index 45c57a7556..45350ac89a 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 025ff5de0a..2ac03061c1 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