2009-08-11 Jérémie Laval <jeremie.laval@gmail.com>

	* Future.cs: Add static to Factory property

svn path=/trunk/mcs/; revision=139739

diff --git a/mcs/class/corlib/System.Threading.Tasks/ChangeLog b/mcs/class/corlib/System.Threading.Tasks/ChangeLog
index 4969c715bd9adfc95e85ff25d2d42cc454cac5b9..0fc4ae7a11ce8bf940a5e400fee5eb29a568a46b 100644 (file)
--- a/mcs/class/corlib/System.Threading.Tasks/ChangeLog
+++ b/mcs/class/corlib/System.Threading.Tasks/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
+
+       * Future.cs: Add static to Factory property
+
 2009-08-11  Jérémie Laval  <jeremie.laval@gmail.com>
 
        * Task.cs: Make WaitAny uses general continuation

diff --git a/mcs/class/corlib/System.Threading.Tasks/Future.cs b/mcs/class/corlib/System.Threading.Tasks/Future.cs
index 96a8a86f6dac70d0b20b8bbc8f78299c4ca3c94a..7930b85c40b8c64ffae87dccca220c4b07b1c48c 100644 (file)
--- a/mcs/class/corlib/System.Threading.Tasks/Future.cs
+++ b/mcs/class/corlib/System.Threading.Tasks/Future.cs
@@ -31,7 +31,7 @@ namespace System.Threading.Tasks
        public class Task<TResult>: Task
        {
                TResult value;
-               TaskFactory<TResult> factory = new TaskFactory<TResult> ();
+               static TaskFactory<TResult> factory = new TaskFactory<TResult> ();
                
                Func<object, TResult> function;
                object state;
@@ -56,7 +56,7 @@ namespace System.Threading.Tasks
                        }
                }
                
-               public new TaskFactory<TResult> Factory {
+               public static TaskFactory<TResult> Factory {
                        get {
                                return factory;
                        }