diff options
| author | Kenneth Heafield <github@kheafield.com> | 2014-01-28 04:51:35 +0400 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2014-01-28 04:51:35 +0400 |
| commit | 14e02978fcbbe9ec6ed3faa232fcb3f30664f40e (patch) | |
| tree | 0b0d19a9c1ba1020ae6b3f1230b8b5b9e6a945f9 /lm/facade.hh | |
| parent | b68a906fdd97c344ce7d6fa90a2db5a79c5853e6 (diff) | |
KenLM 5cc905bc2d214efa7de2db56a9a672b749a95591
Avoid unspecified behavior of mmap when a file is resized reported by Christian Hardmeier
Fixes for Mavericks and a workaround for Boost's broken semaphore
Clean clang compile (of kenlm)
Merged some of 744376b3fbebc41c4a270bf549826d5eb9219ae0 but also undid some of it because it was just masking a fundaemntal problem with pread rather than working around windows limitations
Diffstat (limited to 'lm/facade.hh')
| -rw-r--r-- | lm/facade.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lm/facade.hh b/lm/facade.hh index 760e839e0..de1551f12 100644 --- a/lm/facade.hh +++ b/lm/facade.hh @@ -17,14 +17,14 @@ template <class Child, class StateT, class VocabularyT> class ModelFacade : publ typedef VocabularyT Vocabulary; /* Translate from void* to State */ - FullScoreReturn FullScore(const void *in_state, const WordIndex new_word, void *out_state) const { + FullScoreReturn BaseFullScore(const void *in_state, const WordIndex new_word, void *out_state) const { return static_cast<const Child*>(this)->FullScore( *reinterpret_cast<const State*>(in_state), new_word, *reinterpret_cast<State*>(out_state)); } - FullScoreReturn FullScoreForgotState(const WordIndex *context_rbegin, const WordIndex *context_rend, const WordIndex new_word, void *out_state) const { + FullScoreReturn BaseFullScoreForgotState(const WordIndex *context_rbegin, const WordIndex *context_rend, const WordIndex new_word, void *out_state) const { return static_cast<const Child*>(this)->FullScoreForgotState( context_rbegin, context_rend, @@ -37,7 +37,7 @@ template <class Child, class StateT, class VocabularyT> class ModelFacade : publ return static_cast<const Child*>(this)->FullScore(in_state, new_word, out_state).prob; } - float Score(const void *in_state, const WordIndex new_word, void *out_state) const { + float BaseScore(const void *in_state, const WordIndex new_word, void *out_state) const { return static_cast<const Child*>(this)->Score( *reinterpret_cast<const State*>(in_state), new_word, |