diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-28 23:04:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-28 23:04:55 +0000 |
| commit | 8716b70bb7a580dd667247add717ff0b6ac2c5fe (patch) | |
| tree | 9d5de85848329c642530920d2f4d4f78b486c564 /tools/thirdparty/OpenFst/fst/lib/encode.h | |
| parent | f644e7f5def7f31790f38e00658664d2b5606f01 (diff) | |
| parent | 73018b4a1d088cdda0e7bd059fddf1f308a8195a (diff) | |
| download | srec-8716b70bb7a580dd667247add717ff0b6ac2c5fe.tar.gz | |
Merge "Fix 64-bit issues and compiler warnings."
Diffstat (limited to 'tools/thirdparty/OpenFst/fst/lib/encode.h')
| -rw-r--r-- | tools/thirdparty/OpenFst/fst/lib/encode.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/thirdparty/OpenFst/fst/lib/encode.h b/tools/thirdparty/OpenFst/fst/lib/encode.h index 882cdd0..b577d4a 100644 --- a/tools/thirdparty/OpenFst/fst/lib/encode.h +++ b/tools/thirdparty/OpenFst/fst/lib/encode.h @@ -93,10 +93,7 @@ template <class A> class EncodeTable { int32 encode_flags_; }; - typedef hash_map<const Tuple*, - Label, - TupleKey, - TupleEqual> EncodeHash; + typedef std::unordered_map<const Tuple*, Label, TupleKey, TupleEqual> EncodeHash; explicit EncodeTable(uint32 encode_flags) : flags_(encode_flags), @@ -174,7 +171,7 @@ template <class A> class EncodeTable { return strm; } - const uint32 flags() const { return flags_; } + uint32 flags() const { return flags_; } private: uint32 flags_; vector<Tuple*> encode_tuples_; @@ -271,8 +268,8 @@ template <class A> class EncodeMapper { MAP_REQUIRE_SUPERFINAL : MAP_NO_SUPERFINAL; } - const uint32 flags() const { return flags_; } - const EncodeType type() const { return type_; } + uint32 flags() const { return flags_; } + EncodeType type() const { return type_; } bool Write(ostream &strm, const string& source) { return table_->Write(strm, source); |