From 1a4263219cfc355c18036a769eece14d88636d77 Mon Sep 17 00:00:00 2001
From: Jonathan Clark <jon.h.clark@gmail.com>
Date: Thu, 10 Mar 2011 17:09:21 -0500
Subject: initial version of scons

---
 decoder/Makefile.am  | 4 ++--
 decoder/ff_wordset.h | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'decoder')

diff --git a/decoder/Makefile.am b/decoder/Makefile.am
index 9cf4c3c4..e1dba497 100644
--- a/decoder/Makefile.am
+++ b/decoder/Makefile.am
@@ -26,7 +26,7 @@ hg_test_SOURCES = hg_test.cc
 hg_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz
 trule_test_SOURCES = trule_test.cc
 trule_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a -lz
-AM_CPPFLAGS = -W -Wall -Wno-sign-compare $(GTEST_CPPFLAGS) -I.. -I../mteval -I../utils -I../klm
+AM_CPPFLAGS = -W -Wno-sign-compare $(GTEST_CPPFLAGS) -I.. -I../mteval -I../utils -I../klm
 
 rule_lexer.cc: rule_lexer.l
 	$(LEX) -s -CF -8 -o$@ $<
@@ -82,5 +82,5 @@ libcdec_a_SOURCES = \
 
 if GLC
   # Until we build GLC as a library...
-  libcdec_a_SOURCES += ff_glc.cc
+  libcdec_a_SOURCES += ff_glc.cc string_util.cc feature-factory.cc
 endif
diff --git a/decoder/ff_wordset.h b/decoder/ff_wordset.h
index 256d54bb..00e1145b 100644
--- a/decoder/ff_wordset.h
+++ b/decoder/ff_wordset.h
@@ -13,13 +13,12 @@
 
 class WordSet : public FeatureFunction {
  public:
-
 // we depend on the order of the initializer list
 // to call member constructurs in the proper order
 // modify this carefully!
 //
 // Usage: "WordSet -v vocab.txt [--oov]"
-  WordSet(const std::string& param) {
+ WordSet(const std::string& param) {
     std::string vocabFile;
     std::string featName;
     parseArgs(param, &featName, &vocabFile, &oovMode_);
@@ -30,6 +29,9 @@ class WordSet : public FeatureFunction {
     loadVocab(vocabFile, &vocab_);
   }
 
+  ~WordSet() {
+  }
+
 
  protected:
   virtual void TraversalFeaturesImpl(const SentenceMetadata& smeta,
-- 
cgit v1.2.3