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

This commit is contained in:
Doried Abd-Allah 2016-12-29 15:16:07 +02:00
parent e14a71c3ea
commit 347980fd42
3 changed files with 2 additions and 3 deletions

View File

@ -183,7 +183,6 @@ requirements += [ option.get "with-mm" : : <define>MAX_NUM_FACTORS=4 ] ;
requirements += [ option.get "unlabelled-source" : : <define>UNLABELLED_SOURCE ] ;
if [ option.get "with-oxlm" ] {
external-lib boost_serialization ;
external-lib gomp ;
requirements += <library>boost_serialization ;
requirements += <library>gomp ;

View File

@ -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

View File

@ -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);