change InputFeature::Instance to return pointer, not ref. Strange segfault in OSX/clang

1 files changed, 4 insertions, 4 deletions

diff --git a/moses/WordLattice.cpp b/moses/WordLattice.cpp
index 7804c9a58..c68d182b0 100644
--- a/moses/WordLattice.cpp
+++ b/moses/WordLattice.cpp
@@ -12,7 +12,7 @@ namespace Moses
 {
 WordLattice::WordLattice()  : ConfusionNet()
 {
-  UTIL_THROW_IF2(&InputFeature::Instance() == NULL,
+  UTIL_THROW_IF2(InputFeature::InstancePtr() == NULL,
                  "Input feature must be specified");
 }
 
@@ -57,9 +57,9 @@ InitializeFromPCNDataType
  const std::string& debug_line)
 {
   // const StaticData &staticData = StaticData::Instance();
-  const InputFeature &inputFeature = InputFeature::Instance();
-  size_t numInputScores = inputFeature.GetNumInputScores();
-  size_t numRealWordCount = inputFeature.GetNumRealWordsInInput();
+  const InputFeature *inputFeature = InputFeature::InstancePtr();
+  size_t numInputScores = inputFeature->GetNumInputScores();
+  size_t numRealWordCount = inputFeature->GetNumRealWordsInInput();
 
   size_t maxSizePhrase = StaticData::Instance().GetMaxPhraseLength();