diff options
| author | Hieu Hoang <hieuhoang@Hieus-MacBook.local> | 2011-11-22 05:03:56 +0400 |
|---|---|---|
| committer | Hieu Hoang <hieuhoang@Hieus-MacBook.local> | 2011-11-22 05:03:56 +0400 |
| commit | a8777ac5d2d479a5778d33b60599dc763224fdf8 (patch) | |
| tree | bd25b2d7ae30b36a6a7f467bb871cea7d5cdfd18 /moses | |
| parent | 888728814ec3dacca0e154085842a2aeca2413a5 (diff) | |
| parent | c1ffa8ca52435783ffe238d651eba79ea3d0a204 (diff) | |
Merge branch 'master' of github.com:moses-smt/mosesdecoder
Diffstat (limited to 'moses')
| -rw-r--r-- | moses/src/Hypothesis.h | 3 | ||||
| -rw-r--r-- | moses/src/Jamfile | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/moses/src/Hypothesis.h b/moses/src/Hypothesis.h index af16601a0..a38a15e22 100644 --- a/moses/src/Hypothesis.h +++ b/moses/src/Hypothesis.h @@ -166,9 +166,6 @@ public: std::string GetSourcePhraseStringRep(const std::vector<FactorType> factorsToPrint) const; std::string GetTargetPhraseStringRep(const std::vector<FactorType> factorsToPrint) const; - inline const TargetPhrase GetTargetPhrase() const { - return m_targetPhrase; - } std::string GetSourcePhraseStringRep() const; std::string GetTargetPhraseStringRep() const; diff --git a/moses/src/Jamfile b/moses/src/Jamfile index c7e95abf5..1a1693667 100644 --- a/moses/src/Jamfile +++ b/moses/src/Jamfile @@ -11,9 +11,7 @@ if [ option.get "with-synlm" : no : yes ] = yes alias synlm ; } -lib z ; - lib moses : #All cpp files except those listed [ glob *.cpp DynSAInclude/*.cpp : ThreadPool.cpp SyntacticLanguageModel.cpp ] -synlm ThreadPool LM//LM headers z ; +synlm ThreadPool LM//LM headers ../..//z ; |