From 57f8834890203cade8e4d87978904715ee5ccaf7 Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <kenlm@kheafield.com>
Date: Fri, 3 Jun 2011 20:56:37 -0400
Subject: Code cleanup for vocabulary mapping

---
 decoder/ff_klm.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/decoder/ff_klm.cc b/decoder/ff_klm.cc
index 71ba9f30..a3bd0c5f 100644
--- a/decoder/ff_klm.cc
+++ b/decoder/ff_klm.cc
@@ -282,11 +282,10 @@ class KLanguageModelImpl {
   KLanguageModelImpl(const string& filename, const string& mapfile, bool explicit_markers) :
       kCDEC_UNK(TD::Convert("<unk>")) ,
       add_sos_eos_(!explicit_markers) {
-    if (true) {
-      boost::scoped_ptr<lm::ngram::EnumerateVocab> vm;
-      vm.reset(new VMapper(&cdec2klm_map_));
+    {
+      VMapper vm(&cdec2klm_map_);
       lm::ngram::Config conf;
-      conf.enumerate_vocab = vm.get(); 
+      conf.enumerate_vocab = &vm;
       ngram_ = new Model(filename.c_str(), conf);
     }
     order_ = ngram_->Order();
-- 
cgit v1.2.3