From ecba1ef1a0d4729c444cba8f9066a3d6cd5b0edc Mon Sep 17 00:00:00 2001 From: "andrewhayden@google.com" Date: Fri, 7 Nov 2014 09:19:51 +0000 Subject: [PATCH] Apply fixes for Windows to the 20141015 data set. For more information, see: https://code.google.com/p/cld2/issues/detail?id=9 git-svn-id: https://cld2.googlecode.com/svn/trunk@192 b252ecd4-b096-bf77-eb8e-91563289f87e --- internal/cld2_generated_deltaoctachrome.cc | 7 ++++++- internal/cld2_generated_distinctoctachrome.cc | 7 ++++++- internal/cld2_generated_quadchrome_2.cc | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/internal/cld2_generated_deltaoctachrome.cc b/internal/cld2_generated_deltaoctachrome.cc index fc37d2b..90e5e91 100644 --- a/internal/cld2_generated_deltaoctachrome.cc +++ b/internal/cld2_generated_deltaoctachrome.cc @@ -4589,8 +4589,13 @@ extern const CLD2TableSummary kDeltaOcta_obj = { static const uint32 kDeltaOctaChrome1015_2Size = 0; // Bucket count static const uint32 kDeltaOctaChrome1015_2KeyMask = 0xffffffff; // Mask hash key -static const IndirectProbBucket4 kDeltaOctaChrome1015_2[kDeltaOctaChrome1015_2Size] = { +// NOTE: Some compilers will not allow an array of structs to have a constant +// size of zero. Thus, we tell the code that the size is zero, but +// actually allocate a single element array that will never be read. +// More info: https://code.google.com/p/cld2/issues/detail?id=9 +static const IndirectProbBucket4 kDeltaOctaChrome1015_2[1] = { // hash_indirect[4], tokens[4] in UTF-8 + {0x00000000,0x00000000,0x00000000,0x00000000} // UNUSED, see above! }; // table_hash = ffff-ffff, unused_entries = 0 (0.00%) diff --git a/internal/cld2_generated_distinctoctachrome.cc b/internal/cld2_generated_distinctoctachrome.cc index f507faf..fec515c 100644 --- a/internal/cld2_generated_distinctoctachrome.cc +++ b/internal/cld2_generated_distinctoctachrome.cc @@ -2180,8 +2180,13 @@ extern const CLD2TableSummary kDistinctOcta_obj = { static const uint32 kDistinctOctaChrome1015_2Size = 0; // Bucket count static const uint32 kDistinctOctaChrome1015_2KeyMask = 0xffffffff; // Mask hash key -static const IndirectProbBucket4 kDistinctOctaChrome1015_2[kDistinctOctaChrome1015_2Size] = { +// NOTE: Some compilers will not allow an array of structs to have a constant +// size of zero. Thus, we tell the code that the size is zero, but +// actually allocate a single element array that will never be read. +// More info: https://code.google.com/p/cld2/issues/detail?id=9 +static const IndirectProbBucket4 kDistinctOctaChrome1015_2[1] = { // hash_indirect[4], tokens[4] in UTF-8 + {0x00000000,0x00000000,0x00000000,0x00000000} // UNUSED, see above! }; // table_hash = ffff-ffff, unused_entries = 0 (0.00%) diff --git a/internal/cld2_generated_quadchrome_2.cc b/internal/cld2_generated_quadchrome_2.cc index eba7584..8eeb3d5 100644 --- a/internal/cld2_generated_quadchrome_2.cc +++ b/internal/cld2_generated_quadchrome_2.cc @@ -84478,8 +84478,13 @@ extern const CLD2TableSummary kQuad_obj = { static const uint32 kQuadChrome1015_2_2Size = 0; // Bucket count static const uint32 kQuadChrome1015_2_2KeyMask = 0xffffffff; // Mask hash key -static const IndirectProbBucket4 kQuadChrome1015_2_2[kQuadChrome1015_2_2Size] = { +// NOTE: Some compilers will not allow an array of structs to have a constant +// size of zero. Thus, we tell the code that the size is zero, but +// actually allocate a single element array that will never be read. +// More info: https://code.google.com/p/cld2/issues/detail?id=9 +static const IndirectProbBucket4 kQuadChrome1015_2_2[1] = { // hash_indirect[4], tokens[4] in UTF-8 + {0x00000000,0x00000000,0x00000000,0x00000000} // UNUSED, see above! }; // table_hash = ffff-ffff, unused_entries = 0 (0.00%)