Commit 3668a224 authored by Jan Tattermusch's avatar Jan Tattermusch

Merge pull request #394 from ironhidegames/csharp-aot-ios

Solves AOT compilation issue for Unity - iOS
parents 08ec9dcb 83bcfefb
...@@ -96,7 +96,7 @@ namespace Google.ProtocolBuffers ...@@ -96,7 +96,7 @@ namespace Google.ProtocolBuffers
{ {
private static readonly ExtensionRegistry empty = new ExtensionRegistry( private static readonly ExtensionRegistry empty = new ExtensionRegistry(
new ExtensionByNameMap(), new ExtensionByNameMap(),
new ExtensionByIdMap(), new ExtensionByIdMap(new ExtensionIntPairEqualityComparer()),
true); true);
private readonly ExtensionByNameMap extensionsByName; private readonly ExtensionByNameMap extensionsByName;
...@@ -116,7 +116,7 @@ namespace Google.ProtocolBuffers ...@@ -116,7 +116,7 @@ namespace Google.ProtocolBuffers
/// </summary> /// </summary>
public static ExtensionRegistry CreateInstance() public static ExtensionRegistry CreateInstance()
{ {
return new ExtensionRegistry(new ExtensionByNameMap(), new ExtensionByIdMap(), false); return new ExtensionRegistry(new ExtensionByNameMap(), new ExtensionByIdMap(new ExtensionIntPairEqualityComparer()), false);
} }
public ExtensionRegistry AsReadOnly() public ExtensionRegistry AsReadOnly()
...@@ -216,5 +216,17 @@ namespace Google.ProtocolBuffers ...@@ -216,5 +216,17 @@ namespace Google.ProtocolBuffers
return msgType.Equals(other.msgType) && number == other.number; return msgType.Equals(other.msgType) && number == other.number;
} }
} }
internal class ExtensionIntPairEqualityComparer : IEqualityComparer<ExtensionIntPair>
{
public bool Equals(ExtensionIntPair x, ExtensionIntPair y)
{
return x.Equals(y);
}
public int GetHashCode(ExtensionIntPair obj)
{
return obj.GetHashCode();
}
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment