Marek Safar пре 14 година
родитељ
комит
f7763d0d78
23 измењених фајлова са 32 додато и 31 уклоњено
  1. 1 1
      mcs/class/Mono.C5/Makefile
  2. 0 1
      mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolWriter.cs
  3. 2 1
      mcs/class/Mono.Http/Makefile
  4. 1 1
      mcs/class/Mono.Http/Mono.Http.Modules/DigestAuthenticationModule.cs
  5. 1 1
      mcs/class/Mono.Messaging/Mono.Messaging/MessageBase.cs
  6. 1 1
      mcs/class/Mono.Security/Makefile
  7. 1 1
      mcs/class/PEAPI/Makefile
  8. 1 1
      mcs/class/System.Data.DataSetExtensions/System.Data/OrderedEnumerableRowCollection.cs
  9. 3 3
      mcs/class/System.Messaging/System.Messaging/MessageQueuePermission.cs
  10. 0 1
      mcs/class/System.Messaging/System.Messaging/XmlMessageFormatter.cs
  11. 2 2
      mcs/class/System.Runtime.Caching/System.Runtime.Caching/MemoryCacheEntryChangeMonitor.cs
  12. 2 2
      mcs/class/System.Runtime.Caching/System.Runtime.Caching/MemoryCacheLRU.cs
  13. 1 1
      mcs/class/System.Runtime.Caching/System.Runtime.Caching/SqlChangeMonitor.cs
  14. 2 1
      mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ExportOptions.cs
  15. 2 1
      mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ServiceInstallerDialog.cs
  16. 0 4
      mcs/class/System.Web.DynamicData/System.Web.DynamicData.ModelProviders/DLinqColumnProvider.cs
  17. 0 1
      mcs/class/System.Web.DynamicData/System.Web.DynamicData.ModelProviders/DLinqTableProvider.cs
  18. 1 1
      mcs/class/System.Web.DynamicData/System.Web.DynamicData/DynamicDataRoute.cs
  19. 1 1
      mcs/class/System.Web.DynamicData/System.Web.DynamicData/DynamicValidator.cs
  20. 1 1
      mcs/class/System.Web.Mvc2/Makefile
  21. 0 1
      mcs/class/System.Web.Mvc2/Properties/AssemblyInfo.cs
  22. 6 3
      mcs/mcs/expression.cs
  23. 3 0
      mcs/mcs/reflection.cs

+ 1 - 1
mcs/class/Mono.C5/Makefile

@@ -4,7 +4,7 @@ include ../../build/rules.make
 
 LIBRARY = Mono.C5.dll
 LIBRARY_SNK = c5.snk
-LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll -nowarn:169,219,414,1030
+LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll -nowarn:169,219,414,1030,3001,3005,3006
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
 
 EXTRA_DISTFILES = \

+ 0 - 1
mcs/class/Mono.CompilerServices.SymbolWriter/MonoSymbolWriter.cs

@@ -153,7 +153,6 @@ namespace Mono.CompilerServices.SymbolWriter
 			return entry;
 		}
 
-		[Obsolete]
 		public int DefineNamespace (string name, CompileUnitEntry unit,
 					    string[] using_clauses, int parent)
 		{

+ 2 - 1
mcs/class/Mono.Http/Makefile

@@ -8,7 +8,8 @@ LIB_MCS_FLAGS = -r:$(corlib) \
 		-r:System.Xml.dll \
 		-r:System.Web.dll \
 		-r:ICSharpCode.SharpZipLib.dll \
-		-r:Mono.Security.dll
+		-r:Mono.Security.dll \
+		-nowarn:618
 
 NO_TEST = yes
 

+ 1 - 1
mcs/class/Mono.Http/Mono.Http.Modules/DigestAuthenticationModule.cs

@@ -68,7 +68,7 @@ namespace Mono.Http.Modules
 				string expireStr = new ASCIIEncoding().GetString(decodedBytes);
 				expireTime = DateTime.Parse(expireStr);
 			}
