Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -34,9 +34,7 @@ using System.Collections.Specialized;
namespace System.Web.UI.WebControls
{
public class DataKey : IStateManager
#if NET_4_0
, IEquatable <DataKey>
#endif
{
IOrderedDictionary keyTable;
string[] keyNames;
@ -81,7 +79,6 @@ namespace System.Web.UI.WebControls
return readonlyKeyTable;
}
}
#if NET_4_0
public bool Equals (DataKey other)
{
if (other == null)
@ -123,7 +120,6 @@ namespace System.Web.UI.WebControls
return true;
}
#endif
protected virtual void LoadViewState (object savedState)
{
if (savedState is Pair) {