move all feature functions out of StaticData

1 files changed, 4 insertions, 4 deletions

diff --git a/moses/WordLattice.cpp b/moses/WordLattice.cpp
index a3055c65c..8dfc5879d 100644
--- a/moses/WordLattice.cpp
+++ b/moses/WordLattice.cpp
@@ -12,7 +12,7 @@ namespace Moses
 {
 WordLattice::WordLattice()
 {
-  UTIL_THROW_IF2(StaticData::Instance().GetInputFeature() == NULL,
+  UTIL_THROW_IF2(&InputFeature::Instance() == NULL,
 		  "Input feature must be specified");
 }
 
@@ -52,9 +52,9 @@ void WordLattice::Print(std::ostream& out) const
 int WordLattice::InitializeFromPCNDataType(const PCN::CN& cn, const std::vector<FactorType>& factorOrder, const std::string& debug_line)
 {
   const StaticData &staticData = StaticData::Instance();
-  const InputFeature *inputFeature = staticData.GetInputFeature();
-  size_t numInputScores = inputFeature->GetNumInputScores();
-  size_t numRealWordCount = inputFeature->GetNumRealWordsInInput();
+  const InputFeature &inputFeature = InputFeature::Instance();
+  size_t numInputScores = inputFeature.GetNumInputScores();
+  size_t numRealWordCount = inputFeature.GetNumRealWordsInInput();
 
   size_t maxSizePhrase = StaticData::Instance().GetMaxPhraseLength();