diff options
| author | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
|---|---|---|
| committer | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
| commit | e4eb201c52be74fee74399a6f35fcbe8eb85d834 (patch) | |
| tree | 7792ef96d63262f6e28f1857741e1162c7dccbc4 /moses/Phrase.h | |
| parent | cea2d9d8bb34a81660974cae20d66aefec4e0468 (diff) | |
| parent | a0b6b6a341e74b47bbef4652ad7fd928cf91e17c (diff) | |
merged master into dynamic-models and solved conflicts
Diffstat (limited to 'moses/Phrase.h')
| -rw-r--r-- | moses/Phrase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/moses/Phrase.h b/moses/Phrase.h index e910cbb2a..947e50905 100644 --- a/moses/Phrase.h +++ b/moses/Phrase.h @@ -47,8 +47,8 @@ class WordsRange; class Phrase { friend std::ostream& operator<<(std::ostream&, const Phrase&); -private: - + // private: +protected: std::vector<Word> m_words; public: |