[Mono-dev] Fwd: [Mono-patches] [mono/mono] [3 commits] 894b26fe: Warnings cleanup
Marek Safar
msafar at novell.com
Sat Oct 16 11:38:25 EDT 2010
Hello Atsushi,
> Can you please don't randomly make cosmetic code changes that does
> not only prevent active hacking but also removes variable/member
> references that we can find by IDEs? There are very often reason we
> have such extra code.
I am not doing this for a fun but it helps me greatly if I can build
mono class libraries with as little warnings as possible. It's much
easier for me to look for warnings regressions or testing new warnings
checks when the warnings count in our base class library is manageable.
Unfortunately, not many people care about the warnings (I know there are
some exceptions like Zoltan and others which I am very grateful for) but
it not possible for me to track every maintainer of every change in a
file where I comment out or fix a warning.
I always try to fix cosmetic warnings first and keep the hard one for
later when it's clear what the code should be doing. It'd be very
helpful if you tell me what of my change prevents you from active
hacking. I'd like to fix it immediately and avoid same conflict in the
future.
Looking at your latest code changes I cannot see anything what ordinary
git merge cannot merge in your latest change. It seems to me it's more
matter of setting up your git to merge changes correctly.
Marek
> -------- Original Message --------
> Subject: [Mono-patches] [mono/mono] [3 commits] 894b26fe: Warnings
> cleanup
> Date: Fri, 15 Oct 2010 10:20:42 -0400
> From: Marek Safar (marek.safar at gmail.com)
> <mono-patches at lists.ximian.com>
> Reply-To: Mono Patches List <mono-patches at lists.ximian.com>
> To: Mono Patches List <mono-patches at lists.ximian.com>
>
>
>
> Branch: refs/heads/master
> Home: http://github.com/mono/mono
>
> Commit: 894b26feca4a37cc0a3305163a212ffd94a6a207
> Author: Marek Safar<marek.safar at gmail.com>
> Date: 10/15/2010 10:20:25
> URL:
> http://github.com/mono/mono/commit/894b26feca4a37cc0a3305163a212ffd94a6a207
>
>
> Warnings cleanup
>
> Changed paths:
> M mcs/class/corlib/System.IO/DriveInfo.cs
> M mcs/class/corlib/System.IO/UnmanagedMemoryAccessor.cs
> M mcs/class/corlib/System.Reflection.Emit/PropertyBuilder.cs
> M mcs/class/corlib/System.Reflection/ConstructorInfo.cs
> M mcs/class/corlib/System.Reflection/EventInfo.cs
> M mcs/class/corlib/System.Reflection/FieldInfo.cs
> M mcs/class/corlib/System.Reflection/MemberInfo.cs
> M mcs/class/corlib/System.Reflection/MethodBase.cs
> M mcs/class/corlib/System.Reflection/MethodInfo.cs
> M mcs/class/corlib/System.Reflection/Module.cs
> M mcs/class/corlib/System.Reflection/PropertyInfo.cs
> M
> mcs/class/corlib/System.Runtime.CompilerServices/ConditionalWeakTable.cs
> M mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs
> M mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
> M mcs/class/corlib/System/Type.cs
>
> Modified: mcs/class/corlib/System.IO/DriveInfo.cs
> ===================================================================
> --- a/mcs/class/corlib/System.IO/DriveInfo.cs
> +++ b/mcs/class/corlib/System.IO/DriveInfo.cs
> @@ -190,7 +190,6 @@ namespace System.IO {
> if (slash>= 0) {
> if (sb == null)
> sb = new StringBuilder ();
> - string str = path.Substring (start, slash - start);
> sb.Append (path.Substring (start, slash - start));
> char c = (char) ((path [slash + 1] - '0')<< 6);
> c += (char) ((path [slash + 2] - '0')<< 3);
> Modified: mcs/class/corlib/System.IO/UnmanagedMemoryAccessor.cs
> ===================================================================
> --- a/mcs/class/corlib/System.IO/UnmanagedMemoryAccessor.cs
> +++ b/mcs/class/corlib/System.IO/UnmanagedMemoryAccessor.cs
> @@ -35,6 +35,7 @@ using System.Security.Permissions;
>
> namespace System.IO
> {
> + [MonoTODO ("Offset is ignored")]
> public class UnmanagedMemoryAccessor : IDisposable {
> SafeBuffer buffer;
> long offset;
> @@ -64,8 +65,6 @@ namespace System.IO
> throw new ArgumentOutOfRangeException ("offset");
> if (capacity< 0)
> throw new ArgumentOutOfRangeException ("capacity");
> - if (offset + capacity< 0)
> - throw new InvalidOperationException ();
>
> if (access == FileAccess.Read || access ==
> FileAccess.ReadWrite)
> canread = true;
> Modified: mcs/class/corlib/System.Reflection.Emit/PropertyBuilder.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Reflection.Emit/PropertyBuilder.cs
> +++ b/mcs/class/corlib/System.Reflection.Emit/PropertyBuilder.cs
> @@ -44,6 +44,7 @@ namespace System.Reflection.Emit {
> [ClassInterface (ClassInterfaceType.None)]
> public sealed class PropertyBuilder : PropertyInfo,
> _PropertyBuilder {
>
> +// Managed version of MonoReflectionPropertyBuilder
> #pragma warning disable 169, 414
> private PropertyAttributes attrs;
> private string name;
> @@ -59,8 +60,8 @@ namespace System.Reflection.Emit {
> private Type[] returnModOpt;
> private Type[][] paramModReq;
> private Type[][] paramModOpt;
> + CallingConventions callingConvention;
> #pragma warning restore 169, 414
> - CallingConventions callingConvention; // TODO: Implement
>
> internal PropertyBuilder (TypeBuilder tb, string name,
> PropertyAttributes attributes, CallingConventions callingConvention,
> Type returnType, Type[] returnModReq, Type[] returnModOpt, Type[]
> parameterTypes, Type[][] paramModReq, Type[][] paramModOpt)
> {
> Modified: mcs/class/corlib/System.Reflection/ConstructorInfo.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Reflection/ConstructorInfo.cs
> +++ b/mcs/class/corlib/System.Reflection/ConstructorInfo.cs
> @@ -108,7 +108,7 @@ namespace System.Reflection {
> #if NET_4_0
> public override bool Equals (object obj)
> {
> - return obj == this;
> + return obj == (object) this;
> }
>
> public override int GetHashCode ()
> Modified: mcs/class/corlib/System.Reflection/EventInfo.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Reflection/EventInfo.cs
> +++ b/mcs/class/corlib/System.Reflection/EventInfo.cs
> @@ -140,7 +140,7 @@ namespace System.Reflection {
> #if NET_4_0
> public override bool Equals (object obj)
> {
> - return obj == this;
> + return obj == (object) this;
> }
>
> public override int GetHashCode ()
> Modified: mcs/class/corlib/System.Reflection/FieldInfo.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Reflection/FieldInfo.cs
> +++ b/mcs/class/corlib/System.Reflection/FieldInfo.cs
> @@ -132,13 +132,6 @@ namespace System.Reflection {
>
> public abstract void SetValue (object obj, object value,
> BindingFlags invokeAttr, Binder binder, CultureInfo culture);
>
> -#if ONLY_1_1
> - public new Type GetType ()
> - {
> - return base.GetType ();
> - }
> -#endif
> -
> [DebuggerHidden]
> [DebuggerStepThrough]
> public void SetValue (object obj, object value)
> @@ -260,7 +253,7 @@ namespace System.Reflection {
> #if NET_4_0
> public override bool Equals (object obj)
> {
> - return obj == this;
> + return obj == (object) this;
> }
>
> public override int GetHashCode ()
> Modified: mcs/class/corlib/System.Reflection/MemberInfo.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Reflection/MemberInfo.cs
> +++ b/mcs/class/corlib/System.Reflection/MemberInfo.cs
> @@ -81,7 +81,7 @@ namespace System.Reflection {
> #if NET_4_0
> public override bool Equals (object obj)
> {
> - return obj == this;
> + return obj == (object) this;
> }
>
> public override int GetHashCode ()
> Modified: mcs/class/corlib/System.Reflection/MethodBase.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Reflection/MethodBase.cs
> +++ b/mcs/class/corlib/System.Reflection/MethodBase.cs
> @@ -226,7 +226,7 @@ namespace System.Reflection {
> #if NET_4_0
> public override bool Equals (object obj)
> {
> - return obj == this;
> + return obj == (object) this;
> }
>
> public override int GetHashCode ()
> Modified: mcs/class/corlib/System.Reflection/MethodInfo.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Reflection/MethodInfo.cs
> +++ b/mcs/class/corlib/System.Reflection/MethodInfo.cs
> @@ -58,17 +58,6 @@ namespace System.Reflection {
>
> public abstract ICustomAttributeProvider
> ReturnTypeCustomAttributes { get; }
>
> - // FIXME: when this method is uncommented, corlib fails
> - // to build
> -/*
> - [DebuggerStepThrough]
> - [DebuggerHidden]
> - public new object Invoke (object obj, object[] parameters)
> - {
> - return base.Invoke (obj, parameters);
> - }
> -*/
> -
> void _MethodInfo.GetIDsOfNames ([In] ref Guid riid, IntPtr
> rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
> {
> throw new NotImplementedException ();
> @@ -136,7 +125,7 @@ namespace System.Reflection {
> #if NET_4_0
> public override bool Equals (object obj)
> {
> - return obj == this;
> + return obj == (object) this;
> }
>
> public override int GetHashCode ()
> Modified: mcs/class/corlib/System.Reflection/Module.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Reflection/Module.cs
> +++ b/mcs/class/corlib/System.Reflection/Module.cs
> @@ -293,7 +293,7 @@ namespace System.Reflection {
> #if NET_4_0
> public override bool Equals (object obj)
> {
> - return obj == this;
> + return obj == (object) this;
> }
>
> public override int GetHashCode ()
> Modified: mcs/class/corlib/System.Reflection/PropertyInfo.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Reflection/PropertyInfo.cs
> +++ b/mcs/class/corlib/System.Reflection/PropertyInfo.cs
> @@ -70,13 +70,6 @@ namespace System.Reflection {
>
> public abstract ParameterInfo[] GetIndexParameters();
>
> -#if ONLY_1_1
> - public new Type GetType ()
> - {
> - return base.GetType ();
> - }
> -#endif
> -
> public MethodInfo GetSetMethod()
> {
> return GetSetMethod (false);
> @@ -110,7 +103,8 @@ namespace System.Reflection {
> return Type.EmptyTypes;
> }
>
> - NotImplementedException CreateNIE () {
> + static NotImplementedException CreateNIE ()
> + {
> return new NotImplementedException ();
> }
>
> @@ -125,7 +119,7 @@ namespace System.Reflection {
> #if NET_4_0
> public override bool Equals (object obj)
> {
> - return obj == this;
> + return obj == (object) this;
> }
>
> public override int GetHashCode ()
> Modified:
> mcs/class/corlib/System.Runtime.CompilerServices/ConditionalWeakTable.cs
> ===================================================================
> ---
> a/mcs/class/corlib/System.Runtime.CompilerServices/ConditionalWeakTable.cs
>
> +++
> b/mcs/class/corlib/System.Runtime.CompilerServices/ConditionalWeakTable.cs
>
> @@ -110,7 +110,6 @@ namespace System.Runtime.CompilerServices
>
> public void Add (TKey key, TValue value)
> {
> - TValue tmp;
> if (key == default (TKey))
> throw new ArgumentNullException ("Null key", "key");
>
> Modified: mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs
> +++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs
> @@ -64,7 +64,7 @@ namespace System.Runtime.Remoting.Contexts {
>
> object[] datastore;
> ArrayList context_properties;
> - bool frozen;
> +// bool frozen;
>
> static int global_count;
>
> @@ -212,8 +212,8 @@ namespace System.Runtime.Remoting.Contexts {
> if (this == DefaultContext)
> throw new InvalidOperationException ("Can not add
> properties to " +
> "default context");
> - if (frozen)
> - throw new InvalidOperationException ("Context is
> Frozen");
> +// if (frozen)
> +// throw new InvalidOperationException ("Context is
> Frozen");
>
> if (context_properties == null)
> context_properties = new ArrayList ();
> Modified:
> mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
> ===================================================================
> --- a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
> +++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
> @@ -42,7 +42,6 @@ namespace System.Runtime.Remoting.Messaging
> {
> object[] _outArgs;
> object[] _args;
> - int _outArgsCount;
> LogicalCallContext _callCtx;
> object _returnValue;
> string _uri;
> @@ -63,7 +62,6 @@ namespace System.Runtime.Remoting.Messaging
>
> _returnValue = ret;
> _args = outArgs;
> - _outArgsCount = outArgsCount;
> _callCtx = callCtx;
> if (mcm != null) {
> _uri = mcm.Uri;
> Modified: mcs/class/corlib/System/Type.cs
> ===================================================================
> --- a/mcs/class/corlib/System/Type.cs
> +++ b/mcs/class/corlib/System/Type.cs
> @@ -381,11 +381,14 @@ namespace System {
> }
>
> public override MemberTypes MemberType {
> - get {return MemberTypes.TypeInfo;}
> + get {
> + return MemberTypes.TypeInfo;
> + }
> }
>
> - override
> - public abstract Module Module {get;}
> + public abstract override Module Module {
> + get;
> + }
>
> public abstract string Namespace {get;}
>
> @@ -435,7 +438,7 @@ namespace System {
> #if NET_4_0
> public virtual bool Equals (Type o)
> {
> - if ((object)o == this)
> + if ((object)o == (object)this)
> return true;
> if ((object)o == null)
> return false;
> @@ -446,7 +449,7 @@ namespace System {
> o = o.UnderlyingSystemType;
> if ((object)o == null)
> return false;
> - if ((object)o == this)
> + if ((object)o == (object)this)
> return true;
> return me.EqualsInternal (o);
> }
> @@ -504,7 +507,7 @@ namespace System {
> return result;
> }
>
> - NotImplementedException CreateNIE () {
> + static NotImplementedException CreateNIE () {
> return new NotImplementedException ();
> }
>
>
>
> Commit: aad016fd8720481cf3a776a7c77e492f4b5da697
> Author: Marek Safar<marek.safar at gmail.com>
> Date: 10/15/2010 10:20:25
> URL:
> http://github.com/mono/mono/commit/aad016fd8720481cf3a776a7c77e492f4b5da697
>
>
> Clean up few more warnings
>
> Changed paths:
> M mcs/build/common/MonoTODOAttribute.cs
> M mcs/class/I18N/CJK/CP932.cs
> M mcs/class/I18N/Common/Handlers.cs
> M mcs/class/Mono.Posix/Mono.Unix.Native/Syscall.cs
> M mcs/class/Mono.Simd/Mono.Simd/VectorOperations.cs
> M mcs/class/RabbitMQ.Client/src/client/AssemblyInfo.cs
> M mcs/class/System.Core/System.Collections.Generic/HashSet.cs
> M mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedFile.cs
> M
> mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.cs
>
> M mcs/class/System.Core/System.IO.Pipes/PipeUnix.cs
> M mcs/class/System.Core/System.Linq.Expressions/ConstantExpression.cs
> M mcs/class/System.Core/System.Linq.Parallel/OrderingEnumerator.cs
> M
> mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs
>
> M
> mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs
>
> M
> mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing/RoutingService.cs
>
> M
> mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/JsonQueryStringConverter.cs
>
> M
> mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
>
> M mcs/class/System.Web/System.Web.Caching/OutputCacheModule.cs
> M mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
> M mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
> M mcs/class/System.Web/System.Web.UI.WebControls/BaseMenuRenderer.cs
> M mcs/class/System.Web/System.Web.UI.WebControls/DataKey.cs
> M mcs/class/System.Web/System.Web.UI.WebControls/ImageMap.cs
> M mcs/class/System.Web/System.Web.UI.WebControls/MenuListRenderer.cs
> M mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
> M mcs/class/System.Web/System.Web.UI/Control.cs
> M mcs/class/System.Web/System.Web.UI/Page.cs
> M mcs/class/System.Web/System.Web.UI/StaticPartialCachingControl.cs
> M mcs/class/System.Web/System.Web.Util/MachineKeySectionUtils.cs
> M mcs/class/System.Web/System.Web.Util/RequestValidator.cs
> M mcs/class/System.Web/System.Web/HttpResponseHeader.cs
> M mcs/class/System.Xaml/System.Xaml.Schema/XamlMemberInvoker.cs
> M mcs/class/System.Xaml/System.Xaml.dll.sources
> M mcs/class/System.Xaml/System.Xaml/XamlObjectReader.cs
> M mcs/class/System.Xaml/System.Xaml/XamlObjectWriter.cs
> M mcs/class/System.Xaml/System.Xaml/XamlReader.cs
> M mcs/class/System.Xaml/System.Xaml/XamlType.cs
> M mcs/class/System.Xaml/System.Xaml/XamlXmlReader.cs
> M mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
> M mcs/class/System/System.Net.Sockets/Socket_2_1.cs
> M mcs/class/System/System.Net/HttpConnection.cs
> M mcs/class/System/System.Net/HttpListenerRequest.cs
> M mcs/class/System/System.Net/WebClient.cs
> M mcs/class/System/System.Text.RegularExpressions/parser.cs
> M mcs/class/System/System/Uri.cs
> M mcs/mcs/cs-parser.jay
>
> Modified: mcs/build/common/MonoTODOAttribute.cs
> ===================================================================
> --- a/mcs/build/common/MonoTODOAttribute.cs
> +++ b/mcs/build/common/MonoTODOAttribute.cs
> @@ -33,7 +33,7 @@
> //
>
> namespace System {
> -
> +#pragma warning disable 436
> [AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
> internal class MonoTODOAttribute : Attribute {
>
> @@ -97,4 +97,5 @@ namespace System {
> {
> }
> }
> +#pragma warning restore 436
> }
> Modified: mcs/class/I18N/CJK/CP932.cs
> ===================================================================
> --- a/mcs/class/I18N/CJK/CP932.cs
> +++ b/mcs/class/I18N/CJK/CP932.cs
> @@ -447,7 +447,7 @@ namespace I18N.CJK
> // Decoder that handles a rolling Shift-JIS state.
> sealed class CP932Decoder : DbcsEncoding.DbcsDecoder
> {
> - private JISConvert convert;
> + private new JISConvert convert;
> private int last_byte_count;
> private int last_byte_chars;
>
> Modified: mcs/class/I18N/Common/Handlers.cs
> ===================================================================
> --- a/mcs/class/I18N/Common/Handlers.cs
> +++ b/mcs/class/I18N/Common/Handlers.cs
> @@ -26,7 +26,7 @@ namespace I18N.Common
> {
>
> using System;
> -using System.Collections;
> +using System.Collections.Generic;
>
> // This class provides an internal list of handlers, for runtime
> // engines that do not implement the altered "GetFile" semantics.
> @@ -210,19 +210,20 @@ public sealed class Handlers
> "I18N.West.ENCibm865"
> };
>
> - static Hashtable aliases;
> + static Dictionary<string, string> aliases;
> public static string GetAlias (string name)
> {
> if (aliases == null)
> BuildHash ();
>
> - return aliases [name] as string;
> + string v;
> + aliases.TryGetValue (name, out v);
> + return v;
> }
>
> static void BuildHash ()
> {
> - aliases = new Hashtable (new CaseInsensitiveHashCodeProvider (),
> - new CaseInsensitiveComparer ());
> + aliases = new Dictionary<string, string>
> (StringComparer.OrdinalIgnoreCase);
>
> aliases.Add ("arabic", "iso_8859_6");
> aliases.Add ("csISOLatinArabic", "iso_8859_6");
> Modified: mcs/class/Mono.Posix/Mono.Unix.Native/Syscall.cs
> ===================================================================
> --- a/mcs/class/Mono.Posix/Mono.Unix.Native/Syscall.cs
> +++ b/mcs/class/Mono.Posix/Mono.Unix.Native/Syscall.cs
> @@ -1143,6 +1143,7 @@ namespace Mono.Unix.Native {
> }
>
> [Flags][Map]
> + [CLSCompliant (false)]
> public enum EpollEvents : uint {
> EPOLLIN = 0x001,
> EPOLLPRI = 0x002,
> @@ -1166,6 +1167,7 @@ namespace Mono.Unix.Native {
> }
>
> [StructLayout (LayoutKind.Explicit, Size=12, Pack=1)]
> + [CLSCompliant (false)]
> public struct EpollEvent {
> [FieldOffset (0)]
> public EpollEvents events;
> Modified: mcs/class/Mono.Simd/Mono.Simd/VectorOperations.cs
> ===================================================================
> --- a/mcs/class/Mono.Simd/Mono.Simd/VectorOperations.cs
> +++ b/mcs/class/Mono.Simd/Mono.Simd/VectorOperations.cs
> @@ -61,6 +61,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector4ui ArithmeticRightShift (this
> Vector4ui v1, int amount)
> {
> Vector4ui res = new Vector4ui ();
> @@ -72,6 +73,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us ArithmeticRightShift (this
> Vector8us va, int amount)
> {
> Vector8us res = new Vector8us ();
> @@ -111,6 +113,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe int ExtractByteMask (this Vector16sb va) {
> int res = 0;
> sbyte *a = (sbyte*)&va;
> @@ -143,6 +146,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us AddWithSaturation (this
> Vector8us va, Vector8us vb) {
> Vector8us res = new Vector8us ();
> ushort *a =&va.v0;
> @@ -154,6 +158,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector16sb AddWithSaturation (this
> Vector16sb va, Vector16sb vb) {
> Vector16sb res = new Vector16sb ();
> sbyte *a =&va.v0;
> @@ -187,6 +192,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us SubtractWithSaturation (this
> Vector8us va, Vector8us vb) {
> Vector8us res = new Vector8us ();
> ushort *a =&va.v0;
> @@ -198,6 +204,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector16sb SubtractWithSaturation (this
> Vector16sb va, Vector16sb vb) {
> Vector16sb res = new Vector16sb ();
> sbyte *a =&va.v0;
> @@ -231,6 +238,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us MultiplyStoreHigh (this
> Vector8us va, Vector8us vb) {
> Vector8us res = new Vector8us ();
> ushort *a =&va.v0;
> @@ -293,6 +301,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us Average (this Vector8us va,
> Vector8us vb) {
> Vector8us res = new Vector8us ();
> ushort *a =&va.v0;
> @@ -337,6 +346,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE41)]
> + [CLSCompliant (false)]
> public static Vector4ui Max (this Vector4ui v1, Vector4ui v2)
> {
> return new Vector4ui (System.Math.Max (v1.x, v2.x),
> System.Math.Max (v1.y, v2.y), System.Math.Max (v1.z, v2.z),
> System.Math.Max (v1.w, v2.w));
> @@ -354,6 +364,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE41)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us Max (this Vector8us va,
> Vector8us vb) {
> Vector8us res = new Vector8us ();
> ushort *a =&va.v0;
> @@ -374,6 +385,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE41)]
> + [CLSCompliant (false)]
> public static unsafe Vector16sb Max (this Vector16sb va,
> Vector16sb vb) {
> Vector16sb res = new Vector16sb ();
> sbyte *a =&va.v0;
> @@ -409,6 +421,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE41)]
> + [CLSCompliant (false)]
> public static Vector4ui Min (this Vector4ui v1, Vector4ui v2)
> {
> return new Vector4ui (System.Math.Min (v1.x, v2.x),
> System.Math.Min (v1.y, v2.y), System.Math.Min (v1.z, v2.z),
> System.Math.Min (v1.w, v2.w));
> @@ -426,6 +439,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE41)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us Min (this Vector8us va,
> Vector8us vb) {
> Vector8us res = new Vector8us ();
> ushort *a =&va.v0;
> @@ -437,6 +451,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE41)]
> + [CLSCompliant (false)]
> public static unsafe Vector16sb Min (this Vector16sb va,
> Vector16sb vb) {
> Vector16sb res = new Vector16sb ();
> sbyte *a =&va.v0;
> @@ -529,6 +544,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE41)]
> + [CLSCompliant (false)]
> public static Vector2ul CompareEqual (this Vector2ul v1,
> Vector2ul v2)
> {
> return new Vector2ul ((ulong)(v1.x == v2.x ? -1 : 0),
> (ulong)(v1.y == v2.y ? -1 : 0));
> @@ -541,6 +557,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static Vector4ui CompareEqual (this Vector4ui v1,
> Vector4ui v2)
> {
> return new Vector4ui ((uint)(v1.x == v2.x ? -1 : 0),
> (uint)(v1.y == v2.y ? -1 : 0), (uint)(v1.z == v2.z ? -1 : 0),
> (uint)(v1.w == v2.w ? -1 : 0));
> @@ -558,6 +575,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us CompareEqual (this Vector8us
> va, Vector8us vb) {
> Vector8us res = new Vector8us ();
> ushort *a =&va.v0;
> @@ -569,6 +587,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector16sb CompareEqual (this Vector16sb
> va, Vector16sb vb) {
> Vector16sb res = new Vector16sb ();
> sbyte *a =&va.v0;
> @@ -662,6 +681,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector16sb CompareGreaterThan (this
> Vector16sb va, Vector16sb vb) {
> Vector16sb res = new Vector16sb ();
> sbyte *a =&va.v0;
> @@ -844,6 +864,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static Vector2ul UnpackLow (this Vector2ul v1,
> Vector2ul v2)
> {
> return new Vector2ul (v1.x, v2.x);
> @@ -856,6 +877,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static Vector4ui UnpackLow (this Vector4ui v1,
> Vector4ui v2)
> {
> return new Vector4ui (v1.x, v2.x, v1.y, v2.y);
> @@ -868,12 +890,14 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us UnpackLow (this Vector8us va,
> Vector8us vb)
> {
> return new Vector8us (va.v0, vb.v0, va.v1, vb.v1, va.v2,
> vb.v2, va.v3, vb.v3);
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector16sb UnpackLow (this Vector16sb
> va, Vector16sb vb)
> {
> return new Vector16sb (va.v0, vb.v0, va.v1, vb.v1, va.v2,
> vb.v2, va.v3, vb.v3, va.v4, vb.v4, va.v5, vb.v5, va.v6, vb.v6, va.v7,
> vb.v7);
> @@ -892,6 +916,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static Vector2ul UnpackHigh (this Vector2ul v1,
> Vector2ul v2)
> {
> return new Vector2ul (v1.y, v2.y);
> @@ -904,6 +929,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static Vector4ui UnpackHigh (this Vector4ui v1,
> Vector4ui v2)
> {
> return new Vector4ui (v1.z, v2.z, v1.w, v2.w);
> @@ -916,12 +942,14 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us UnpackHigh (this Vector8us va,
> Vector8us vb)
> {
> return new Vector8us (va.v4, vb.v4, va.v5, vb.v5, va.v6,
> vb.v6, va.v7, vb.v7);
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector16sb UnpackHigh (this Vector16sb
> va, Vector16sb vb)
> {
> return new Vector16sb (va.v8, vb.v8, va.v9, vb.v9,
> va.v10, vb.v10, va.v11, vb.v11, va.v12, vb.v12, va.v13, vb.v13,
> va.v14, vb.v14, va.v15, vb.v15);
> @@ -950,6 +978,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector4ui Shuffle (this Vector4ui v1,
> ShuffleSel sel)
> {
> uint *ptr = (uint*)&v1;
> @@ -966,6 +995,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us ShuffleHigh (this Vector8us
> va, ShuffleSel sel)
> {
> ushort *ptr = ((ushort*)&va) + 4;
> @@ -982,6 +1012,7 @@ namespace Mono.Simd
> }
>
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us ShuffleLow (this Vector8us va,
> ShuffleSel sel)
> {
> ushort *ptr = ((ushort*)&va);
> @@ -1046,6 +1077,7 @@ namespace Mono.Simd
>
> /* This function performs a packusdw, which treats the source
> as a signed value */
> [Acceleration (AccelMode.SSE41)]
> + [CLSCompliant (false)]
> public static unsafe Vector8us
> SignedPackWithUnsignedSaturation (this Vector4ui va, Vector4ui vb) {
> Vector8us res = new Vector8us ();
> int *a = (int*)&va;
> @@ -1060,6 +1092,7 @@ namespace Mono.Simd
>
> /*This function performs a packuswb, which treats the source
> as a signed value */
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector16b
> SignedPackWithUnsignedSaturation (this Vector8us va, Vector8us vb) {
> Vector16b res = new Vector16b ();
> short *a = (short*)&va;
> @@ -1074,6 +1107,7 @@ namespace Mono.Simd
>
> /* This function performs a packssdw, which treats the source
> as a signed value*/
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector8s SignedPackWithSignedSaturation
> (this Vector4ui va, Vector4ui vb) {
> Vector8s res = new Vector8s ();
> int *a = (int*)&va;
> @@ -1088,6 +1122,7 @@ namespace Mono.Simd
>
> /*This function performs a packsswb, which treats the source
> as a signed value */
> [Acceleration (AccelMode.SSE2)]
> + [CLSCompliant (false)]
> public static unsafe Vector16sb
> SignedPackWithSignedSaturation (this Vector8us va, Vector8us vb) {
> Vector16sb res = new Vector16sb ();
> short *a = (short*)&va;
> Modified: mcs/class/RabbitMQ.Client/src/client/AssemblyInfo.cs
> ===================================================================
> --- a/mcs/class/RabbitMQ.Client/src/client/AssemblyInfo.cs
> +++ b/mcs/class/RabbitMQ.Client/src/client/AssemblyInfo.cs
> @@ -53,19 +53,9 @@ using System.Runtime.InteropServices;
>
> [assembly: ComVisible (false)]
>
> -[assembly: CLSCompliant (true)]
> +//[assembly: CLSCompliant (true)]
> [assembly: AssemblyDelaySign (true)]
> [assembly: AssemblyKeyFile("../../../msfinal.pub")]
>
> -#if NET_2_0
> - [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
> - [assembly: CompilationRelaxations
> (CompilationRelaxations.NoStringInterning)]
> - [assembly: Debuggable
> (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
> - [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
> -#elif NET_1_1
> - [assembly: AssemblyTrademark ("")]
> - [assembly: AssemblyConfiguration ("")]
> -#elif NET_1_0
> - [assembly: AssemblyTrademark ("")]
> - [assembly: AssemblyConfiguration ("")]
> -#endif
> +[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
> +[assembly: CompilationRelaxations
> (CompilationRelaxations.NoStringInterning)]
> Modified: mcs/class/System.Core/System.Collections.Generic/HashSet.cs
> ===================================================================
> --- a/mcs/class/System.Core/System.Collections.Generic/HashSet.cs
> +++ b/mcs/class/System.Core/System.Collections.Generic/HashSet.cs
> @@ -357,8 +357,6 @@ namespace System.Collections.Generic {
> if (predicate == null)
> throw new ArgumentNullException ("predicate");
>
> - int counter = 0;
> -
> var candidates = new List<T> ();
>
> foreach (var item in this)
> Modified:
> mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedFile.cs
> ===================================================================
> ---
> a/mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedFile.cs
> +++
> b/mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedFile.cs
> @@ -327,12 +327,9 @@ namespace System.IO.MemoryMappedFiles
>
> static MmapProts ToUnixProts (MemoryMappedFileAccess access)
> {
> - MmapProts prots;
> -
> switch (access){
> case MemoryMappedFileAccess.ReadWrite:
> return MmapProts.PROT_WRITE | MmapProts.PROT_READ;
> - break;
>
> case MemoryMappedFileAccess.Write:
> return MmapProts.PROT_WRITE;
> @@ -393,4 +390,4 @@ namespace System.IO.MemoryMappedFiles
> }
> }
>
> -#endif
> \ No newline at end of file
> +#endif
> Modified:
> mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.cs
>
> ===================================================================
> ---
> a/mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.cs
>
> +++
> b/mcs/class/System.Core/System.IO.MemoryMappedFiles/MemoryMappedViewAccessor.cs
>
> @@ -57,7 +57,6 @@ namespace System.IO.MemoryMappedFiles
> case MemoryMappedFileAccess.ReadWrite:
> case MemoryMappedFileAccess.ReadWriteExecute:
> return FileAccess.ReadWrite;
> - break;
>
> case MemoryMappedFileAccess.Write:
> return FileAccess.Write;
> @@ -104,4 +103,4 @@ namespace System.IO.MemoryMappedFiles
> }
> }
>
> -#endif
> \ No newline at end of file
> +#endif
> Modified: mcs/class/System.Core/System.IO.Pipes/PipeUnix.cs
> ===================================================================
> --- a/mcs/class/System.Core/System.IO.Pipes/PipeUnix.cs
> +++ b/mcs/class/System.Core/System.IO.Pipes/PipeUnix.cs
> @@ -162,7 +162,6 @@ namespace System.IO.Pipes
>
> protected FileAccess RightsToFileAccess (PipeAccessRights
> rights)
> {
> - string access = null;
> if ((rights& PipeAccessRights.ReadData) != 0) {
> if ((rights& PipeAccessRights.WriteData) != 0)
> return FileAccess.ReadWrite;
> @@ -197,7 +196,7 @@ namespace System.IO.Pipes
> var name = Path.Combine ("/var/tmp/", pipeName);
> EnsureTargetFile (name);
>
> - string access = RightsToAccess (desiredAccessRights);
> + RightsToAccess (desiredAccessRights);
>
> ValidateOptions (options, owner.TransmissionMode);
>
> @@ -211,7 +210,6 @@ namespace System.IO.Pipes
> }
>
> NamedPipeClientStream owner;
> - bool is_async;
> SafePipeHandle handle;
> Action opener;
>
> @@ -239,7 +237,7 @@ namespace System.IO.Pipes
> }
>
> public bool IsAsync {
> - get { return is_async; }
> + get { return false; }
> }
>
> public int NumberOfServerInstances {
> @@ -266,7 +264,7 @@ namespace System.IO.Pipes
> string name = Path.Combine ("/var/tmp/", pipeName);
> EnsureTargetFile (name);
>
> - string access = RightsToAccess (rights);
> + RightsToAccess (rights);
>
> ValidateOptions (options, owner.TransmissionMode);
>
> Modified:
> mcs/class/System.Core/System.Linq.Expressions/ConstantExpression.cs
> ===================================================================
> --- a/mcs/class/System.Core/System.Linq.Expressions/ConstantExpression.cs
> +++ b/mcs/class/System.Core/System.Linq.Expressions/ConstantExpression.cs
> @@ -63,7 +63,6 @@ namespace System.Linq.Expressions {
> void EmitNullableConstant (EmitContext ec, Type type, object
> value)
> {
> if (value == null) {
> - var ig = ec.ig;
> var local = ec.ig.DeclareLocal (type);
> ec.EmitNullableInitialize (local);
> } else {
> Modified:
> mcs/class/System.Core/System.Linq.Parallel/OrderingEnumerator.cs
> ===================================================================
> --- a/mcs/class/System.Core/System.Linq.Parallel/OrderingEnumerator.cs
> +++ b/mcs/class/System.Core/System.Linq.Parallel/OrderingEnumerator.cs
> @@ -143,7 +143,6 @@ namespace System.Linq.Parallel
> }
> }
>
> - readonly int num;
> SlotBucket slotBucket;
>
> IEnumerator<KeyValuePair<long, T>?> currEnum;
> @@ -151,7 +150,6 @@ namespace System.Linq.Parallel
>
> internal OrderingEnumerator (int num, CancellationToken token)
> {
> - this.num = num;
> slotBucket = new SlotBucket (num, token);
> }
>
> Modified:
> mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs
>
> ===================================================================
> ---
> a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs
>
> +++
> b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptedReference.cs
>
> @@ -37,7 +37,6 @@ namespace System.Security.Cryptography.Xml {
>
> #region Fields
>
> - bool cacheValid;
> string referenceType;
> string uri;
> TransformChain tc;
> @@ -68,9 +67,9 @@ namespace System.Security.Cryptography.Xml {
>
> #region Properties
>
> - [MonoTODO()]
> + [MonoTODO("Always returns false")]
> protected internal bool CacheValid {
> - get { return cacheValid; }
> + get { return false; }
> }
>
> protected string ReferenceType {
> Modified:
> mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs
>
> ===================================================================
> ---
> a/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs
>
> +++
> b/mcs/class/System.Security/System.Security.Cryptography.Xml/EncryptionProperty.cs
>
> @@ -37,7 +37,6 @@ namespace System.Security.Cryptography.Xml {
>
> #region Fields
>
> - XmlElement elemProp;
> string id;
> string target;
>
> @@ -62,8 +61,9 @@ namespace System.Security.Cryptography.Xml {
> get { return id; }
> }
>
> + [MonoTODO ("Always returns null")]
> public XmlElement PropertyElement {
> - get { return elemProp; }
> + get { return null; }
> set { LoadXml (value); }
> }
>
> Modified:
> mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing/RoutingService.cs
>
> ===================================================================
> ---
> a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing/RoutingService.cs
>
> +++
> b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing/RoutingService.cs
>
> @@ -91,7 +91,7 @@ namespace System.ServiceModel.Routing
> return ret;
> }
>
> - static readonly MethodInfo create_factory_method = typeof
> (ChannelFactory).GetMethod ("CreateFactory", BindingFlags.Public |
> BindingFlags.NonPublic | BindingFlags.Instance);
> +// static readonly MethodInfo create_factory_method = typeof
> (ChannelFactory).GetMethod ("CreateFactory", BindingFlags.Public |
> BindingFlags.NonPublic | BindingFlags.Instance);
>
> void ProcessMessageDuplexSession (Message message)
> {
> Modified:
> mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/JsonQueryStringConverter.cs
>
> ===================================================================
> ---
> a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/JsonQueryStringConverter.cs
>
> +++
> b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/JsonQueryStringConverter.cs
>
> @@ -186,8 +186,6 @@ namespace System.ServiceModel.Dispatcher
> }
> return parameter.ToString ();
> }
> -
> - throw new NotImplementedException ();
> }
>
> Type ToActualType (Type t)
> Modified:
> mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
>
> ===================================================================
> ---
> a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
>
> +++
> b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
>
> @@ -164,7 +164,7 @@ namespace System.ServiceModel.Dispatcher
> return GetSerializer (ref xml_serializer, p =>
> new DataContractSerializer (p.Type, p.Name, p.Namespace));
> else
> return GetSerializer (ref xml_serializer, p =>
> new DataContractSerializer (p.Type));
> - break;
> +
> case WebContentFormat.Json:
> // FIXME: after name argument they are hack
> #if !MOONLIGHT
> @@ -173,7 +173,7 @@ namespace System.ServiceModel.Dispatcher
> else
> #endif
> return GetSerializer (ref json_serializer, p =>
> new DataContractJsonSerializer (p.Type));
> - break;
> +
> default:
> throw new NotImplementedException ();
> }
> Modified: mcs/class/System.Web/System.Web.Caching/OutputCacheModule.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.Caching/OutputCacheModule.cs
> +++ b/mcs/class/System.Web/System.Web.Caching/OutputCacheModule.cs
> @@ -45,12 +45,14 @@ namespace System.Web.Caching
> {
> sealed class OutputCacheModule : IHttpModule
> {
> - OutputCacheProvider provider;
> CacheItemRemovedCallback response_removed;
> static object keysCacheLock = new object ();
> Dictionary<string, string> keysCache;
> Dictionary<string, string> entriesToInvalidate;
> +
> #if !NET_4_0
> + OutputCacheProvider provider;
> +
> internal OutputCacheProvider InternalProvider {
> get { return provider; }
> }
> Modified: mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
> +++ b/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
> @@ -658,7 +658,6 @@ namespace System.Web.Compilation
> if (assembly == null)
> throw new ArgumentNullException ("assembly");
>
> - Type ret = HttpApplicationFactory.AppType;
> if (preStartMethodsDone)
> throw new InvalidOperationException ("This method
> cannot be called after the application's pre-start initialization
> stage.");
>
> Modified:
> mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
> ===================================================================
> ---
> a/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
> +++
> b/mcs/class/System.Web/System.Web.Compilation/TemplateControlCompiler.cs
> @@ -189,7 +189,7 @@ namespace System.Web.Compilation
> currentLocation = builder.Location;
> bool inBuildControlTree = builder is RootBuilder;
> string tailname = (inBuildControlTree ? "Tree" : ("_" +
> builder.ID));
> - bool isProperty = builder.IsProperty;
> +// bool isProperty = builder.IsProperty;
> CodeMemberMethod method = new CodeMemberMethod ();
> builder.Method = method;
> builder.MethodStatements = method.Statements;
> Modified:
> mcs/class/System.Web/System.Web.UI.WebControls/BaseMenuRenderer.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.UI.WebControls/BaseMenuRenderer.cs
> +++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseMenuRenderer.cs
> @@ -403,7 +403,7 @@ namespace System.Web.UI.WebControls
> }
>
> SubMenuStyle staticMenuStyle =
> owner.StaticMenuStyleInternal;
> - MenuItemStyle dynamicMenuItemStyle =
> owner.DynamicMenuItemStyleInternal;
> +// MenuItemStyle dynamicMenuItemStyle =
> owner.DynamicMenuItemStyleInternal;
> SubMenuStyle dynamicMenuStyle =
> owner.DynamicMenuStyleInternal;
> SubMenuStyleCollection levelSubMenuStyles =
> owner.LevelSubMenuStylesInternal;
>
> Modified: mcs/class/System.Web/System.Web.UI.WebControls/DataKey.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.UI.WebControls/DataKey.cs
> +++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataKey.cs
> @@ -87,7 +87,6 @@ namespace System.Web.UI.WebControls
> if (other == null)
> return false;
>
> - int thisCount, otherCount;
> IOrderedDictionary otherKeyTable = other.keyTable;
> if (keyTable != null&& otherKeyTable != null) {
> if (keyTable.Count != otherKeyTable.Count)
> Modified: mcs/class/System.Web/System.Web.UI.WebControls/ImageMap.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.UI.WebControls/ImageMap.cs
> +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ImageMap.cs
> @@ -154,7 +154,9 @@ namespace System.Web.UI.WebControls
> base.Render (writer);
>
> if (spots != null&& spots.Count> 0) {
> +#if NET_4_0
> bool enabled = Enabled;
> +#endif
> writer.AddAttribute (HtmlTextWriterAttribute.Id,
> "ImageMap" + ClientID);
> writer.AddAttribute (HtmlTextWriterAttribute.Name,
> "ImageMap" + ClientID);
> writer.RenderBeginTag (HtmlTextWriterTag.Map);
> Modified:
> mcs/class/System.Web/System.Web.UI.WebControls/MenuListRenderer.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.UI.WebControls/MenuListRenderer.cs
> +++ b/mcs/class/System.Web/System.Web.UI.WebControls/MenuListRenderer.cs
> @@ -290,7 +290,6 @@ namespace System.Web.UI.WebControls
> protected override void RenderMenuItem (HtmlTextWriter
> writer, MenuItem item, bool vertical, bool notLast, bool isFirst,
> OwnerContext oc)
> {
> Menu owner = Owner;
> - string clientID = oc.ClientID;
> bool displayChildren = owner.DisplayChildren (item);
> bool isDynamicItem = IsDynamicItem (owner, item);
> int itemLevel = item.Depth + 1;
> Modified: mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
> +++ b/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
> @@ -1390,8 +1390,9 @@ namespace System.Web.UI.WebControls
> writer.AddStyleAttribute
> (HtmlTextWriterStyle.BorderWidth, "0");
> writer.RenderBeginTag (HtmlTextWriterTag.Table);
>
> - Unit nodeSpacing = GetNodeSpacing (node);
> #if !NET_4_0
> + Unit nodeSpacing = GetNodeSpacing (node);
> +
> if (nodeSpacing != Unit.Empty&& (node.Depth> 0 ||
> node.Index> 0))
> RenderMenuItemSpacing (writer, nodeSpacing);
> #endif
> Modified: mcs/class/System.Web/System.Web.UI/Control.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.UI/Control.cs
> +++ b/mcs/class/System.Web/System.Web.UI/Control.cs
> @@ -2149,7 +2149,6 @@ namespace System.Web.UI
> throw new ArgumentNullException ("control");
>
> Control parent = this;
> - Page page = Page;
> Control namingContainer = control.NamingContainer;
>
> if (namingContainer != null)
> Modified: mcs/class/System.Web/System.Web.UI/Page.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.UI/Page.cs
> +++ b/mcs/class/System.Web/System.Web.UI/Page.cs
> @@ -68,7 +68,7 @@ namespace System.Web.UI
> [DesignerSerializer
> ("Microsoft.VisualStudio.Web.WebForms.WebFormCodeDomSerializer, " +
> Consts.AssemblyMicrosoft_VisualStudio_Web,
> "System.ComponentModel.Design.Serialization.TypeCodeDomSerializer,
> System.Design, Version=4.0.0.0, Culture=neutral,
> PublicKeyToken=b03f5f7f11d50a3a")]
> public partial class Page : TemplateControl, IHttpHandler
> {
> - static string machineKeyConfigPath = "system.web/machineKey";
> +// static string machineKeyConfigPath = "system.web/machineKey";
> bool _eventValidation = true;
> object [] _savedControlState;
> bool _doLoadPreviousPage;
> Modified:
> mcs/class/System.Web/System.Web.UI/StaticPartialCachingControl.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.UI/StaticPartialCachingControl.cs
> +++ b/mcs/class/System.Web/System.Web.UI/StaticPartialCachingControl.cs
> @@ -38,7 +38,7 @@ namespace System.Web.UI {
> public class StaticPartialCachingControl : BasePartialCachingControl
> {
> BuildMethod buildMethod;
> - string sqlDependency;
> +// string sqlDependency;
>
> public StaticPartialCachingControl (string ctrlID, string
> guid, int duration,
> string varyByParams, string varyByControls, string
> varyByCustom,
> @@ -59,7 +59,7 @@ namespace System.Web.UI {
> BuildMethod buildMethod)
> : this (ctrlID, guid, duration, varyByParams,
> varyByControls, varyByCustom, buildMethod)
> {
> - this.sqlDependency = sqlDependency;
> +// this.sqlDependency = sqlDependency;
> }
> #if NET_4_0
> public StaticPartialCachingControl (string ctrlID, string
> guid, int duration, string varyByParams,
> Modified: mcs/class/System.Web/System.Web.Util/MachineKeySectionUtils.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.Util/MachineKeySectionUtils.cs
> +++ b/mcs/class/System.Web/System.Web.Util/MachineKeySectionUtils.cs
> @@ -102,12 +102,12 @@ namespace System.Web.Util {
> break;
> default:
> #if NET_4_0
> - if (name.StartsWith ("alg:"))
> + if (name.StartsWith ("alg:")) {
> sa = SymmetricAlgorithm.Create (name.Substring (4));
> - else
> + break;
> + }
> #endif
> - throw new ConfigurationErrorsException ();
> - break;
> + throw new ConfigurationErrorsException ();
> }
> return sa;
> }
> Modified: mcs/class/System.Web/System.Web.Util/RequestValidator.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web.Util/RequestValidator.cs
> +++ b/mcs/class/System.Web/System.Web.Util/RequestValidator.cs
> @@ -34,8 +34,6 @@ namespace System.Web.Util
> {
> public class RequestValidator
> {
> - static readonly object currentCreationLock = new object();
> -
> static RequestValidator current;
> static Lazy<RequestValidator> lazyLoader;
>
> Modified: mcs/class/System.Web/System.Web/HttpResponseHeader.cs
> ===================================================================
> --- a/mcs/class/System.Web/System.Web/HttpResponseHeader.cs
> +++ b/mcs/class/System.Web/System.Web/HttpResponseHeader.cs
> @@ -51,7 +51,7 @@ namespace System.Web
> headerValue = hvalue;
> }
> }
> -
> +/*
> static bool headerCheckingEnabled;
>
> static BaseResponseHeader ()
> @@ -59,7 +59,7 @@ namespace System.Web
> HttpRuntimeSection section =
> WebConfigurationManager.GetWebApplicationSection
> ("system.web/httpRuntime") as HttpRuntimeSection;
> headerCheckingEnabled = section == null ||
> section.EnableHeaderChecking;
> }
> -
> +*/
>
> internal BaseResponseHeader (string val)
> {
> Modified: mcs/class/System.Xaml/System.Xaml.Schema/XamlMemberInvoker.cs
> ===================================================================
> --- a/mcs/class/System.Xaml/System.Xaml.Schema/XamlMemberInvoker.cs
> +++ b/mcs/class/System.Xaml/System.Xaml.Schema/XamlMemberInvoker.cs
> @@ -57,8 +57,8 @@ namespace System.Xaml.Schema
> {
> if (instance == null)
> throw new ArgumentNullException ("instance");
> - if (this is XamlDirective)
> - throw new NotSupportedException ("not supported
> operation on directive members.");
> +// if (this is XamlDirective)
> +// throw new NotSupportedException ("not supported
> operation on directive members.");
> if (UnderlyingGetter == null)
> throw new NotSupportedException ("Attempt to get
> value from write-only property or event");
> return UnderlyingGetter.Invoke (instance, new object [0]);
> @@ -67,8 +67,8 @@ namespace System.Xaml.Schema
> {
> if (instance == null)
> throw new ArgumentNullException ("instance");
> - if (this is XamlDirective)
> - throw new NotSupportedException ("not supported
> operation on directive members.");
> +// if (this is XamlDirective)
> +// throw new NotSupportedException ("not supported
> operation on directive members.");
> if (UnderlyingSetter == null)
> throw new NotSupportedException ("Attempt to get
> value from read-only property");
> UnderlyingSetter.Invoke (instance, new object [] {value});
> Modified: mcs/class/System.Xaml/System.Xaml.dll.sources
> ===================================================================
> --- a/mcs/class/System.Xaml/System.Xaml.dll.sources
> +++ b/mcs/class/System.Xaml/System.Xaml.dll.sources
> @@ -1,7 +1,6 @@
> ../../build/common/Consts.cs
> ../../build/common/Locale.cs
> ../../build/common/MonoTODOAttribute.cs
> -../../build/common/basic-profile-check.cs
> Assembly/AssemblyInfo.cs
> System.Windows.Markup/AmbientAttribute.cs
> System.Windows.Markup/ArrayExtension.cs
> Modified: mcs/class/System.Xaml/System.Xaml/XamlObjectReader.cs
> ===================================================================
> --- a/mcs/class/System.Xaml/System.Xaml/XamlObjectReader.cs
> +++ b/mcs/class/System.Xaml/System.Xaml/XamlObjectReader.cs
> @@ -44,7 +44,7 @@ namespace System.Xaml
>
> public XamlNodeType OwnerType { get; set; }
>
> - public IEnumerator<NamespaceDeclaration> GetEnumerator ()
> + public new IEnumerator<NamespaceDeclaration>
> GetEnumerator ()
> {
> return new NSEnumerator (this, base.GetEnumerator ());
> }
> @@ -120,6 +120,7 @@ namespace System.Xaml
> {
> }
>
> + [MonoTODO ("settings is not used")]
> public XamlObjectReader (object instance, XamlSchemaContext
> schemaContext, XamlObjectReaderSettings settings)
> {
> if (schemaContext == null)
> @@ -130,7 +131,7 @@ namespace System.Xaml
>
> this.root = instance;
> sctx = schemaContext;
> - this.settings = settings;
> +// this.settings = settings;
>
> prefix_lookup = new PrefixLookup (this);
>
> @@ -149,7 +150,7 @@ namespace System.Xaml
> readonly object root;
> readonly XamlType root_type;
> readonly XamlSchemaContext sctx;
> - readonly XamlObjectReaderSettings settings;
> +// readonly XamlObjectReaderSettings settings;
> readonly INamespacePrefixLookup prefix_lookup;
>
> Stack<XamlType> types = new Stack<XamlType> ();
> @@ -442,7 +443,6 @@ namespace System.Xaml
> return null;
> var xtt = SchemaContext.GetXamlType (type);
> var ns = xtt.PreferredXamlNamespace;
> - var nss = collectingNamespaces;
> CheckAddNamespace (collectingNamespaces, ns);
> return null;
> }
> Modified: mcs/class/System.Xaml/System.Xaml/XamlObjectWriter.cs
> ===================================================================
> --- a/mcs/class/System.Xaml/System.Xaml/XamlObjectWriter.cs
> +++ b/mcs/class/System.Xaml/System.Xaml/XamlObjectWriter.cs
> @@ -152,7 +152,6 @@ namespace System.Xaml
>
> var xm = members.Pop ();
> var state = object_states.Peek ();
> - var xt = state.Type;
> var contents = state.Contents;
>
> if (xm == XamlLanguage.Arguments) {
> @@ -225,7 +224,6 @@ namespace System.Xaml
> InitializeObjectIfRequired (false); // this is required
> for such case that there was no StartMember call.
>
> var state = object_states.Pop ();
> - var xt = state.Type;
> var obj = GetCorrectlyTypedValue (state.Type, state.Value);
> if (members.Count> 0) {
> var pstate = object_states.Peek ();
> @@ -270,7 +268,7 @@ namespace System.Xaml
>
> manager.StartMember ();
>
> - var wpl = object_states.Peek ().WrittenProperties;
> + //var wpl = object_states.Peek ().WrittenProperties;
> // FIXME: enable this. Duplicate property check should
> // be differentiate from duplicate contents (both result
> // in XamlDuplicateMemberException though).
> Modified: mcs/class/System.Xaml/System.Xaml/XamlReader.cs
> ===================================================================
> --- a/mcs/class/System.Xaml/System.Xaml/XamlReader.cs
> +++ b/mcs/class/System.Xaml/System.Xaml/XamlReader.cs
> @@ -82,7 +82,7 @@ namespace System.Xaml
> continue;
> }
> }
> - return;
> +
> default:
> Read ();
> return;
> Modified: mcs/class/System.Xaml/System.Xaml/XamlType.cs
> ===================================================================
> --- a/mcs/class/System.Xaml/System.Xaml/XamlType.cs
> +++ b/mcs/class/System.Xaml/System.Xaml/XamlType.cs
> @@ -38,9 +38,9 @@ namespace System.Xaml
> {
> }
>
> - static readonly Type [] predefined_types = {
> - typeof (XData), typeof (Uri), typeof (TimeSpan),
> typeof (PropertyDefinition), typeof (MemberDefinition), typeof
> (Reference)
> - };
> +// static readonly Type [] predefined_types = {
> +// typeof (XData), typeof (Uri), typeof (TimeSpan),
> typeof (PropertyDefinition), typeof (MemberDefinition), typeof
> (Reference)
> +// };
>
> public XamlType (Type underlyingType, XamlSchemaContext
> schemaContext, XamlTypeInvoker invoker)
> : this (schemaContext, invoker)
> Modified: mcs/class/System.Xaml/System.Xaml/XamlXmlReader.cs
> ===================================================================
> --- a/mcs/class/System.Xaml/System.Xaml/XamlXmlReader.cs
> +++ b/mcs/class/System.Xaml/System.Xaml/XamlXmlReader.cs
> @@ -152,9 +152,6 @@ namespace System.Xaml
> IEnumerator<Pair> stored_member_enumerator;
> IXamlNamespaceResolver xaml_namespace_resolver;
>
> - // This is used for things like collection Items.
> - Dictionary<int,Stack<XamlMember>> inecting_members = new
> Dictionary<int,Stack<XamlMember>> ();
> -
> public bool HasLineInfo {
> get { return line_info != null&& line_info.HasLineInfo
> (); }
> }
> Modified: mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
> ===================================================================
> --- a/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
> +++ b/mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs
> @@ -81,7 +81,6 @@ namespace System.Xaml
> XmlWriter w;
> XamlSchemaContext sctx;
> XamlXmlWriterSettings settings;
> - IValueSerializerContext serializer_context;
>
> XamlWriterStateManager manager;
>
> @@ -210,9 +209,9 @@ namespace System.Xaml
> void DoEndMember ()
> {
> var xm = nodes.Pop (); // XamlMember
> - if (xm == XamlLanguage.Initialization)
> - ; // do nothing
> - else if (w.WriteState == WriteState.Content)
> + if (xm == XamlLanguage.Initialization) {
> + // do nothing
> + } else if (w.WriteState == WriteState.Content)
> w.WriteEndElement ();
> else
> w.WriteEndAttribute ();
> @@ -230,9 +229,9 @@ namespace System.Xaml
> if (xm == null)
> return;
>
> - if (xm == XamlLanguage.Initialization)
> - ; // do nothing
> - else if (next == XamlNodeType.StartObject || w.WriteState
> == WriteState.Content || has_namespace)
> + if (xm == XamlLanguage.Initialization) {
> + // do nothing
> + } else if (next == XamlNodeType.StartObject ||
> w.WriteState == WriteState.Content || has_namespace)
> DoWriteStartMemberElement (xm);
> else
> DoWriteStartMemberAttribute (xm);
> Modified: mcs/class/System/System.Net.Sockets/Socket_2_1.cs
> ===================================================================
> --- a/mcs/class/System/System.Net.Sockets/Socket_2_1.cs
> +++ b/mcs/class/System/System.Net.Sockets/Socket_2_1.cs
> @@ -234,7 +234,6 @@ namespace System.Net.Sockets {
> if (queue != null) {
> Worker worker = null;
> SocketAsyncCall sac = null;
> - SocketAsyncResult req = null;
> lock (queue) {
> // queue.Count will only be 0 if the socket
> is closed while receive/send
> // operation(s) are pending and at least one
> call to this method is
> Modified: mcs/class/System/System.Net/HttpConnection.cs
> ===================================================================
> --- a/mcs/class/System/System.Net/HttpConnection.cs
> +++ b/mcs/class/System/System.Net/HttpConnection.cs
> @@ -354,10 +354,9 @@ namespace System.Net {
> if (sock != null) {
> force_close |= (context.Request.Headers
> ["connection"] == "close");
> if (!force_close) {
> - int status_code = context.Response.StatusCode;
> - bool conn_close = (status_code == 400 ||
> status_code == 408 || status_code == 411 ||
> - status_code == 413 || status_code == 414
> || status_code == 500 ||
> - status_code == 503);
> +// bool conn_close = (status_code == 400 ||
> status_code == 408 || status_code == 411 ||
> +// status_code == 413 || status_code ==
> 414 || status_code == 500 ||
> +// status_code == 503);
>
> force_close |= (context.Request.ProtocolVersion<=
> HttpVersion.Version10);
> }
> Modified: mcs/class/System/System.Net/HttpListenerRequest.cs
> ===================================================================
> --- a/mcs/class/System/System.Net/HttpListenerRequest.cs
> +++ b/mcs/class/System/System.Net/HttpListenerRequest.cs
> @@ -50,7 +50,6 @@ namespace System.Net {
> Version version;
> NameValueCollection query_string; // check if null is ok,
> check if read-only, check case-sensitiveness
> string raw_url;
> - Guid identifier;
> Uri url;
> Uri referrer;
> string [] user_languages;
> @@ -408,8 +407,9 @@ namespace System.Net {
> get { return context.Connection.RemoteEndPoint; }
> }
>
> + [MonoTODO ("Always returns Guid.Empty")]
> public Guid RequestTraceIdentifier {
> - get { return identifier; }
> + get { return Guid.Empty; }
> }
>
> public Uri Url {
> Modified: mcs/class/System/System.Net/WebClient.cs
> ===================================================================
> --- a/mcs/class/System/System.Net/WebClient.cs
> +++ b/mcs/class/System/System.Net/WebClient.cs
> @@ -86,7 +86,7 @@ namespace System.Net
> Thread async_thread;
> Encoding encoding = Encoding.Default;
> IWebProxy proxy;
> - RequestCachePolicy cache_policy;
> +// RequestCachePolicy cache_policy;
>
> // Constructors
> static WebClient ()
> @@ -137,7 +137,7 @@ namespace System.Net
> get {
> throw GetMustImplement ();
> }
> - set { cache_policy = value; }
> + set { /*cache_policy = value;*/ }
> }
>
> [MonoTODO ("Value can be set but is ignored")]
> Modified: mcs/class/System/System.Text.RegularExpressions/parser.cs
> ===================================================================
> --- a/mcs/class/System/System.Text.RegularExpressions/parser.cs
> +++ b/mcs/class/System/System.Text.RegularExpressions/parser.cs
> @@ -860,7 +860,6 @@ namespace System.Text.RegularExpressions.Syntax {
> case '1': case '2': case '3': case '4': case '5':
> case '6': case '7': case '8': case '9': {
> ptr --;
> - int oldptr = ptr;
> int n = ParseNumber (10, 1, 0);
> if (n< 0) {
> ptr = p;
> Modified: mcs/class/System/System/Uri.cs
> ===================================================================
> --- a/mcs/class/System/System/Uri.cs
> +++ b/mcs/class/System/System/Uri.cs
> @@ -92,7 +92,7 @@ namespace System {
> private int cachedHashCode;
>
> private static readonly string hexUpperChars =
> "0123456789ABCDEF";
> - private static string [] Empty = new string [0];
> + private static readonly string [] Empty = new string [0];
> private static bool isWin32 = (Path.DirectorySeparatorChar ==
> '\\');
>
>
> Modified: mcs/mcs/cs-parser.jay
> ===================================================================
> --- a/mcs/mcs/cs-parser.jay
> +++ b/mcs/mcs/cs-parser.jay
> @@ -4603,7 +4603,8 @@ embedded_statement
> empty_statement
> : SEMICOLON
> {
> - $$ = new EmptyStatement (GetLocation ($1));
> + // Uses lexer.Location because semicolon location is not kept
> in quick mode
> + $$ = new EmptyStatement (lexer.Location);
> }
> ;
>
>
>
> Commit: 85bebe819ee7606fc3393f34187494b85bdbece5
> Author: Marek Safar<marek.safar at gmail.com>
> Date: 10/15/2010 10:20:26
> URL:
> http://github.com/mono/mono/commit/85bebe819ee7606fc3393f34187494b85bdbece5
>
>
> Don't be too verbose when building response files
>
> Changed paths:
> M mcs/build/library.make
> M mcs/build/tests.make
>
> Modified: mcs/build/library.make
> ===================================================================
> --- a/mcs/build/library.make
> +++ b/mcs/build/library.make
> @@ -252,7 +252,7 @@ endif
> makefrag = $(depsdir)/$(PROFILE)_$(LIBRARY).makefrag
> library_CLEAN_FILES += $(makefrag)
> $(makefrag): $(sourcefile)
> - @echo Creating $@ ...
> +# @echo Creating $@ ...
> @sed 's,^,$(build_lib): ,' $< >$@
> @if test ! -f $(sourcefile).makefrag; then :; else \
> cat $(sourcefile).makefrag>> $@ ; \
> Modified: mcs/build/tests.make
> ===================================================================
> --- a/mcs/build/tests.make
> +++ b/mcs/build/tests.make
> @@ -109,11 +109,11 @@ $(test_lib): $(the_assembly) $(test_response)
> $(test_nunit_dep)
> $(TEST_COMPILE) -target:library -out:$@ $(test_flags)
> $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
>
> $(test_response): $(test_sourcefile)
> - @echo Creating $@ ...
> +# @echo Creating $@ ...
> @sed -e '/^$$/d' -e 's,^,Test/,' $(test_sourcefile) |
> $(PLATFORM_CHANGE_SEPARATOR_CMD)>$@
>
> $(test_makefrag): $(test_response)
> - @echo Creating $@ ...
> +# @echo Creating $@ ...
> @sed 's,^,$(test_lib): ,' $< >$@
>
> -include $(test_makefrag)
>
>
>
>
> _______________________________________________
> Mono-patches maillist - Mono-patches at lists.ximian.com
> http://lists.ximian.com/mailman/listinfo/mono-patches
>
>
>
>
More information about the Mono-devel-list
mailing list