mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2024-09-20 07:42:21 +03:00
Merge branch 'master' of github.com:moses-smt/mosesdecoder
This commit is contained in:
commit
76a9730ca8
@ -143,7 +143,7 @@ rule boost-lib ( name macro : deps * ) {
|
||||
alias boost_$(name) : inner_boost_$(name) : <link>shared ;
|
||||
requirements += <define>BOOST_$(macro) ;
|
||||
} else {
|
||||
alias boost_$(name) : inner_boost_$(name) : <link>static ;
|
||||
alias boost_$(name) : inner_boost_$(name) : : : <link>shared:<define>BOOST_$(macro) ;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,7 @@ lib mira_lib :
|
||||
[ glob *.cpp : *Test.cpp Main.cpp ]
|
||||
../mert//mert_lib ../moses//moses ../OnDiskPt//OnDiskPt ..//boost_program_options ;
|
||||
|
||||
exe mira : Main.cpp mira_lib ;
|
||||
exe mira : Main.cpp mira_lib ../mert//mert_lib ../moses//moses ../OnDiskPt//OnDiskPt ..//boost_program_options ;
|
||||
|
||||
alias programs : mira ;
|
||||
|
||||
|
@ -56,7 +56,7 @@ public:
|
||||
const ChartCellCollectionBase &);
|
||||
|
||||
private:
|
||||
const TargetPhraseCollection *GetTargetPhraseCollection(const Phrase &) const;
|
||||
// const TargetPhraseCollection *GetTargetPhraseCollection(const Phrase &) const;
|
||||
|
||||
TargetPhraseCollection &GetOrCreateTargetPhraseCollection(
|
||||
const Phrase &source, const TargetPhrase &target, const Word *sourceLHS);
|
||||
|
Loading…
Reference in New Issue
Block a user