diff options
author | Jon Skeet <jonskeet@google.com> | 2015-04-29 15:27:14 +0100 |
---|---|---|
committer | Jon Skeet <jonskeet@google.com> | 2015-04-29 21:15:16 +0100 |
commit | ce97e686826147e2a071fd2321555f7d40ec5d93 (patch) | |
tree | 873c55c5013021255b279ae45034c5276d798838 /csharp/src/ProtocolBuffers/FieldSet.cs | |
parent | a449f66bdb50f3e898889705945fb1ac6b105469 (diff) | |
download | protobuf-ce97e686826147e2a071fd2321555f7d40ec5d93.tar.gz protobuf-ce97e686826147e2a071fd2321555f7d40ec5d93.tar.bz2 protobuf-ce97e686826147e2a071fd2321555f7d40ec5d93.zip |
Convert both the full and lite runtimes (and json/xml serialization assemblies) to be Portable Class Libraries.
All referring projects are now .NET 4 client rather than .NET 3.5.
This commit also fixes up the ProtoBench app, which I'd neglected in previous commits. (Disentangling the two sets of changes would be time-consuming.)
Diffstat (limited to 'csharp/src/ProtocolBuffers/FieldSet.cs')
-rw-r--r-- | csharp/src/ProtocolBuffers/FieldSet.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/csharp/src/ProtocolBuffers/FieldSet.cs b/csharp/src/ProtocolBuffers/FieldSet.cs index f3c08cf5..4177400f 100644 --- a/csharp/src/ProtocolBuffers/FieldSet.cs +++ b/csharp/src/ProtocolBuffers/FieldSet.cs @@ -88,7 +88,7 @@ namespace Google.ProtocolBuffers public static FieldSet CreateInstance()
{
// Use SortedList to keep fields in the canonical order
- return new FieldSet(new SortedList<IFieldDescriptorLite, object>());
+ return new FieldSet(new SortedDictionary<IFieldDescriptorLite, object>());
}
/// <summary>
@@ -111,7 +111,7 @@ namespace Google.ProtocolBuffers if (hasRepeats)
{
- var tmp = new SortedList<IFieldDescriptorLite, object>();
+ var tmp = new SortedDictionary<IFieldDescriptorLite, object>();
foreach (KeyValuePair<IFieldDescriptorLite, object> entry in fields)
{
IList<object> list = entry.Value as IList<object>;
@@ -151,8 +151,8 @@ namespace Google.ProtocolBuffers {
get
{
- SortedList<FieldDescriptor, object> copy =
- new SortedList<FieldDescriptor, object>();
+ SortedDictionary<FieldDescriptor, object> copy =
+ new SortedDictionary<FieldDescriptor, object>();
foreach (KeyValuePair<IFieldDescriptorLite, object> fd in fields)
{
copy.Add((FieldDescriptor) fd.Key, fd.Value);
|