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/replace.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/replace.h')
| -rw-r--r-- | tools/thirdparty/OpenFst/fst/lib/replace.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/thirdparty/OpenFst/fst/lib/replace.h b/tools/thirdparty/OpenFst/fst/lib/replace.h index 4b8622e..2c7d1f7 100644 --- a/tools/thirdparty/OpenFst/fst/lib/replace.h +++ b/tools/thirdparty/OpenFst/fst/lib/replace.h @@ -20,8 +20,7 @@ #ifndef FST_LIB_REPLACE_H__ #define FST_LIB_REPLACE_H__ -#include <ext/hash_map> -using __gnu_cxx::hash_map; +#include <unordered_map> #include "fst/lib/fst.h" #include "fst/lib/cache.h" @@ -75,7 +74,7 @@ class ReplaceFstImpl : public CacheImpl<A> { typedef typename A::StateId StateId; typedef CacheState<A> State; typedef A Arc; - typedef hash_map<Label, Label> NonTerminalHash; + typedef std::unordered_map<Label, Label> NonTerminalHash; // \struct StateTuple @@ -379,7 +378,7 @@ class ReplaceFstImpl : public CacheImpl<A> { } }; - typedef hash_map<StateTuple, StateId, StateTupleKey, StateTupleEqual> + typedef std::unordered_map<StateTuple, StateId, StateTupleKey, StateTupleEqual> StateTupleHash; // \class PrefixTuple @@ -451,7 +450,7 @@ class ReplaceFstImpl : public CacheImpl<A> { } }; - typedef hash_map<StackPrefix, int, StackPrefixKey, StackPrefixEqual> + typedef std::unordered_map<StackPrefix, int, StackPrefixKey, StackPrefixEqual> StackPrefixHash; // private methods |