Merge pull request #1155 from steffen-kiess/json-string

[mono.git] / mcs / class / System / System.Net.NetworkInformation / PingCompletedEventArgs.cs

diff --git a/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventArgs.cs b/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventArgs.cs
index cb4217829814ae585a0b5efb97f8c42e91e027c9..6a359fa3ad5cc1a63da3180abc34a236bbd0548d 100644 (file)
--- a/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventArgs.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/PingCompletedEventArgs.cs
@@ -1,10 +1,11 @@
 //
 // System.Net.NetworkInformation.PingCompletedEventArgs
 //
-// Author:
+// Authors:
 //     Gonzalo Paniagua Javier (gonzalo@novell.com)
+//     Atsushi Enomoto (atsushi@ximian.com)
 //
-// Copyright (c) 2006 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2006-2007 Novell, Inc. (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -25,7 +26,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
 using System;
 using System.ComponentModel;
 
@@ -33,9 +33,10 @@ namespace System.Net.NetworkInformation {
        public class PingCompletedEventArgs : AsyncCompletedEventArgs {
                PingReply reply;
 
-               internal PingCompletedEventArgs ()
-                       : base (null, false, null)
+               internal PingCompletedEventArgs (Exception ex, bool cancelled, object userState, PingReply reply)
+                       : base (ex, cancelled, userState)
                {
+                       this.reply = reply;
                }
 
                public PingReply Reply {
@@ -43,5 +44,4 @@ namespace System.Net.NetworkInformation {
                }
        }
 }
-#endif