Update of /cvsroot/boost/boost/boost/asio/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28176

Modified Files:
        socket_ops.hpp 
Log Message:
Fix to correctly clear error after successful call of WSAAddresstoString or
WSAStringToAddress.


Index: socket_ops.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/asio/detail/socket_ops.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- socket_ops.hpp      6 Jan 2007 09:10:54 -0000       1.10
+++ socket_ops.hpp      9 Feb 2007 06:43:00 -0000       1.11
@@ -502,8 +502,12 @@
         reinterpret_cast<sockaddr*>(&address),
         address_length, 0, dest, &string_length), ec);
 
+  // Windows may set error code on success.
+  if (result != socket_error_retval)
+    clear_error(ec);
+
   // Windows may not set an error code on failure.
-  if (result == socket_error_retval && !ec)
+  else if (result == socket_error_retval && !ec)
     ec = boost::asio::error::invalid_argument;
 
   return result == socket_error_retval ? 0 : dest;
@@ -557,6 +561,7 @@
     else if (strcmp(src, "255.255.255.255") == 0)
     {
       static_cast<in4_addr_type*>(dest)->s_addr = INADDR_NONE;
+      clear_error(ec);
     }
   }
   else // AF_INET6


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to