projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:mono/mono
[mono.git]
/
mcs
/
class
/
System.Web
/
System.Web.UI
/
KeyedList.cs
diff --git
a/mcs/class/System.Web/System.Web.UI/KeyedList.cs
b/mcs/class/System.Web/System.Web.UI/KeyedList.cs
index ed2e78b9782b75a732699556c78f633cb2820d6a..07daeb5f5038a58ab8ad7579bf07f8b885faa67b 100644
(file)
--- a/
mcs/class/System.Web/System.Web.UI/KeyedList.cs
+++ b/
mcs/class/System.Web/System.Web.UI/KeyedList.cs
@@
-26,15
+26,15
@@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-#if NET_2_0
-
using System.Collections;
using System.Collections.Specialized;
namespace System.Web.UI
{
using System.Collections;
using System.Collections.Specialized;
namespace System.Web.UI
{
-
- internal class KeyedList : IOrderedDictionary, IStateManager
+ class KeyedList : IOrderedDictionary
+#if !NET_4_0
+ , IStateManager // why do we implement it at all?
+#endif
{
Hashtable objectTable = new Hashtable ();
{
Hashtable objectTable = new Hashtable ();
@@
-102,7
+102,7
@@
namespace System.Web.UI
{
return new KeyedListEnumerator (objectList);
}
{
return new KeyedListEnumerator (objectList);
}
-
+#if !NET_4_0
void IStateManager.LoadViewState (object state)
{
if (state != null)
void IStateManager.LoadViewState (object state)
{
if (state != null)
@@
-132,7
+132,7
@@
namespace System.Web.UI
{
trackViewState = true;
}
{
trackViewState = true;
}
-
+#endif
public int Count {
get { return objectList.Count; }
}
public int Count {
get { return objectList.Count; }
}
@@
-200,12
+200,13
@@
namespace System.Web.UI
get { return this; }
}
get { return this; }
}
+#if !NET_4_0
bool trackViewState;
bool IStateManager.IsTrackingViewState {
get { return trackViewState; }
}
bool trackViewState;
bool IStateManager.IsTrackingViewState {
get { return trackViewState; }
}
-
+#endif
int IndexOf (object key)
{
for (int i = 0; i < objectList.Count; i++)
int IndexOf (object key)
{
for (int i = 0; i < objectList.Count; i++)
@@
-219,5
+220,3
@@
namespace System.Web.UI
}
}
}
}
}
}
-
-#endif