diff options
author | Doried Abd-Allah <doried.a.a@gmail.com> | 2016-12-29 16:16:07 +0300 |
---|---|---|
committer | Doried Abd-Allah <doried.a.a@gmail.com> | 2016-12-29 16:16:07 +0300 |
commit | 347980fd426dcbc2cc2126c187f22473f819a3d4 (patch) | |
tree | b19541e04f89a91d1830af98706d182979384cf2 /moses/TranslationModel | |
parent | e14a71c3ea7483a2f7d96007b9bb88ea576226af (diff) |
fixing errors while building with oxlm: renamed iptr to boost_iptr because of a conflict with eigen library required by oxlm, added boost_serialization to oxlm requirements in jamroot
Diffstat (limited to 'moses/TranslationModel')
-rw-r--r-- | moses/TranslationModel/UG/mm/ug_typedefs.h | 2 | ||||
-rw-r--r-- | moses/TranslationModel/UG/test-ranked-phrase-lookup.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/moses/TranslationModel/UG/mm/ug_typedefs.h b/moses/TranslationModel/UG/mm/ug_typedefs.h index fc9d7faef..4815846a2 100644 --- a/moses/TranslationModel/UG/mm/ug_typedefs.h +++ b/moses/TranslationModel/UG/mm/ug_typedefs.h @@ -36,7 +36,7 @@ namespace sapt #ifndef SPTR #define SPTR boost::shared_ptr #endif -#define iptr boost::intrusive_ptr +#define boost_iptr boost::intrusive_ptr #define scoptr boost::scoped_ptr #define rcast reinterpret_cast #endif diff --git a/moses/TranslationModel/UG/test-ranked-phrase-lookup.cc b/moses/TranslationModel/UG/test-ranked-phrase-lookup.cc index 613e46360..ff9f1c722 100644 --- a/moses/TranslationModel/UG/test-ranked-phrase-lookup.cc +++ b/moses/TranslationModel/UG/test-ranked-phrase-lookup.cc @@ -76,7 +76,7 @@ int main(int argc, char* argv[]) { typedef vector<PhrasePair<Token> > pplist_t; interpret_args(argc, argv); - iptr<mmbitext> Bptr(new mmbitext); + boost_iptr<mmbitext> Bptr(new mmbitext); mmbitext& B = *Bptr;// static_cast<mmbitext*>(Bptr.get()); B.open(bname, L1, L2); B.V1->setDynamic(true); |