Merge remote-tracking branch 'upstream/master'

1 files changed, 3 insertions, 3 deletions

diff --git a/extools/featurize_grammar.cc b/extools/featurize_grammar.cc
index ebae9fdc..78175202 100644
--- a/extools/featurize_grammar.cc
+++ b/extools/featurize_grammar.cc
@@ -136,8 +136,8 @@ class FERegistry {
  public:
   FERegistry() {}
   boost::shared_ptr<FeatureExtractor> Create(const std::string& ffname) const {
-    map<string, shared_ptr<FEFactoryBase> >::const_iterator it = reg_.find(ffname);
-    shared_ptr<FeatureExtractor> res;
+    map<string, boost::shared_ptr<FEFactoryBase> >::const_iterator it = reg_.find(ffname);
+    boost::shared_ptr<FeatureExtractor> res;
     if (it == reg_.end()) {
       cerr << "I don't know how to create feature " << ffname << endl;
     } else {
@@ -147,7 +147,7 @@ class FERegistry {
   }
   void DisplayList(ostream* out) const {
     bool first = true;
-    for (map<string, shared_ptr<FEFactoryBase> >::const_iterator it = reg_.begin();
+    for (map<string, boost::shared_ptr<FEFactoryBase> >::const_iterator it = reg_.begin();
         it != reg_.end(); ++it) {
       if (first) {first=false;} else {*out << ' ';}
       *out << it->first;