diff options
| author | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2015-02-06 04:30:00 +0300 |
|---|---|---|
| committer | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2015-02-06 04:30:00 +0300 |
| commit | be5799dca34027849fc40a38a63459e164f27add (patch) | |
| tree | 140e865a962c546c12e2322ab76a56699e7338c6 /moses/TranslationOptionCollectionLattice.h | |
| parent | 80a9f84422f3b7ce3ddf0bcfcbe2e8d06bba9e98 (diff) | |
| parent | 8b61f396a7558bf628c2e94a9583023b9ae34a8c (diff) | |
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Conflicts:
moses/TranslationOptionCollection.cpp
moses/TranslationOptionCollectionLattice.cpp
moses/TranslationOptionCollectionLattice.h
moses/TranslationOptionList.h
Diffstat (limited to 'moses/TranslationOptionCollectionLattice.h')
| -rw-r--r-- | moses/TranslationOptionCollectionLattice.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/moses/TranslationOptionCollectionLattice.h b/moses/TranslationOptionCollectionLattice.h index f2f02df32..cea90f11e 100644 --- a/moses/TranslationOptionCollectionLattice.h +++ b/moses/TranslationOptionCollectionLattice.h @@ -15,10 +15,10 @@ class WordLattice; class TranslationOptionCollectionLattice : public TranslationOptionCollection { protected: - /* forcibly create translation option for a 1 word. - * call the base class' ProcessOneUnknownWord() for each possible word in the confusion network - * at a particular source position - */ + /* forcibly create translation option for a 1 word. + * call the base class' ProcessOneUnknownWord() for each possible word in the confusion network + * at a particular source position + */ void ProcessUnknownWord(size_t sourcePos); // do not implement public: |