diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-03-15 19:21:03 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-03-16 15:02:09 +0300 |
| commit | 7ad842c95ccb59a1406b21f649b80430c0d83a42 (patch) | |
| tree | 1800437d39722f55b0b5c22819d092570a67370f /mcs/class/System.Configuration | |
| parent | 4a1c47f4bd5fb8859cac344def813f9aa64f0724 (diff) | |
[bcl] Rename variables to avoid conflict with later renames
Diffstat (limited to 'mcs/class/System.Configuration')
| -rw-r--r-- | mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs index 1123e9ad156..624a32558b9 100644 --- a/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs +++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationElement.cs @@ -579,17 +579,17 @@ namespace System.Configuration continue; } - var sourceElement = (ConfigurationElement) sourceValue; - if (isMinimalOrModified && !sourceElement.IsModified ()) + var sourceElementValue = (ConfigurationElement) sourceValue; + if (isMinimalOrModified && !sourceElementValue.IsModified ()) continue; if (parentValue == null) { unmergedProp.Value = sourceValue; continue; } - var parentElement = (ConfigurationElement) parentValue; + var parentElementValue = (ConfigurationElement) parentValue; ConfigurationElement copy = (ConfigurationElement) unmergedProp.Value; - copy.Unmerge (sourceElement, parentElement, updateMode); + copy.Unmerge (sourceElementValue, parentElementValue, updateMode); } } |