mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2024-12-26 05:14:36 +03:00
single threaded build compiles & passes regression
This commit is contained in:
parent
1a8977d890
commit
d203f2bb6e
@ -7,10 +7,14 @@
|
||||
#include "moses/TargetPhraseCollection.h"
|
||||
#include "moses/TranslationModel/PhraseDictionary.h"
|
||||
#include "util/check.hh"
|
||||
|
||||
#include <boost/thread/tss.hpp>
|
||||
#include <vector>
|
||||
|
||||
#ifdef WITH_THREADS
|
||||
#include <boost/thread/tss.hpp>
|
||||
#else
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
#endif
|
||||
|
||||
namespace Moses
|
||||
{
|
||||
|
||||
@ -26,7 +30,11 @@ class PhraseDictionaryTreeAdaptor : public PhraseDictionary
|
||||
{
|
||||
typedef PhraseDictionary MyBase;
|
||||
|
||||
#ifdef WITH_THREADS
|
||||
boost::thread_specific_ptr<PDTAimp> m_implementation;
|
||||
#else
|
||||
boost::scoped_ptr<PDTAimp> m_implementation;
|
||||
#endif
|
||||
|
||||
friend class PDTAimp;
|
||||
PhraseDictionaryTreeAdaptor();
|
||||
|
@ -32,6 +32,8 @@
|
||||
|
||||
#ifdef WITH_THREADS
|
||||
#include <boost/thread/tss.hpp>
|
||||
#else
|
||||
#include <boost/scoped_ptr.hpp>
|
||||
#endif
|
||||
|
||||
namespace Moses
|
||||
@ -47,7 +49,11 @@ class PhraseDictionaryOnDisk : public PhraseDictionary
|
||||
friend std::ostream& operator<<(std::ostream&, const PhraseDictionaryOnDisk&);
|
||||
|
||||
protected:
|
||||
#ifdef WITH_THREADS
|
||||
boost::thread_specific_ptr<OnDiskPt::OnDiskWrapper> m_implementation;
|
||||
#else
|
||||
boost::scoped_ptr<OnDiskPt::OnDiskWrapper> m_implementation;
|
||||
#endif
|
||||
|
||||
OnDiskPt::OnDiskWrapper &GetImplementation();
|
||||
const OnDiskPt::OnDiskWrapper &GetImplementation() const;
|
||||
|
@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
***********************************************************************/
|
||||
|
||||
#include <algorithm>
|
||||
#include <typeinfo>
|
||||
#include "TranslationOptionCollection.h"
|
||||
#include "Sentence.h"
|
||||
#include "DecodeStep.h"
|
||||
|
Loading…
Reference in New Issue
Block a user