Merge pull request #2454 from tastywheattasteslikechicken/FixVtableAbort

[mono.git] / mcs / class / corlib / Mono.Globalization.Unicode / CollationElementTableUtil.cs

diff --git a/mcs/class/corlib/Mono.Globalization.Unicode/CollationElementTableUtil.cs b/mcs/class/corlib/Mono.Globalization.Unicode/CollationElementTableUtil.cs
index a3bf2903cb80ed955e17f33d391d35961103c3f7..781c76c331bd2c519ac88c7acc4505afefc9f4b2 100644 (file)
--- a/mcs/class/corlib/Mono.Globalization.Unicode/CollationElementTableUtil.cs
+++ b/mcs/class/corlib/Mono.Globalization.Unicode/CollationElementTableUtil.cs
@@ -6,17 +6,17 @@ namespace Mono.Globalization.Unicode
 {
        internal struct SortKeyValue {
                public readonly bool Alt;
-               public readonly int Primary;
+               public readonly ushort Primary;
                public readonly byte Secondary;
                public readonly byte Thirtiary;
                public readonly int Quarternary;
 
-               public SortKeyValue (bool alt, int v1, int v2, int v3, int v4)
+               public SortKeyValue (bool alt, ushort v1, byte v2, byte v3, int v4)
                {
                        Alt = alt;
                        Primary = v1;
-                       Secondary = (byte) v2;
-                       Thirtiary = (byte) v3;
+                       Secondary = v2;
+                       Thirtiary = v3;
                        Quarternary = v4;
                }
        }
@@ -33,7 +33,7 @@ namespace Mono.Globalization.Unicode
                        int [] ends = new int [] {
                                0x3410, 0x4e10, 0xa4d0, 0xfa70, 0x10840,
                                0x1d800, 0x2fa20, 0xe0200, 0x110000};
-                       Indexer = new CodePointIndexer (starts, ends);
+                       Indexer = new CodePointIndexer (starts, ends, 0, 0);
                }
        }
 }