Updated OpenFST version to openfst-1.3.2-CL32004048 from Greco3.

Change-Id: I19b0db718256b35c0e3e5a7315f1ed6335e6dcac

2 files changed, 9 insertions, 5 deletions

diff --git a/src/script/fst-class.cc b/src/script/fst-class.cc
index a784b08..bf5d963 100644
--- a/src/script/fst-class.cc
+++ b/src/script/fst-class.cc
@@ -74,10 +74,14 @@ FstClass *FstClass::Read(const string &fname) {
     ifstream in(fname.c_str(), ifstream::in | ifstream::binary);
     return ReadFst<FstClass>(in, fname);
   } else {
-    return ReadFst<FstClass>(std::cin, "standard input");
+    return ReadFst<FstClass>(cin, "standard input");
   }
 }
 
+FstClass *FstClass::Read(istream &istr, const string &source) {
+  return ReadFst<FstClass>(istr, source);
+}
+
 //
 //  MUTABLE FST CLASS METHODS
 //
@@ -88,7 +92,7 @@ MutableFstClass *MutableFstClass::Read(const string &fname, bool convert) {
       ifstream in(fname.c_str(), ifstream::in | ifstream::binary);
       return ReadFst<MutableFstClass>(in, fname);
     } else {
-      return ReadFst<MutableFstClass>(std::cin, "standard input");
+      return ReadFst<MutableFstClass>(cin, "standard input");
     }
   } else {  // Converts to VectorFstClass if not mutable.
     FstClass *ifst = FstClass::Read(fname);
@@ -133,7 +137,7 @@ VectorFstClass *VectorFstClass::Read(const string &fname) {
     ifstream in(fname.c_str(), ifstream::in | ifstream::binary);
     return ReadFst<VectorFstClass>(in, fname);
   } else {
-    return ReadFst<VectorFstClass>(std::cin, "standard input");
+    return ReadFst<VectorFstClass>(cin, "standard input");
   }
 }
 
diff --git a/src/script/text-io.cc b/src/script/text-io.cc
index 2f5efab..65b4eed 100644
--- a/src/script/text-io.cc
+++ b/src/script/text-io.cc
@@ -67,7 +67,7 @@ bool ReadPotentials(const string &weight_type,
 // Writes vector of weights; returns true on success.
 bool WritePotentials(const string& filename,
                      const vector<WeightClass>& potential) {
-  ostream *strm = &std::cout;
+  ostream *strm = &cout;
   if (!filename.empty()) {
     strm = new ofstream(filename.c_str());
     if (!*strm) {
@@ -85,7 +85,7 @@ bool WritePotentials(const string& filename,
     LOG(ERROR) << "WritePotentials: Write failed: "
                << (filename.empty() ? "standard output" : filename);
   bool ret = *strm;
-  if (strm != &std::cout)
+  if (strm != &cout)
     delete strm;
   return ret;
 }