Life cycle of TargetPhraseCollection is now managed via shared pointers.

1 files changed, 16 insertions, 7 deletions

diff --git a/moses/InputPath.h b/moses/InputPath.h
index e8b5978ad..e379b8630 100644
--- a/moses/InputPath.h
+++ b/moses/InputPath.h
@@ -8,12 +8,12 @@
 #include "WordsRange.h"
 #include "NonTerminal.h"
 #include "moses/FactorCollection.h"
-
+#include <boost/shared_ptr.hpp>
+#include "TargetPhraseCollection.h"
 namespace Moses
 {
 
 class PhraseDictionary;
-class TargetPhraseCollection;
 class ScoreComponentCollection;
 class TargetPhrase;
 class InputPath;
@@ -32,7 +32,12 @@ class InputPath
   friend std::ostream& operator<<(std::ostream& out, const InputPath &obj);
 
 public:
-  typedef std::map<const PhraseDictionary*, std::pair<const TargetPhraseCollection*, const void*> > TargetPhrases;
+
+  typedef std::pair<TargetPhraseCollection::shared_ptr, const void*> 
+  TPCollStoreEntry;
+
+  typedef std::map<const PhraseDictionary*, TPCollStoreEntry> 
+  TargetPhrases;
 
 public:
   ttaskwptr const ttask;
@@ -96,10 +101,14 @@ public:
     m_nextNode = nextNode;
   }
 
-  void SetTargetPhrases(const PhraseDictionary &phraseDictionary
-                        , const TargetPhraseCollection *targetPhrases
-                        , const void *ptNode);
-  const TargetPhraseCollection *GetTargetPhrases(const PhraseDictionary &phraseDictionary) const;
+  void 
+  SetTargetPhrases(const PhraseDictionary &phraseDictionary, 
+                   TargetPhraseCollection::shared_ptr const& targetPhrases, 
+                   const void *ptNode);
+
+  TargetPhraseCollection::shared_ptr
+  GetTargetPhrases(const PhraseDictionary &phraseDictionary) const;
+
   const TargetPhrases &GetTargetPhrases() const {
     return m_targetPhrases;
   }