Merge pull request #697 from linquize/atom-bug

[mono.git] / mcs / class / corlib / Microsoft.Win32 / Registry.cs

diff --git a/mcs/class/corlib/Microsoft.Win32/Registry.cs b/mcs/class/corlib/Microsoft.Win32/Registry.cs
index e3cd4f2c953000ec9dd348dad1c693883d629b12..9f97342a0ab5f8026de627a6bcfd3ed93bda2785 100644 (file)
--- a/mcs/class/corlib/Microsoft.Win32/Registry.cs
+++ b/mcs/class/corlib/Microsoft.Win32/Registry.cs
@@ -32,33 +32,23 @@
 #if !NET_2_1
 
 using System;
-
-#if NET_2_0
 using System.Runtime.InteropServices;
-#endif
 
 namespace Microsoft.Win32
 {
-#if NET_2_0
        [ComVisible (true)]
-#endif
-       public
-#if NET_2_0
-       static
-#else
-       sealed
-#endif
-       class Registry
+       public static class Registry
        {
-#if !NET_2_0
-               private Registry () { }
-#endif
                public static readonly RegistryKey ClassesRoot = new RegistryKey (
                                RegistryHive.ClassesRoot);
                public static readonly RegistryKey CurrentConfig = new RegistryKey (
                                RegistryHive.CurrentConfig);
                public static readonly RegistryKey CurrentUser = new RegistryKey (
                                RegistryHive.CurrentUser);
+
+#if NET_4_0
+               [Obsolete ("Use PerformanceData instead")]
+#endif
                public static readonly RegistryKey DynData = new RegistryKey (
                                RegistryHive.DynData);
                public static readonly RegistryKey LocalMachine = new RegistryKey (
@@ -68,7 +58,6 @@ namespace Microsoft.Win32
                public static readonly RegistryKey Users = new RegistryKey (
                                RegistryHive.Users);
 
-#if NET_2_0
                static RegistryKey ToKey (string keyName, bool setting)
                {
                        if (keyName == null)
@@ -147,7 +136,6 @@ namespace Microsoft.Win32
                        
                        return key.GetValue (valueName, defaultValue);
                }
-#endif
        }
 }