From 170bcb690aa7607bdffdab6d26ae099b845af453 Mon Sep 17 00:00:00 2001
From: Christoph Ruegg <git@cdrnet.ch>
Date: Sun, 18 May 2014 09:24:51 +0200
Subject: [PATCH] Drop 3 Obsolete attributes in Control, disable a warning in
 F# unit tests; fixes all warnings

---
 src/FSharpUnitTests/PokerTests.fs | 2 ++
 src/Numerics/Control.cs           | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/FSharpUnitTests/PokerTests.fs b/src/FSharpUnitTests/PokerTests.fs
index 12750b94..90aa5880 100644
--- a/src/FSharpUnitTests/PokerTests.fs
+++ b/src/FSharpUnitTests/PokerTests.fs
@@ -3,6 +3,8 @@
 #if NOSYSNUMERICS
 #else
 
+#nowarn "25"
+
 open MathNet.Numerics
 open MathNet.Numerics.Probability
 open NUnit.Framework
diff --git a/src/Numerics/Control.cs b/src/Numerics/Control.cs
index 0e487a48..503bc976 100644
--- a/src/Numerics/Control.cs
+++ b/src/Numerics/Control.cs
@@ -69,7 +69,7 @@ namespace MathNet.Numerics
 
             // Linear Algebra Provider
             LinearAlgebraProvider = new ManagedLinearAlgebraProvider();
-#if !PORTABLE
+#if !PORTABLE && NATIVEMKL
             try
             {
                 const string name = "MathNetNumericsLAProvider";
@@ -123,7 +123,6 @@ namespace MathNet.Numerics
         /// For the multivariate distributions this could involve an expensive matrix factorization.
         /// The default setting of this property is <c>true</c>.
         /// </summary>
-        [Obsolete]
         public static bool CheckDistributionParameters { get; set; }
 
         /// <summary>
@@ -183,7 +182,6 @@ namespace MathNet.Numerics
         /// must calculate multiply in parallel threads.
         /// </summary>
         /// <value>The order. Default 64, must be at least 3.</value>
-        [Obsolete]
         internal static int ParallelizeOrder
         {
             get { return _parallelizeOrder; }
@@ -195,7 +193,6 @@ namespace MathNet.Numerics
         /// must contain before we multiply threads.
         /// </summary>
         /// <value>Number of elements. Default 300, must be at least 3.</value>
-        [Obsolete]
         internal static int ParallelizeElements
         {
             get { return _parallelizeElements; }