diff --git a/moses/TranslationModel/UG/mm/ug_bitext_sampler.h b/moses/TranslationModel/UG/mm/ug_bitext_sampler.h index a36e0772f..17de9c051 100644 --- a/moses/TranslationModel/UG/mm/ug_bitext_sampler.h +++ b/moses/TranslationModel/UG/mm/ug_bitext_sampler.h @@ -52,7 +52,7 @@ BitextSampler : public Moses::reference_counter // const members // SPTR const m_bitext; // keep bitext alive while I am // should be an - iptr const m_bitext; // keep bitext alive as long as I am + SPTR const m_bitext; // keep bitext alive as long as I am size_t const m_plen; // length of lookup phrase bool const m_fwd; // forward or backward direction? SPTR const m_root; // root of suffix array diff --git a/moses/TranslationModel/UG/mm/ug_prep_phrases.h b/moses/TranslationModel/UG/mm/ug_prep_phrases.h index 1c62db2e3..1d04d6680 100644 --- a/moses/TranslationModel/UG/mm/ug_prep_phrases.h +++ b/moses/TranslationModel/UG/mm/ug_prep_phrases.h @@ -16,7 +16,7 @@ struct StatsCollector typedef lru_cache::LRU_Cache< uint64_t, pstats > hcache_t; typedef ThreadSafeContainer > pcache_t; typedef map > lcache_t; - iptr const> bitext; // underlying bitext + SPTR const> bitext; // underlying bitext sampling_method method; // sampling method size_t sample_size; // sample size SPTR bias; // sampling bias @@ -26,7 +26,7 @@ struct StatsCollector SPTR lcache; // local cache ug::ThreadPool* tpool; // thread pool to run jobs on - StatsCollector(iptr > xbitext, + StatsCollector(SPTR > xbitext, SPTR const xbias) : method(ranked_sampling) , sample_size(100) diff --git a/moses/TranslationModel/UG/mmsapt.h b/moses/TranslationModel/UG/mmsapt.h index d30177518..9dbd869df 100644 --- a/moses/TranslationModel/UG/mmsapt.h +++ b/moses/TranslationModel/UG/mmsapt.h @@ -71,7 +71,7 @@ namespace Moses typedef sapt::PhraseScorer pscorer; private: // vector > shards; - iptr btfix; + SPTR btfix; SPTR btdyn; std::string m_bname, m_extra_data, m_bias_file,m_bias_server; std::string L1; @@ -160,7 +160,7 @@ namespace Moses #if PROVIDES_RANKED_SAMPLING void - set_bias_for_ranking(ttasksptr const& ttask, iptr const> bt); + set_bias_for_ranking(ttasksptr const& ttask, SPTR const> bt); #endif private: