From 295a01452d5af0c5b19ce4e789324cb0646b2c38 Mon Sep 17 00:00:00 2001 From: Jeff Hodges Date: Sat, 22 Oct 2016 22:48:38 -0700 Subject: [PATCH] hack up generated files to compile as c++0x (#1) hack up generated files to compile as c++0x Use a bunch of static_cast to get around the c++11-narrowing errors when building as C++0x. This hack is necessary because the source files and generation code has not been released. See https://github.com/CLD2Owners/cld2/issues/33 on the source file check-in. See https://github.com/CLD2Owners/cld2/issues/47 https://github.com/CLD2Owners/cld2/issues/51 https://github.com/CLD2Owners/cld2/issues/26 and I'm sure there are others for the C++0x problem. --- internal/cld_generated_cjk_uni_prop_80.cc | 110 +++++++++++----------- internal/scoreonescriptspan.cc | 4 +- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/internal/cld_generated_cjk_uni_prop_80.cc b/internal/cld_generated_cjk_uni_prop_80.cc index 06ad806..af6f9ed 100644 --- a/internal/cld_generated_cjk_uni_prop_80.cc +++ b/internal/cld_generated_cjk_uni_prop_80.cc @@ -165,8 +165,8 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, // state[16 + 2] 0x000000 Byte 2 of 3 (relative offsets) X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, --14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14, --14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14, +static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14), static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14), +static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14), static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14),static_cast(-14), // state[17 + 2] 0x0031c0 Byte 3 of 3 (property) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -259,10 +259,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 229,229,229, 3,208, 0,229, 5, 233, 0,229,229,229,208,229,229, // state[32 + 2] 0x002000 Byte 2 of 3 (relative offsets) --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30, --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30, --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30, --30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30, +static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30), static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30), +static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30), static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30), +static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30), static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30), +static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30), static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30),static_cast(-30), // state[33 + 2] 0x003780 Byte 3 of 3 (property) 229,208,229,229,208,229,229,229, 208,208,208,208,208, 4, 6,208, @@ -355,10 +355,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 228,229,229,229,229,233,233, 6, 208,229, 3,229,233, 6, 6, 0, // state[48 + 2] 0x001000 Byte 2 of 3 (relative offsets) --46,-46,-46,-46,-42,-41,-40,-39, -46,-46,-46,-46,-46,-46,-46,-46, --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46, --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46, --46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46, +static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-42),static_cast(-41),static_cast(-40),static_cast(-39), static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46), +static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46), static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46), +static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46), static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46), +static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46), static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46),static_cast(-46), // state[49 + 2] 0x003b40 Byte 3 of 3 (property) 6,227,208,233,208, 3, 3,208, 208,229, 0,229,233,219, 0, 6, @@ -451,10 +451,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 229,208,208,208,217,208,229,229, 229,229,208,217,208,229,229,229, // state[64 + 2] 0x003000 Byte 2 of 3 (relative offsets) --54,-53,-52,-51,-50,-58,-49,-47, -62,-62,-62,-62,-62,-62,-62,-62, --46,-45,-44,-43,-42,-41,-40,-39, -38,-37,-36,-35,-34,-33,-31,-30, --29,-28,-27,-26,-25,-24,-23,-22, -21,-20,-19,-18,-17,-15,-14,-13, --12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, +static_cast(-54),static_cast(-53),static_cast(-52),static_cast(-51),static_cast(-50),static_cast(-58),static_cast(-49),static_cast(-47), static_cast(-62),static_cast(-62),static_cast(-62),static_cast(-62),static_cast(-62),static_cast(-62),static_cast(-62),static_cast(-62), +static_cast(-46),static_cast(-45),static_cast(-44),static_cast(-43),static_cast(-42),static_cast(-41),static_cast(-40),static_cast(-39), static_cast(-38),static_cast(-37),static_cast(-36),static_cast(-35),static_cast(-34),static_cast(-33),static_cast(-31),static_cast(-30), +static_cast(-29),static_cast(-28),static_cast(-27),static_cast(-26),static_cast(-25),static_cast(-24),static_cast(-23),static_cast(-22), static_cast(-21),static_cast(-20),static_cast(-19),static_cast(-18),static_cast(-17),static_cast(-15),static_cast(-14),static_cast(-13), +static_cast(-12),static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, // state[65 + 2] 0x003f00 Byte 3 of 3 (property) 217,217,208, 3,208,217,208,208, 6,229,208,228,229,229,208,229, @@ -547,10 +547,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 229,208,229,229,208,229,233, 0, 208,208,229,208,227,229,229,229, // state[80 + 2] 0x004000 Byte 2 of 3 (relative offsets) --11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, +static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44,-78, 45, 46, 47, 48, 49, 50, 51, 52, + 38, 39, 40, 41, 42, 43, 44,static_cast(-78), 45, 46, 47, 48, 49, 50, 51, 52, // state[81 + 2] 0x0042c0 Byte 3 of 3 (property) 229, 0,229,229,229, 3, 4, 4, 229,229,229,229,208,229, 0,208, @@ -931,7 +931,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 0,142, 98, 28,117,206,212,212, 220, 15, 0,231,199,231,111, 28, // state[144 + 2] 0x005000 Byte 2 of 3 (relative offsets) --11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, +static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, @@ -1315,7 +1315,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 16, 15,211,118, 0,231, 68,231, 0, 99,161, 0,115,221,144,140, // state[208 + 2] 0x006000 Byte 2 of 3 (relative offsets) --10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, +static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, @@ -1699,7 +1699,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 119, 16, 51, 0, 0, 68,136, 72, 144,118, 87,201,191,136, 78,233, // state[272 + 2] 0x007000 Byte 2 of 3 (relative offsets) - -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, + static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, @@ -2083,7 +2083,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 212,212, 0,126,140,220,220, 0, 0, 0,127,118,106, 0,199, 0, // state[336 + 2] 0x008000 Byte 2 of 3 (relative offsets) - -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, + static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, @@ -2467,7 +2467,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 0,122, 0,231,100,232, 0, 0, 117, 0,206,231, 0, 0,231, 0, // state[400 + 2] 0x009000 Byte 2 of 3 (relative offsets) - -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, + static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, @@ -2851,10 +2851,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // state[464 + 2] 0x00a000 Byte 2 of 3 (relative offsets) - -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, - -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, - -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, - -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, + static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), + static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), + static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), static_cast(-6), + static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), static_cast(-5), // state[465 + 2] 0x000080 Byte 2 of 2 (property) 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -2947,10 +2947,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 208,208,208,208, 5, 6,208, 2, 0, 6, 6, 5,208,208,208, 6, // state[480 + 2] 0x00b000 Byte 2 of 3 (relative offsets) --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20, --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20, --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20, --20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20, +static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20), static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20), +static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20), static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20), +static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20), static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20), +static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20), static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20),static_cast(-20), // state[481 + 2] 0x020100 Byte 4 of 4 (property) 2, 6, 5, 6, 5,229, 5,208, 208,208,208,208,208,208,208,229, @@ -3043,10 +3043,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 208,208, 5, 5, 5,208,208, 2, 229, 5, 5, 5, 5, 5, 6,208, // state[496 + 2] 0x00d000 Byte 2 of 3 (relative offsets) --35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-35,-35, --35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-34,-33, --33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33, --33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33, +static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35), static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35), +static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35), static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-35),static_cast(-34),static_cast(-33), +static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33), static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33), +static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33), static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33),static_cast(-33), // state[497 + 2] 0x0204c0 Byte 4 of 4 (property) 2, 2, 5, 5, 5, 2,208, 2, 5, 5, 6,208,208, 5, 5, 5, @@ -3139,10 +3139,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 208,208, 5, 5, 5, 5, 6, 6, 208,208, 2,208,208,208,208,208, // state[512 + 2] 0x00f000 Byte 2 of 3 (relative offsets) --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47, --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47, --47,-47,-47,-47,-46,-45,-44,-43, -42,-41,-44,-40,-47,-47,-47,-47, --47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-39,-38,-37, +static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47), static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47), +static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47), static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47), +static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-46),static_cast(-45),static_cast(-44),static_cast(-43), static_cast(-42),static_cast(-41),static_cast(-44),static_cast(-40),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47), +static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47), static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-47),static_cast(-39),static_cast(-38),static_cast(-37), // state[513 + 2] 0x020880 Byte 4 of 4 (property) 5, 5, 5, 6,208,208,208,208, 208,208, 5, 5, 6, 6,208,208, @@ -3235,10 +3235,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 5, 6,208,218,208,208,208,218, 208, 6,227,229, 6, 6, 6,208, // state[528 + 2] 0x020000 Byte 3 of 4 (relative offsets) --52,-51,-50,-49,-47,-46,-45,-44, -43,-42,-41,-40,-39,-38,-37,-36, --35,-34,-33,-31,-30,-29,-28,-27, -26,-25,-24,-23,-22,-21,-20,-19, --18,-17,-15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, - -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, +static_cast(-52),static_cast(-51),static_cast(-50),static_cast(-49),static_cast(-47),static_cast(-46),static_cast(-45),static_cast(-44), static_cast(-43),static_cast(-42),static_cast(-41),static_cast(-40),static_cast(-39),static_cast(-38),static_cast(-37),static_cast(-36), +static_cast(-35),static_cast(-34),static_cast(-33),static_cast(-31),static_cast(-30),static_cast(-29),static_cast(-28),static_cast(-27), static_cast(-26),static_cast(-25),static_cast(-24),static_cast(-23),static_cast(-22),static_cast(-21),static_cast(-20),static_cast(-19), +static_cast(-18),static_cast(-17),static_cast(-15),static_cast(-14),static_cast(-13),static_cast(-12),static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), + static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, // state[529 + 2] 0x020c40 Byte 4 of 4 (property) 227, 5, 5, 5, 2, 2, 2, 2, 213, 2, 2, 2, 2, 2,208, 6, @@ -3427,7 +3427,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 208,208,208,208,208,208,208,208, 208, 6, 6, 6, 6, 2, 5, 5, // state[560 + 2] 0x021000 Byte 3 of 4 (relative offsets) --16,-15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, +static_cast(-16),static_cast(-15),static_cast(-14),static_cast(-13),static_cast(-12),static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, @@ -3811,7 +3811,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 5, 5, 5, 6, 6, 6, 5,208, 208,229,208,208, 5, 5, 5, 5, // state[624 + 2] 0x022000 Byte 3 of 4 (relative offsets) --15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, +static_cast(-15),static_cast(-14),static_cast(-13),static_cast(-12),static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, @@ -4195,7 +4195,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 6, 6, 4, 5,208,208,208,208, 208,208,229, 6, 5, 6, 6, 6, // state[688 + 2] 0x023000 Byte 3 of 4 (relative offsets) --14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, +static_cast(-14),static_cast(-13),static_cast(-12),static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, @@ -4579,7 +4579,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 5, 5, 5, 5, 5, 5, 5, 6, 208,208,208,208,208,208, 6, 6, // state[752 + 2] 0x024000 Byte 3 of 4 (relative offsets) --13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, +static_cast(-13),static_cast(-12),static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, @@ -4963,7 +4963,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 229, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 2, 2, 6,229, // state[816 + 2] 0x025000 Byte 3 of 4 (relative offsets) --12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, +static_cast(-12),static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, @@ -5347,7 +5347,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 6, 6, 6, 5, 5, 5, 5, 6, 6, 6, 3, 6,229,208,208,229, // state[880 + 2] 0x026000 Byte 3 of 4 (relative offsets) --11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, +static_cast(-11),static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, @@ -5731,7 +5731,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 208, 6, 6,208,208,208,208,208, 6, 6, 6,216, 5, 5, 5, 5, // state[944 + 2] 0x027000 Byte 3 of 4 (relative offsets) --10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, +static_cast(-10), static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, @@ -6115,7 +6115,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 5, 5, 5, 6,208,208, 6, 6, 208,229,208,208,208, 5, 5, 5, // state[1008 + 2] 0x028000 Byte 3 of 4 (relative offsets) - -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, + static_cast(-9), static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, @@ -6499,7 +6499,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 208,208, 5, 5, 6,208,208, 5, 208,208,208, 6,208, 6,208,208, // state[1072 + 2] 0x029000 Byte 3 of 4 (relative offsets) - -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, + static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, @@ -6883,7 +6883,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 229,229,229,229,208,208,208,229, 208,208,208,229, 0,229,208,208, // state[1136 + 2] 0x02a000 Byte 3 of 4 (relative offsets) - -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, + static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, @@ -7075,10 +7075,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, // state[1168 + 2] 0x02f000 Byte 3 of 4 (relative offsets) - -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, - -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, - -8, -7, -6, -5, -4, -3, -2, -1, 1, -9, -9, -9, -9, -9, -9, -9, - -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, + static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), + static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), + static_cast(-8), static_cast(-7), static_cast(-6), static_cast(-5), static_cast(-4), static_cast(-3), static_cast(-2), static_cast(-1), 1, static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), + static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), static_cast(-9), // state[1169 + 2] 0x02fa00 Byte 4 of 4 (property) 217, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,217, 5, 5, diff --git a/internal/scoreonescriptspan.cc b/internal/scoreonescriptspan.cc index 11ccaea..8313ecc 100644 --- a/internal/scoreonescriptspan.cc +++ b/internal/scoreonescriptspan.cc @@ -1144,8 +1144,8 @@ void ScoreEntireScriptSpan(const LangSpan& scriptspan, if (scoringcontext->flags_cld2_html) { ChunkSummary chunksummary = { 1, 0, - one_one_lang, UNKNOWN_LANGUAGE, score, 1, - bytes, 0, scriptspan.ulscript, reliability, reliability + static_cast(one_one_lang), UNKNOWN_LANGUAGE, static_cast(score), 1, + static_cast(bytes), 0, static_cast(scriptspan.ulscript), static_cast(reliability), static_cast(reliability) }; CLD2_Debug(scriptspan.text, 1, scriptspan.text_bytes, false, false, NULL,