-			catch (FormatException e) {
+			catch (FormatException) {
 				return false;
 			}
 

+ 1 - 1
mcs/class/Mono.Messaging/Mono.Messaging/MessageBase.cs

@@ -41,7 +41,7 @@ namespace Mono.Messaging {
 		int appSpecific;
 		DateTime arrivedTime;
 		bool attachSenderId = true;
-		bool authenticated;
+		const bool authenticated = false;
 		string authenticationProviderName = "Microsoft Base Cryptographic Provider, Ver. 1.0";
 		CryptographicProviderType authenticationProviderType 
 			= CryptographicProviderType.RsaFull;

+ 1 - 1
mcs/class/Mono.Security/Makefile

@@ -3,7 +3,7 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = Mono.Security.dll
-LIB_MCS_FLAGS = -r:System.dll -unsafe -nowarn:618,1033
+LIB_MCS_FLAGS = -r:System.dll -unsafe -nowarn:1030
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:169,219,618,672
 

+ 1 - 1
mcs/class/PEAPI/Makefile

@@ -3,7 +3,7 @@ SUBDIRS =
 include ../../build/rules.make
 
 LIBRARY = PEAPI.dll
-LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
+LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll -nowarn:414,618
 NO_TEST = yes
 
 EXTRA_DISTFILES = README.txt

+ 1 - 1
mcs/class/System.Data.DataSetExtensions/System.Data/OrderedEnumerableRowCollection.cs

@@ -65,7 +65,7 @@ namespace System.Data
 		{
 		}
 
-		new List<Comparison<TRow>> comparers = new List<Comparison<TRow>> ();
+		List<Comparison<TRow>> comparers = new List<Comparison<TRow>> ();
 
 		public void AddSort (Comparison<TRow> comparer)
 		{

+ 3 - 3
mcs/class/System.Messaging/System.Messaging/MessageQueuePermission.cs

@@ -110,14 +110,14 @@ namespace System.Messaging {
 		[MonoTODO]
 		public override IPermission Intersect (IPermission target)
 		{
-			MessageQueuePermission mqp = Cast (target);
+			Cast (target);
 			return null;
 		}
 		
 		[MonoTODO]
 		public override bool IsSubsetOf (IPermission target)
 		{
-			MessageQueuePermission mqp = Cast (target);
+			Cast (target);
 			return false;
 		}
 		
@@ -136,7 +136,7 @@ namespace System.Messaging {
 		[MonoTODO]
 		public override IPermission Union (IPermission target)
 		{
-			MessageQueuePermission mqp = Cast (target);
+			Cast (target);
 			return null;
 		}
 

+ 0 - 1
mcs/class/System.Messaging/System.Messaging/XmlMessageFormatter.cs

@@ -109,7 +109,6 @@ namespace System.Messaging
 		public object Read(Message message)
 		{
 			message.BodyStream.Seek (0, SeekOrigin.Begin);
-			object result = null;
 			foreach (Type t in targetTypes) {
 				XmlSerializer serializer = new XmlSerializer (t);
 				try {

+ 2 - 2
mcs/class/System.Runtime.Caching/System.Runtime.Caching/MemoryCacheEntryChangeMonitor.cs

@@ -37,7 +37,7 @@ namespace System.Runtime.Caching
 	{
 		ReadOnlyCollection <string> cacheKeys;
 		DateTimeOffset lastModified;
-		MemoryCache owner;
+//		MemoryCache owner;
 		string uniqueId;
 		
 		public override ReadOnlyCollection <string> CacheKeys {
@@ -58,7 +58,7 @@ namespace System.Runtime.Caching
 		
 		public MemoryCacheEntryChangeMonitor (MemoryCache owner, IEnumerable <string> keys)
 		{
-			this.owner = owner;
+//			this.owner = owner;
 			this.lastModified = DateTimeOffset.MinValue;
 
 			MemoryCacheEntry mce;

+ 2 - 2
mcs/class/System.Runtime.Caching/System.Runtime.Caching/MemoryCacheLRU.cs

@@ -33,14 +33,14 @@ namespace System.Runtime.Caching
 	// NOTE: all the public methods in this assume that the owner's write lock is held
 	sealed class MemoryCacheLRU
 	{
-		int trimLowerBound;
+//		int trimLowerBound;
 		Dictionary <int, LinkedListNode <MemoryCacheEntry>> index;
 		LinkedList <MemoryCacheEntry> lru;
 		MemoryCacheContainer owner;
 		
 		public MemoryCacheLRU (MemoryCacheContainer owner, int trimLowerBound)
 		{
-			this.trimLowerBound = trimLowerBound;
+//			this.trimLowerBound = trimLowerBound;
 			index = new Dictionary <int, LinkedListNode <MemoryCacheEntry>> ();
 			lru = new LinkedList <MemoryCacheEntry> ();
 			this.owner = owner;

+ 1 - 1
mcs/class/System.Runtime.Caching/System.Runtime.Caching/SqlChangeMonitor.cs

@@ -32,7 +32,7 @@ namespace System.Runtime.Caching
 {
 	public sealed class SqlChangeMonitor : ChangeMonitor
 	{
-		string uniqueId;
+		const string uniqueId = null;
 		
 		public override string UniqueId {
 			get { return uniqueId; }

+ 2 - 1
mcs/class/System.Runtime.Serialization/System.Runtime.Serialization/ExportOptions.cs

@@ -33,7 +33,7 @@ namespace System.Runtime.Serialization
 	public class ExportOptions
 	{
 		IDataContractSurrogate surrogate;
-		KnownTypeCollection known_types;
+		const KnownTypeCollection known_types = null;
 
 		public ExportOptions ()
 		{
@@ -44,6 +44,7 @@ namespace System.Runtime.Serialization
 			set { surrogate = value; }
 		}
 
+		[MonoTODO]
 		public Collection<Type> KnownTypes {
 			get { return known_types; }
 		}

+ 2 - 1
mcs/class/System.ServiceProcess/System.ServiceProcess.Design/ServiceInstallerDialog.cs

@@ -37,7 +37,7 @@ namespace System.ServiceProcess.Design
 	public class ServiceInstallerDialog : Form
 	{
 		string username, password;
-		ServiceInstallerDialogResult result;
+		const ServiceInstallerDialogResult result = 0;
 
 		public ServiceInstallerDialog ()
 		{
@@ -60,6 +60,7 @@ namespace System.ServiceProcess.Design
 			set { password = value; }
 		}
 
+		[MonoTODO]
 		public ServiceInstallerDialogResult Result {
 			get { return result; }
 		}

+ 0 - 4
mcs/class/System.Web.DynamicData/System.Web.DynamicData.ModelProviders/DLinqColumnProvider.cs

@@ -51,15 +51,11 @@ namespace System.Web.DynamicData.ModelProviders
 			if (meta == null)
 				throw new ArgumentNullException ("meta");
 
-			this.meta = meta;
-
 			// FIXME: fill more
 			Name = meta.Name;
 			Nullable = meta.CanBeNull;
 		}
 
-		MetaDataMember meta;
-
 		[MonoTODO]
 		public override string ToString ()
 		{

+ 0 - 1
mcs/class/System.Web.DynamicData/System.Web.DynamicData.ModelProviders/DLinqTableProvider.cs

@@ -58,7 +58,6 @@ namespace System.Web.DynamicData.ModelProviders
 			columns = new ReadOnlyCollection<ColumnProvider> (l);
 		}
 
-		MetaTable table;
 		ReadOnlyCollection<ColumnProvider> columns;
 
 		public override ReadOnlyCollection<ColumnProvider> Columns {

+ 1 - 1
mcs/class/System.Web.DynamicData/System.Web.DynamicData/DynamicDataRoute.cs

@@ -58,7 +58,7 @@ namespace System.Web.DynamicData
 
 		public MetaModel Model { get; set; }
 
-		public DynamicDataRouteHandler RouteHandler { 
+		public new DynamicDataRouteHandler RouteHandler { 
 			get { return base.RouteHandler as DynamicDataRouteHandler; }
 			set { base.RouteHandler = value; }
 		}

+ 1 - 1
mcs/class/System.Web.DynamicData/System.Web.DynamicData/DynamicValidator.cs

@@ -94,7 +94,7 @@ namespace System.Web.DynamicData
 			if (String.IsNullOrEmpty (controlToValidate))
 				return true;
 
-			string value = GetControlValidationValue (controlToValidate);
+			GetControlValidationValue (controlToValidate);
 
 			return true;
 		}

+ 1 - 1
mcs/class/System.Web.Mvc2/Makefile

@@ -9,7 +9,7 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes
 RESX_DIST =  System.Web.Mvc/Resources/MvcResources.resx
 
 LIB_MCS_FLAGS = \
-		/warnaserror- \
+		/warn:1 \
 		/noconfig \
 		/keyfile:../winfx.pub \
 	        /r:System.dll \

+ 0 - 1
mcs/class/System.Web.Mvc2/Properties/AssemblyInfo.cs

@@ -60,4 +60,3 @@ using System.Security;
     Justification = "Assembly is delay-signed.")]
 
 [assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile("../winfx.pub")]

+ 6 - 3
mcs/mcs/expression.cs

@@ -6040,10 +6040,11 @@ namespace Mono.CSharp
 
 		Dictionary<int, int> bounds;
 
+#if STATIC
 		// The number of constants in array initializers
 		int const_initializers_count;
 		bool only_constant_initializers;
-
+#endif
 		public ArrayCreation (FullNamedExpression requested_base_type, List<Expression> exprs, ComposedTypeSpecifier rank, ArrayInitializer initializers, Location l)
 			: this (requested_base_type, rank, initializers, l)
 		{
@@ -6171,7 +6172,7 @@ namespace Mono.CSharp
 					Expression element = ResolveArrayElement (ec, o);
 					if (element == null)
 						continue;
-
+#if STATIC
 					// Initializers with the default values can be ignored
 					Constant c = element as Constant;
 					if (c != null) {
@@ -6181,7 +6182,7 @@ namespace Mono.CSharp
 					} else {
 						only_constant_initializers = false;
 					}
-					
+#endif					
 					array_data.Add (element);
 				}
 			}
@@ -6284,7 +6285,9 @@ namespace Mono.CSharp
 
 		protected bool ResolveInitializers (ResolveContext ec)
 		{
+#if STATIC
 			only_constant_initializers = true;
+#endif
 
 			if (arguments != null) {
 				bool res = true;

+ 3 - 0
mcs/mcs/reflection.cs

@@ -166,8 +166,11 @@ namespace Mono.CSharp
 	{
 		[System.Runtime.InteropServices.FieldOffset (0)]
 		int i;
+
+#pragma warning disable 414
 		[System.Runtime.InteropServices.FieldOffset (0)]
 		float f;
+#pragma warning restore 414
 
 		public static int SingleToInt32Bits (float v)
 		{