diff options
| author | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2015-07-02 20:06:55 +0300 |
|---|---|---|
| committer | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2015-07-02 20:06:55 +0300 |
| commit | b05ca8cb807e28319ca5e6b370e086216004567c (patch) | |
| tree | 631bae9df096df29b034a07bba3a137907326487 | |
| parent | e94921dc442033a87b7cf4d712db1dcfbc9a003f (diff) | |
Fixes to make code compile on various versions of gcc.mmt-mvp-v0.9.0
| -rw-r--r-- | moses/TargetPhrase.cpp | 2 | ||||
| -rw-r--r-- | moses/TargetPhrase.h | 2 | ||||
| -rw-r--r-- | moses/TranslationModel/UG/mm/ug_mm_2d_table.h | 2 | ||||
| -rw-r--r-- | moses/TranslationModel/UG/mm/ug_mm_ttrack.h | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/moses/TargetPhrase.cpp b/moses/TargetPhrase.cpp index fc7af9687..251a9db7d 100644 --- a/moses/TargetPhrase.cpp +++ b/moses/TargetPhrase.cpp @@ -181,7 +181,7 @@ bool TargetPhrase::HasTtaskSPtr() const { return m_ttask_flag; } -const ttasksptr& TargetPhrase::GetTtask() const { +const ttasksptr TargetPhrase::GetTtask() const { return m_ttask.lock(); } diff --git a/moses/TargetPhrase.h b/moses/TargetPhrase.h index 460dcc33f..554ac2793 100644 --- a/moses/TargetPhrase.h +++ b/moses/TargetPhrase.h @@ -92,7 +92,7 @@ public: TargetPhrase(ttasksptr &ttask, const PhraseDictionary *pt = NULL); TargetPhrase(ttasksptr &ttask, std::string out_string, const PhraseDictionary *pt = NULL); explicit TargetPhrase(ttasksptr &ttask, const Phrase &targetPhrase, const PhraseDictionary *pt); - const ttasksptr& GetTtask() const; + ttasksptr const GetTtask() const; bool HasTtaskSPtr() const; ~TargetPhrase(); diff --git a/moses/TranslationModel/UG/mm/ug_mm_2d_table.h b/moses/TranslationModel/UG/mm/ug_mm_2d_table.h index e2284382e..0ae16895b 100644 --- a/moses/TranslationModel/UG/mm/ug_mm_2d_table.h +++ b/moses/TranslationModel/UG/mm/ug_mm_2d_table.h @@ -103,7 +103,7 @@ namespace ugdiss operator[](ID key) const { if (start==stop) return INIT(0); - Cell const* c = lower_bound(start,stop,key); + Cell const* c = std::lower_bound(start,stop,key); return (c != stop && c->id == key ? c->val : INIT(0)); } diff --git a/moses/TranslationModel/UG/mm/ug_mm_ttrack.h b/moses/TranslationModel/UG/mm/ug_mm_ttrack.h index 91167822d..b87d638b2 100644 --- a/moses/TranslationModel/UG/mm/ug_mm_ttrack.h +++ b/moses/TranslationModel/UG/mm/ug_mm_ttrack.h @@ -21,6 +21,7 @@ #include "ug_ttrack_base.h" #include "num_read_write.h" #include "ug_load_primer.h" +#include "ug_tsa_base.h" namespace ugdiss { @@ -193,7 +194,7 @@ namespace ugdiss findSid(TKN const* t) const { id_type tokenPos = t-data; - id_type const* p = upper_bound(index,index+this->numSent,tokenPos); + id_type const* p = std::upper_bound(index,index+this->numSent,tokenPos); assert(p>index); return p-index-1; } @@ -203,7 +204,7 @@ namespace ugdiss mmTtrack<TKN>:: findSid(id_type tokenPos) const { - id_type const* p = upper_bound(index,index+this->numSent,tokenPos); + id_type const* p = std::upper_bound(index,index+this->numSent,tokenPos); assert(p>index); return p-index-1; } |