Merge pull request #4542 from lateralusX/jlorenss/win-fix-unwind-tramp-reg-aot

[mono.git] / mcs / class / System.Configuration / System.Configuration / ConfigurationElementCollection.cs

diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
index 22bc35f1554311967ec0fd4ba8beb36f5ac07498..c5a87877276f5cfd6de8e2f343b7fd986a4ca21b 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
@@ -31,8 +31,6 @@
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
-
 using System.Collections;
 using System.Diagnostics;
 using System.Xml;
@@ -557,7 +555,7 @@ namespace System.Configuration
                        return false;
                }
                
-               protected internal override void Unmerge (ConfigurationElement sourceElement, ConfigurationElement parentElement, ConfigurationSaveMode updateMode)
+               protected internal override void Unmerge (ConfigurationElement sourceElement, ConfigurationElement parentElement, ConfigurationSaveMode saveMode)
                {
                        ConfigurationElementCollection source = (ConfigurationElementCollection) sourceElement;
                        ConfigurationElementCollection parent = (ConfigurationElementCollection) parentElement;
@@ -567,9 +565,9 @@ namespace System.Configuration
                                object key = source.GetElementKey (sitem);
                                ConfigurationElement pitem = parent != null ? parent.BaseGet (key) as ConfigurationElement : null;
                                ConfigurationElement nitem = CreateNewElementInternal (null);
-                               if (pitem != null && updateMode != ConfigurationSaveMode.Full) {
-                                       nitem.Unmerge (sitem, pitem, updateMode);
-                                       if (nitem.HasValues (pitem, updateMode))
+                               if (pitem != null && saveMode != ConfigurationSaveMode.Full) {
+                                       nitem.Unmerge (sitem, pitem, saveMode);
+                                       if (nitem.HasValues (pitem, saveMode))
                                                BaseAdd (nitem);
                                } else {
                                        nitem.Unmerge (sitem, null, ConfigurationSaveMode.Full);
@@ -577,7 +575,7 @@ namespace System.Configuration
                                }
                        }
                        
-                       if (updateMode == ConfigurationSaveMode.Full)
+                       if (saveMode == ConfigurationSaveMode.Full)
                                EmitClear = true;
                        else if (parent != null) {
                                for (int n=0; n<parent.Count; n++) {
@@ -595,4 +593,3 @@ namespace System.Configuration
         }
 }
 
-#endif