diff options
| author | heafield <heafield@1f5c12ca-751b-0410-a591-d2e778427230> | 2011-10-17 13:42:36 +0400 |
|---|---|---|
| committer | heafield <heafield@1f5c12ca-751b-0410-a591-d2e778427230> | 2011-10-17 13:42:36 +0400 |
| commit | b13c341bc1abaf13c94c992d2dc8855c50e5fabd (patch) | |
| tree | 3a5fc839ddf02531a89918c8cb95226f0a6a5be1 /kenlm | |
| parent | f0be9d9cf08fc927876861bd8989f38a432d6e22 (diff) | |
Remove some gcc-only variable sized arrays
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4382 1f5c12ca-751b-0410-a591-d2e778427230
Diffstat (limited to 'kenlm')
| -rw-r--r-- | kenlm/lm/search_hashed.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kenlm/lm/search_hashed.cc b/kenlm/lm/search_hashed.cc index 334adf12a..247832b0a 100644 --- a/kenlm/lm/search_hashed.cc +++ b/kenlm/lm/search_hashed.cc @@ -87,14 +87,14 @@ template <class Voc, class Store, class Middle, class Activate> void ReadNGrams( ReadNGramHeader(f, n); // vocab ids of words in reverse order - WordIndex vocab_ids[n]; - uint64_t keys[n - 1]; + std::vector<WordIndex> vocab_ids(n); + std::vector<uint64_t> keys(n-1); typename Store::Packing::Value value; typename Middle::MutableIterator found; for (size_t i = 0; i < count; ++i) { - ReadNGram(f, n, vocab, vocab_ids, value, warn); + ReadNGram(f, n, vocab, &*vocab_ids.begin(), value, warn); - keys[0] = detail::CombineWordHash(static_cast<uint64_t>(*vocab_ids), vocab_ids[1]); + keys[0] = detail::CombineWordHash(static_cast<uint64_t>(vocab_ids.front()), vocab_ids[1]); for (unsigned int h = 1; h < n - 1; ++h) { keys[h] = detail::CombineWordHash(keys[h-1], vocab_ids[h+1]); } @@ -106,9 +106,9 @@ template <class Voc, class Store, class Middle, class Activate> void ReadNGrams( util::FloatEnc fix_prob; for (lower = n - 3; ; --lower) { if (lower == -1) { - fix_prob.f = unigrams[vocab_ids[0]].prob; + fix_prob.f = unigrams[vocab_ids.front()].prob; fix_prob.i &= ~util::kSignBit; - unigrams[vocab_ids[0]].prob = fix_prob.f; + unigrams[vocab_ids.front()].prob = fix_prob.f; break; } if (middle[lower].UnsafeMutableFind(keys[lower], found)) { @@ -120,8 +120,8 @@ template <class Voc, class Store, class Middle, class Activate> void ReadNGrams( break; } } - if (lower != static_cast<int>(n) - 3) FixSRI(lower, fix_prob.f, n, keys, vocab_ids, unigrams, middle); - activate(vocab_ids, n); + if (lower != static_cast<int>(n) - 3) FixSRI(lower, fix_prob.f, n, &*keys.begin(), &*vocab_ids.begin(), unigrams, middle); + activate(&*vocab_ids.begin(), n); } store.FinishedInserting(); |