Merge pull request #4540 from kumpera/android-changes-part1

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / CompositeControl.cs

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CompositeControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CompositeControl.cs
index 88614e2a1b4573ffb1cc99d3363d9edc0abccc08..beeaf5365653a4b2301a934cd79a67f4f357e7ea 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CompositeControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CompositeControl.cs
@@ -53,12 +53,12 @@ namespace System.Web.UI.WebControls
                        base.DataBind();
                }
 
-               protected internal override void Render (HtmlTextWriter w)
+               protected internal override void Render (HtmlTextWriter writer)
                {
                        /* make sure all the child controls have been created */
                        EnsureChildControls ();
                        /* and then... */
-                       base.Render (w);
+                       base.Render (writer);
                }
 
                void ICompositeControlDesignerAccessor.RecreateChildControls ()