diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2006-03-11 22:07:56 +0300 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2006-03-11 22:07:56 +0300 |
| commit | a5bd130af9800171ea504a89ffd04572502f07eb (patch) | |
| tree | 560c8ddfa26084190fa201767a1ea094209e1ab2 /mcs/class | |
| parent | cc089e12034ded28129893993d9f6e0c497f6a04 (diff) | |
2006-03-11 Miguel de Icaza <miguel@novell.com>
* Uri.cs: Pragma disable warning 612 (Obsolete methods are being
used by us internally).
Ponder: should we instead move our methods to use new versions of
the Obsoleted ones?
2006-03-11 Miguel de Icaza <miguel@novell.com>
* CodeNamespaceImportCollection.cs: It turns out that a lot of the
errors flagged with "!" were just missing explicit interface
implementations.
Implement.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* CodeDomConfigurationHandler.cs: Comment out unused methods.
* TempFileCollection.cs: Implement explicitly some interface
methods to get rid of the "!" errors on CorCompare.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* Queue.cs: Flag as serializable.
* LinkedList.cs (OnDeserialization): Fix signature.
* SortedList.cs: Implement explicitly a few methods that were
flagged by corcompare.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* IOrderedDictionary.cs: Flag GetEnumerator as a "new" method to
avoid warning.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* ConfigurationSettings.cs (ChangeConfigurationSettings): Make
internal to avoid warnings. This routine is called from
System.Web with MethodInfo.Invoke.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* DeflateStream.cs: Comment out DllImport that was not being
used.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* y
* SerialPort.cs: Remove unused variable (writeBuffer).
* SerialPortStream.cs (Dispose): override, not new.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* WebClient.cs: Only expose the right methods to avoid warnings.
* FtpDataStream.cs (Dispose): Fix signature.
* FtpWebResponse.cs: Comment out keepAlive field (unused, sounds
like we are missing features here).
* IPAddress.cs: Move m_HashCode property to the end, and set
pragmas to disable warnings.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* MailAddress.cs: Comment out unused field to remove warning.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* NetworkChange.cs: Use pragmas to eliminate warnings from events
that we do not trigger yet.
This is a candidate for using Aaron's NetworkManager code. But
would make us depend on d-bus.
* NetworkInformationException.cs: Use error_code for ErrorCode,
instead of NativeErrorCode. Fixes warning.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* AuthenticatedStream.cs: Fixed normative parameter names (yes, we
need to do this everywhere one day).
(Close): actually obey the "leaveInnerStreamOpen" setting from the
constructor.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* NetworkStream.cs (Dispose): Use the right signature depending on
the profile being built.
2006-03-11 Miguel de Icaza <miguel@novell.com>
* X509Chain.cs: Flagged member as internal to avoid unused warning.
* X500DistinguishedName.cs: Comment out unused names and move
temporary unused variables inside the comments that were removed
svn path=/trunk/mcs/; revision=57836
Diffstat (limited to 'mcs/class')
37 files changed, 228 insertions, 44 deletions
diff --git a/mcs/class/System/System.CodeDom.Compiler/ChangeLog b/mcs/class/System/System.CodeDom.Compiler/ChangeLog index ece3c667488..ac9726e0441 100644 --- a/mcs/class/System/System.CodeDom.Compiler/ChangeLog +++ b/mcs/class/System/System.CodeDom.Compiler/ChangeLog @@ -1,3 +1,10 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * CodeDomConfigurationHandler.cs: Comment out unused methods. + + * TempFileCollection.cs: Implement explicitly some interface + methods to get rid of the "!" errors on CorCompare. + 2006-02-19 Zoltan Varga <vargaz@gmail.com> * CodeDomProvider.cs: Fix the [ToolboxItem] attribute. Fixes #77513. diff --git a/mcs/class/System/System.CodeDom.Compiler/CodeDomConfigurationHandler.cs b/mcs/class/System/System.CodeDom.Compiler/CodeDomConfigurationHandler.cs index 3105ce3d0df..4e6e0d592c9 100644 --- a/mcs/class/System/System.CodeDom.Compiler/CodeDomConfigurationHandler.cs +++ b/mcs/class/System/System.CodeDom.Compiler/CodeDomConfigurationHandler.cs @@ -153,6 +153,9 @@ namespace System.CodeDom.Compiler return ExtractAttributeValue (name, node, true); } +#if false + // Not used for now + static string ShortAsmName (string long_name) { int i = long_name.IndexOf (','); @@ -160,6 +163,7 @@ namespace System.CodeDom.Compiler return long_name + ".dll"; return long_name.Substring (0, i) + ".dll"; } +#endif static void ThrowException (string message, XmlNode node) { diff --git a/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs b/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs index 0f004cf6c88..416f1089f70 100644 --- a/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs +++ b/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs @@ -91,6 +91,12 @@ namespace System.CodeDom.Compiler { } } + int ICollection.Count { + get { + return filehash.Count; + } + } + public int Count { get { @@ -174,6 +180,11 @@ namespace System.CodeDom.Compiler { } } + IEnumerator IEnumerable.GetEnumerator () + { + return(filehash.Keys.GetEnumerator()); + } + public IEnumerator GetEnumerator() { return(filehash.Keys.GetEnumerator()); diff --git a/mcs/class/System/System.CodeDom/ChangeLog b/mcs/class/System/System.CodeDom/ChangeLog index 99fab47a5d3..4678226c1b6 100644 --- a/mcs/class/System/System.CodeDom/ChangeLog +++ b/mcs/class/System/System.CodeDom/ChangeLog @@ -1,3 +1,11 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * CodeNamespaceImportCollection.cs: It turns out that a lot of the + errors flagged with "!" were just missing explicit interface + implementations. + + Implement. + 2005-11-30 Gert Driesen <drieseng@users.sourceforge.net> * CodeRemoveEventStatement.cs: Event returns new CodeEventReference diff --git a/mcs/class/System/System.CodeDom/CodeNamespaceImportCollection.cs b/mcs/class/System/System.CodeDom/CodeNamespaceImportCollection.cs index 9e2ccc1ad40..f600a4664ed 100644 --- a/mcs/class/System/System.CodeDom/CodeNamespaceImportCollection.cs +++ b/mcs/class/System/System.CodeDom/CodeNamespaceImportCollection.cs @@ -57,6 +57,12 @@ namespace System.CodeDom // // Properties // + int ICollection.Count { + get { + return namespaceImports.Count; + } + } + public int Count { get { return namespaceImports.Count; @@ -104,6 +110,11 @@ namespace System.CodeDom } } + void IList.Clear () + { + namespaceImports.Clear (); + } + public void Clear () { namespaceImports.Clear (); @@ -180,6 +191,12 @@ namespace System.CodeDom } // IEnumerable implementation + IEnumerator IEnumerable.GetEnumerator () + { + return namespaceImports.GetEnumerator(); + } + + // IEnumerable implementation public IEnumerator GetEnumerator () { return namespaceImports.GetEnumerator(); diff --git a/mcs/class/System/System.Collections.Generic/ChangeLog b/mcs/class/System/System.Collections.Generic/ChangeLog index 2f6695a5365..7f6dcba2605 100644 --- a/mcs/class/System/System.Collections.Generic/ChangeLog +++ b/mcs/class/System/System.Collections.Generic/ChangeLog @@ -1,3 +1,12 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * Queue.cs: Flag as serializable. + + * LinkedList.cs (OnDeserialization): Fix signature. + + * SortedList.cs: Implement explicitly a few methods that were + flagged by corcompare. + 2005-11-10 Zoltan Varga <vargaz@gmail.com> * SortedList.cs Queue.cs Stack.cs: Implement TrimExcess methods. diff --git a/mcs/class/System/System.Collections.Generic/LinkedList.cs b/mcs/class/System/System.Collections.Generic/LinkedList.cs index 15726884fb6..65355500afd 100644 --- a/mcs/class/System/System.Collections.Generic/LinkedList.cs +++ b/mcs/class/System/System.Collections.Generic/LinkedList.cs @@ -274,7 +274,7 @@ namespace System.Collections.Generic info.AddValue (VersionKey, version); } - public void OnDeserialization (object sender) + public virtual void OnDeserialization (object sender) { if (si != null) { @@ -489,4 +489,4 @@ namespace System.Collections.Generic } } } -#endif
\ No newline at end of file +#endif diff --git a/mcs/class/System/System.Collections.Generic/Queue.cs b/mcs/class/System/System.Collections.Generic/Queue.cs index ad6cac54e8d..dee0b5f2469 100644 --- a/mcs/class/System/System.Collections.Generic/Queue.cs +++ b/mcs/class/System/System.Collections.Generic/Queue.cs @@ -38,6 +38,7 @@ using System.Runtime.InteropServices; namespace System.Collections.Generic { [ComVisible(false)] + [Serializable] public class Queue<T> : IEnumerable <T>, ICollection, IEnumerable { T [] data; diff --git a/mcs/class/System/System.Collections.Generic/SortedList.cs b/mcs/class/System/System.Collections.Generic/SortedList.cs index 77fa2c3d2e5..375fdbbea85 100644 --- a/mcs/class/System/System.Collections.Generic/SortedList.cs +++ b/mcs/class/System/System.Collections.Generic/SortedList.cs @@ -270,6 +270,14 @@ namespace System.Collections.Generic { // IDictionary<TKey, TValue> + void IDictionary<TKey,TValue>.Add (TKey key, TValue value) + { + if (key == null) + throw new ArgumentNullException ("key"); + + PutImpl (key, value, false); + } + public virtual void Add (TKey key, TValue value) { if (key == null) @@ -295,6 +303,20 @@ namespace System.Collections.Generic { } } + bool IDictionary<TKey,TValue>.Remove (TKey key) + { + if (key == null) + throw new ArgumentNullException ("key"); + + int i = IndexOfKey (key); + if (i >= 0) { + RemoveAt (i); + return true; + } + else + return false; + } + public virtual bool Remove (TKey key) { if (key == null) @@ -311,6 +333,14 @@ namespace System.Collections.Generic { // ICollection<KeyValuePair<TKey, TValue>> + void ICollection<KeyValuePair<TKey, TValue>>.Clear () + { + defaultCapacity = INITIAL_SIZE; + this.table = new KeyValuePair<TKey, TValue> [defaultCapacity]; + inUse = 0; + modificationCount++; + } + public virtual void Clear () { defaultCapacity = INITIAL_SIZE; diff --git a/mcs/class/System/System.Collections.Specialized/ChangeLog b/mcs/class/System/System.Collections.Specialized/ChangeLog index e6c686951c9..6a6a4559f22 100644 --- a/mcs/class/System/System.Collections.Specialized/ChangeLog +++ b/mcs/class/System/System.Collections.Specialized/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * IOrderedDictionary.cs: Flag GetEnumerator as a "new" method to + avoid warning. + 2005-11-30 Sebastien Pouliot <sebastien@ximian.com> * OrderedDictionary.cs: OnDeserialization is protected virtual (not diff --git a/mcs/class/System/System.Collections.Specialized/IOrderedDictionary.cs b/mcs/class/System/System.Collections.Specialized/IOrderedDictionary.cs index 4b5865dcbd8..ee3be914995 100644 --- a/mcs/class/System/System.Collections.Specialized/IOrderedDictionary.cs +++ b/mcs/class/System/System.Collections.Specialized/IOrderedDictionary.cs @@ -32,7 +32,7 @@ namespace System.Collections.Specialized { public interface IOrderedDictionary : IDictionary { - IDictionaryEnumerator GetEnumerator (); + new IDictionaryEnumerator GetEnumerator (); void Insert (int idx, object key, object value); void RemoveAt (int idx); diff --git a/mcs/class/System/System.Configuration/ChangeLog b/mcs/class/System/System.Configuration/ChangeLog index 89e94596460..62c4bf7b332 100644 --- a/mcs/class/System/System.Configuration/ChangeLog +++ b/mcs/class/System/System.Configuration/ChangeLog @@ -1,3 +1,9 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * ConfigurationSettings.cs (ChangeConfigurationSettings): Make + internal to avoid warnings. This routine is called from + System.Web with MethodInfo.Invoke. + 2006-02-01 Atsushi Enomoto <atsushi@ximian.com> * SettingElementCollection.cs : CollectionType is protected. diff --git a/mcs/class/System/System.Configuration/ConfigurationSettings.cs b/mcs/class/System/System.Configuration/ConfigurationSettings.cs index 42b02b39de5..a6741f36dd8 100644 --- a/mcs/class/System/System.Configuration/ConfigurationSettings.cs +++ b/mcs/class/System/System.Configuration/ConfigurationSettings.cs @@ -100,8 +100,8 @@ namespace System.Configuration } } - // Invoked from System.Web - static IConfigurationSystem ChangeConfigurationSystem (IConfigurationSystem newSystem) + // Invoked from System.Web, disable warning + internal static IConfigurationSystem ChangeConfigurationSystem (IConfigurationSystem newSystem) { if (newSystem == null) throw new ArgumentNullException ("newSystem"); diff --git a/mcs/class/System/System.IO.Compression/ChangeLog b/mcs/class/System/System.IO.Compression/ChangeLog index 39a75612cff..051afa60f54 100644 --- a/mcs/class/System/System.IO.Compression/ChangeLog +++ b/mcs/class/System/System.IO.Compression/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * DeflateStream.cs: Comment out DllImport that was not being + used. + 2005-05-18 Sebastien Pouliot <sebastien@ximian.com> * DeflateStream.cs: Fixed some changed/missing exceptions. diff --git a/mcs/class/System/System.IO.Compression/DeflateStream.cs b/mcs/class/System/System.IO.Compression/DeflateStream.cs index 35b7ec0a539..e325b296d25 100644 --- a/mcs/class/System/System.IO.Compression/DeflateStream.cs +++ b/mcs/class/System/System.IO.Compression/DeflateStream.cs @@ -58,8 +58,8 @@ namespace System.IO.Compression { static extern int z_stream_get_avail_in(IntPtr z_stream); [DllImport("MonoPosixHelper")] static extern void z_stream_set_next_out(IntPtr z_stream, IntPtr next_out); - [DllImport("MonoPosixHelper")] - static extern void z_stream_set_avail_out(IntPtr z_stream, int avail_out); + //[DllImport("MonoPosixHelper")] + //static extern void z_stream_set_avail_out(IntPtr z_stream, int avail_out); [DllImport("MonoPosixHelper")] static extern ZReturnConsts z_stream_inflate(IntPtr z_stream, ref int avail_out); [DllImport("MonoPosixHelper")] diff --git a/mcs/class/System/System.IO.Ports/ChangeLog b/mcs/class/System/System.IO.Ports/ChangeLog index 2757c5d0a04..8b7299a696a 100644 --- a/mcs/class/System/System.IO.Ports/ChangeLog +++ b/mcs/class/System/System.IO.Ports/ChangeLog @@ -1,3 +1,11 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * y + + * SerialPort.cs: Remove unused variable (writeBuffer). + + * SerialPortStream.cs (Dispose): override, not new. + 2006-03-08 Carlos Alberto Cortez <calberto.cortez@gmail.com> * SerialPort.cs: diff --git a/mcs/class/System/System.IO.Ports/SerialPort.cs b/mcs/class/System/System.IO.Ports/SerialPort.cs index 4466ecf6569..90f913eecbe 100644 --- a/mcs/class/System/System.IO.Ports/SerialPort.cs +++ b/mcs/class/System/System.IO.Ports/SerialPort.cs @@ -31,10 +31,9 @@ namespace System.IO.Ports int writeBufferSize = DefaultWriteBufferSize; int readBufferOffset; int readBufferLength; - int writeBufferOffset; int writeBufferLength; byte [] readBuffer; - byte [] writeBuffer; + //byte [] writeBuffer; public SerialPort () { @@ -381,7 +380,7 @@ namespace System.IO.Ports stream = null; readBuffer = null; - writeBuffer = null; + //writeBuffer = null; } public void DiscardInBuffer () @@ -409,7 +408,7 @@ namespace System.IO.Ports isOpen = true; stream = new SerialPortStream (this); readBuffer = new byte [readBufferSize]; - writeBuffer = new byte [writeBufferSize]; + //writeBuffer = new byte [writeBufferSize]; } public int Read (byte[] buffer, int offset, int count) @@ -546,10 +545,11 @@ namespace System.IO.Ports } // events - +#pragma warning disable 67 public event SerialErrorReceivedEventHandler ErrorReceived; public event SerialPinChangedEventHandler PinChanged; public event SerialDataReceivedEventHandler DataReceived; +#pragma warning restore } public delegate void SerialDataReceivedEventHandler (object sender, SerialDataReceivedEventArgs e); diff --git a/mcs/class/System/System.IO.Ports/SerialPortStream.cs b/mcs/class/System/System.IO.Ports/SerialPortStream.cs index b9cf9801b38..c38ca6ef0a3 100644 --- a/mcs/class/System/System.IO.Ports/SerialPortStream.cs +++ b/mcs/class/System/System.IO.Ports/SerialPortStream.cs @@ -165,7 +165,7 @@ namespace System.IO.Ports write_serial (fd, buffer, offset, count, writeTimeout); } - protected void Dispose (bool disposing) + protected override void Dispose (bool disposing) { if (disposed) return; diff --git a/mcs/class/System/System.Net.Mail/ChangeLog b/mcs/class/System/System.Net.Mail/ChangeLog index 73bd5699ca0..b57929aa9ef 100644 --- a/mcs/class/System/System.Net.Mail/ChangeLog +++ b/mcs/class/System/System.Net.Mail/ChangeLog @@ -1,3 +1,7 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * MailAddress.cs: Comment out unused field to remove warning. + 2006-1-13 John Luke <john.luke@gmail.com> * MailMessage.cs: add [MonoTODO] for FormatException in ctor, diff --git a/mcs/class/System/System.Net.Mail/MailAddress.cs b/mcs/class/System/System.Net.Mail/MailAddress.cs index 965c47c95cb..2e6ad88c506 100644 --- a/mcs/class/System/System.Net.Mail/MailAddress.cs +++ b/mcs/class/System/System.Net.Mail/MailAddress.cs @@ -39,7 +39,7 @@ namespace System.Net.Mail { string address; string displayName; - Encoding displayNameEncoding; + //Encoding displayNameEncoding; #endregion // Fields @@ -57,7 +57,7 @@ namespace System.Net.Mail { { this.address = address; this.displayName = name; - this.displayNameEncoding = displayNameEncoding; + //this.displayNameEncoding = displayNameEncoding; } #endregion // Constructors @@ -84,7 +84,6 @@ namespace System.Net.Mail { #region Methods - [MonoTODO] public override bool Equals (object obj) { return Equals (obj as MailAddress); @@ -95,7 +94,6 @@ namespace System.Net.Mail { return other != null && Address == other.Address; } - [MonoTODO] public override int GetHashCode () { return address.GetHashCode (); diff --git a/mcs/class/System/System.Net.NetworkInformation/ChangeLog b/mcs/class/System/System.Net.NetworkInformation/ChangeLog index c74893946a9..453ba09e84f 100644 --- a/mcs/class/System/System.Net.NetworkInformation/ChangeLog +++ b/mcs/class/System/System.Net.NetworkInformation/ChangeLog @@ -1,3 +1,14 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * NetworkChange.cs: Use pragmas to eliminate warnings from events + that we do not trigger yet. + + This is a candidate for using Aaron's NetworkManager code. But + would make us depend on d-bus. + + * NetworkInformationException.cs: Use error_code for ErrorCode, + instead of NativeErrorCode. Fixes warning. + 2006-02-24 Gonzalo Paniagua Javier <gonzalo@ximian.com> * UnicastIPAddressInformation.cs: diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs index 72485911684..fbecf66d33b 100644 --- a/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs +++ b/mcs/class/System/System.Net.NetworkInformation/NetworkChange.cs @@ -32,8 +32,11 @@ namespace System.Net.NetworkInformation { { } + // Disable the warnings about the events not being used. +#pragma warning disable 67 public static event NetworkAddressChangedEventHandler NetworkAddressChanged; public static event NetworkAvailabilityChangedEventHandler NetworkAvailabilityChanged; +#pragma warning restore } } #endif diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs index a8c0f8bbbd1..95720f5b8ed 100644 --- a/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs +++ b/mcs/class/System/System.Net.NetworkInformation/NetworkInformationException.cs @@ -49,7 +49,7 @@ namespace System.Net.NetworkInformation { } public override int ErrorCode { - get { return NativeErrorCode; } + get { return error_code; } } } } diff --git a/mcs/class/System/System.Net.Security/AuthenticatedStream.cs b/mcs/class/System/System.Net.Security/AuthenticatedStream.cs index e99b35609bb..7a90c6102f9 100644 --- a/mcs/class/System/System.Net.Security/AuthenticatedStream.cs +++ b/mcs/class/System/System.Net.Security/AuthenticatedStream.cs @@ -46,10 +46,10 @@ namespace System.Net.Security #region Constructors - public AuthenticatedStream (Stream innerStream, bool leaveStreamOpen) + public AuthenticatedStream (Stream innerStream, bool leaveInnerStreamOpen) { this.innerStream = innerStream; - this.leaveStreamOpen = leaveStreamOpen; + this.leaveStreamOpen = leaveInnerStreamOpen; } #endregion // Constructors @@ -72,6 +72,8 @@ namespace System.Net.Security public override void Close () { + if (leaveStreamOpen) + return; innerStream.Close (); } diff --git a/mcs/class/System/System.Net.Security/ChangeLog b/mcs/class/System/System.Net.Security/ChangeLog index ca00658a836..dae8d08eb6d 100644 --- a/mcs/class/System/System.Net.Security/ChangeLog +++ b/mcs/class/System/System.Net.Security/ChangeLog @@ -1,3 +1,11 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * AuthenticatedStream.cs: Fixed normative parameter names (yes, we + need to do this everywhere one day). + + (Close): actually obey the "leaveInnerStreamOpen" setting from the + constructor. + 2006-03-07 Carlos Alberto Cortez <calberto.cortez@gmail.com> * SslStream.cs, NegotiateStream.cs: Override CanTimeout, diff --git a/mcs/class/System/System.Net.Sockets/ChangeLog b/mcs/class/System/System.Net.Sockets/ChangeLog index ed767ce09d7..00dd906e839 100644 --- a/mcs/class/System/System.Net.Sockets/ChangeLog +++ b/mcs/class/System/System.Net.Sockets/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * NetworkStream.cs (Dispose): Use the right signature depending on + the profile being built. + 2006-03-09 Gonzalo Paniagua Javier <gonzalo@ximian.com> * Socket.cs: pass something not empty to the unixep ctor. diff --git a/mcs/class/System/System.Net.Sockets/NetworkStream.cs b/mcs/class/System/System.Net.Sockets/NetworkStream.cs index 0d02bc89f98..5bf43721299 100644 --- a/mcs/class/System/System.Net.Sockets/NetworkStream.cs +++ b/mcs/class/System/System.Net.Sockets/NetworkStream.cs @@ -206,7 +206,11 @@ namespace System.Net.Sockets ((IDisposable) this).Dispose (); } - protected virtual void Dispose (bool disposing) + protected +#if NET_2_0 + override +#endif + void Dispose (bool disposing) { if (disposed) return; diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog index 0de4bdd37ac..9f3d9e39394 100644 --- a/mcs/class/System/System.Net/ChangeLog +++ b/mcs/class/System/System.Net/ChangeLog @@ -1,3 +1,15 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * WebClient.cs: Only expose the right methods to avoid warnings. + + * FtpDataStream.cs (Dispose): Fix signature. + + * FtpWebResponse.cs: Comment out keepAlive field (unused, sounds + like we are missing features here). + + * IPAddress.cs: Move m_HashCode property to the end, and set + pragmas to disable warnings. + 2006-02-16 Dick Porter <dick@ximian.com> * IPEndPoint.cs: The SocketAddress AddressFamily takes up the diff --git a/mcs/class/System/System.Net/FtpDataStream.cs b/mcs/class/System/System.Net/FtpDataStream.cs index f9f5daf5f3b..9f448bf7538 100644 --- a/mcs/class/System/System.Net/FtpDataStream.cs +++ b/mcs/class/System/System.Net/FtpDataStream.cs @@ -230,7 +230,7 @@ namespace System.Net GC.SuppressFinalize (this); } - void Dispose (bool disposing) + protected override void Dispose (bool disposing) { if (disposed) return; diff --git a/mcs/class/System/System.Net/FtpWebResponse.cs b/mcs/class/System/System.Net/FtpWebResponse.cs index 0770d1c7467..59fc10da1f7 100644 --- a/mcs/class/System/System.Net/FtpWebResponse.cs +++ b/mcs/class/System/System.Net/FtpWebResponse.cs @@ -26,7 +26,7 @@ namespace System.Net string exitMessage = String.Empty; string statusDescription; string method; - bool keepAlive; + //bool keepAlive; bool disposed; internal long contentLength = -1; @@ -34,7 +34,7 @@ namespace System.Net { this.uri = uri; this.method = method; - this.keepAlive = keepAlive; + //this.keepAlive = keepAlive; } public override long ContentLength { diff --git a/mcs/class/System/System.Net/IPAddress.cs b/mcs/class/System/System.Net/IPAddress.cs index 07ddd0d3e14..447e8e846f7 100644 --- a/mcs/class/System/System.Net/IPAddress.cs +++ b/mcs/class/System/System.Net/IPAddress.cs @@ -47,7 +47,6 @@ namespace System.Net { private AddressFamily m_Family = AddressFamily.InterNetwork; private ushort[] m_Numbers = new ushort[8]; /// ip6 Stored in network order (as ip4) private long m_ScopeId = 0; - private int m_HashCode; // Added for serialization compatibility with MS.NET public static readonly IPAddress Any = new IPAddress(0); public static readonly IPAddress Broadcast = IPAddress.Parse ("255.255.255.255"); @@ -418,5 +417,11 @@ namespace System.Net { { return i ^ (j << 13 | j >> 19) ^ (k << 26 | k >> 6) ^ (l << 7 | l >> 25); } + +#pragma warning disable 169 + // Added for serialization compatibility with MS.NET + private int m_HashCode; +#pragma warning restore + } } diff --git a/mcs/class/System/System.Net/WebClient.cs b/mcs/class/System/System.Net/WebClient.cs index d4448a9327b..1015bd3c91a 100644 --- a/mcs/class/System/System.Net/WebClient.cs +++ b/mcs/class/System/System.Net/WebClient.cs @@ -142,11 +142,15 @@ namespace System.Net #if NET_2_0 public #endif - byte [] DownloadData (Uri address) + byte [] DownloadData (Uri address, string method) { - return DownloadData (address, "GET"); + WebRequest request = SetupRequest (address, method); + request.Method = method; + WebResponse response = request.GetResponse (); + Stream st = ProcessResponse (response); + return ReadAll (st, (int) response.ContentLength); } - + #if NET_2_0 public #endif @@ -156,17 +160,12 @@ namespace System.Net } #if NET_2_0 - public -#endif - byte [] DownloadData (Uri address, string method) + public byte [] DownloadData (Uri address) { - WebRequest request = SetupRequest (address, method); - request.Method = method; - WebResponse response = request.GetResponse (); - Stream st = ProcessResponse (response); - return ReadAll (st, (int) response.ContentLength); + return DownloadData (address, "GET"); } - +#endif + public void DownloadFile (string address, string fileName) { DownloadFile (MakeUri (address), fileName); diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog b/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog index 7a100461ec1..7e4fa19e875 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog @@ -1,3 +1,10 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * X509Chain.cs: Flagged member as internal to avoid unused warning. + + * X500DistinguishedName.cs: Comment out unused names and move + temporary unused variables inside the comments that were removed + 2005-11-24 Sebastien Pouliot <sebastien@ximian.com> * X500DistinguishedName.cs: Added validation (still missing parsing). diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs index 1c5bdb399a1..c6cfa42c026 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X500DistinguishedName.cs @@ -148,6 +148,7 @@ namespace System.Security.Cryptography.X509Certificates { // needs quotes ? } +#if false private string GetSeparator (X500DistinguishedNameFlags flag) { if ((flag & X500DistinguishedNameFlags.UseSemicolons) != 0) @@ -158,6 +159,7 @@ namespace System.Security.Cryptography.X509Certificates { return Environment.NewLine; return ","; //default } +#endif // decode the DN using the (byte[]) RawData private void DecodeRawData () @@ -181,9 +183,9 @@ namespace System.Security.Cryptography.X509Certificates { ASN1 dn = MX.X501.FromString (name); - int pos = 0; +/* int pos = 0; ASN1 asn1 = new ASN1 (0x30); -/* while (pos < name.Length) { + while (pos < name.Length) { MX.X520.AttributeTypeAndValue atv = ReadAttribute (name, ref pos); atv.Value = ReadValue (name, ref pos); }*/ diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs index 22438744cc9..8ec41a21e52 100644 --- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs +++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs @@ -33,7 +33,8 @@ namespace System.Security.Cryptography.X509Certificates { public class X509Chain { - private bool _machineContext; + // Set to internal to remove a warning + internal bool _machineContext; private X509ChainElementCollection _elements; private X509ChainPolicy _policy; private X509ChainStatus[] _status; diff --git a/mcs/class/System/System/ChangeLog b/mcs/class/System/System/ChangeLog index ee7f645b193..f158dae15e3 100644 --- a/mcs/class/System/System/ChangeLog +++ b/mcs/class/System/System/ChangeLog @@ -1,3 +1,11 @@ +2006-03-11 Miguel de Icaza <miguel@novell.com> + + * Uri.cs: Pragma disable warning 612 (Obsolete methods are being + used by us internally). + + Ponder: should we instead move our methods to use new versions of + the Obsoleted ones? + 2006-02-21 Atsushi Enomoto <atsushi@ximian.com> * Uri.cs : seems like Uri opreator == and != are case sensitive. diff --git a/mcs/class/System/System/Uri.cs b/mcs/class/System/System/Uri.cs index caaafa5619e..5099d5ffbcd 100644 --- a/mcs/class/System/System/Uri.cs +++ b/mcs/class/System/System/Uri.cs @@ -33,7 +33,10 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // - +// See RFC 2396 for more info on URI's. +// +// TODO: optimize by parsing host string only once +// using System.ComponentModel; using System.IO; using System.Net; @@ -42,9 +45,10 @@ using System.Text; using System.Collections; using System.Globalization; -// See RFC 2396 for more info on URI's. - -// TODO: optimize by parsing host string only once +// +// Disable warnings on Obsolete methods being used +// +#pragma warning disable 612 namespace System { |