diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-10-28 16:10:47 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-10-28 16:10:47 -0230 |
| commit | 1dbaecbefa8c9c68a57a4ee29e064e2e2eac101d (patch) | |
| tree | 89d642b3875bbdd4fa63a1d7178c1d02d275ca2a | |
| parent | Fixed DynamicLibrary to not append ++11 to libname for OS X (diff) | |
| download | ice-1dbaecbefa8c9c68a57a4ee29e064e2e2eac101d.tar.bz2 ice-1dbaecbefa8c9c68a57a4ee29e064e2e2eac101d.tar.xz ice-1dbaecbefa8c9c68a57a4ee29e064e2e2eac101d.zip | |
Fixed serialization broken by ICE-5764 commit
| -rw-r--r-- | cs/src/Ice/CollectionBase.cs | 6 | ||||
| -rw-r--r-- | cs/src/Ice/DictionaryBase.cs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cs/src/Ice/CollectionBase.cs b/cs/src/Ice/CollectionBase.cs index c44e8e07d8b..dc82187e725 100644 --- a/cs/src/Ice/CollectionBase.cs +++ b/cs/src/Ice/CollectionBase.cs @@ -12,6 +12,9 @@ using System.Collections.Generic; namespace IceInternal { +#if !SILVERLIGHT + [Serializable] +#endif public abstract class CollectionBase<T> : System.Collections.IList { protected List<T> list_; @@ -440,9 +443,6 @@ namespace IceInternal namespace Ice { -#if !SILVERLIGHT - [Serializable] -#endif [Obsolete("This class is deprecated.")] public abstract class CollectionBase<T> : IceInternal.CollectionBase<T> { diff --git a/cs/src/Ice/DictionaryBase.cs b/cs/src/Ice/DictionaryBase.cs index 91d199af317..f625b636f9b 100644 --- a/cs/src/Ice/DictionaryBase.cs +++ b/cs/src/Ice/DictionaryBase.cs @@ -12,6 +12,9 @@ using System.Collections.Generic; namespace IceInternal { +#if !SILVERLIGHT + [Serializable] +#endif public abstract class DictionaryBase<KT, VT> : System.Collections.IDictionary { protected Dictionary<KT, VT> dict_; @@ -345,9 +348,6 @@ namespace IceInternal namespace Ice { -#if !SILVERLIGHT - [Serializable] -#endif [Obsolete("This class is deprecated.")] public abstract class DictionaryBase<KT, VT> : IceInternal.DictionaryBase<KT, VT> { |