diff options
Diffstat (limited to 'math/openfst/patches/patch-src_include_fst_replace.h')
-rw-r--r-- | math/openfst/patches/patch-src_include_fst_replace.h | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/math/openfst/patches/patch-src_include_fst_replace.h b/math/openfst/patches/patch-src_include_fst_replace.h deleted file mode 100644 index 2c42f8ee40c..00000000000 --- a/math/openfst/patches/patch-src_include_fst_replace.h +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-src_include_fst_replace.h,v 1.2 2013/05/06 14:52:54 joerg Exp $ - ---- src/include/fst/replace.h.orig 2009-03-21 03:35:34.000000000 +0000 -+++ src/include/fst/replace.h -@@ -21,8 +21,15 @@ - #ifndef FST_LIB_REPLACE_H__ - #define FST_LIB_REPLACE_H__ - -+#include <ciso646> -+ -+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L -+#include <unordered_map> -+using std::unordered_map; -+#else - #include <tr1/unordered_map> - using std::tr1::unordered_map; -+#endif - #include <string> - #include <utility> - #include <vector> -@@ -424,16 +431,16 @@ class ReplaceFstImpl : public CacheImpl< - - // return final weight of state (kInfWeight means state is not final) - Weight Final(StateId s) { -- if (!HasFinal(s)) { -+ if (!this->HasFinal(s)) { - const StateTuple& tuple = state_table_->Tuple(s); - const StackPrefix& stack = stackprefix_array_[tuple.prefix_id]; - const Fst<A>* fst = fst_array_[tuple.fst_id]; - StateId fst_state = tuple.fst_state; - - if (fst->Final(fst_state) != Weight::Zero() && stack.Depth() == 0) -- SetFinal(s, fst->Final(fst_state)); -+ this->SetFinal(s, fst->Final(fst_state)); - else -- SetFinal(s, Weight::Zero()); -+ this->SetFinal(s, Weight::Zero()); - } - return CacheImpl<A>::Final(s); - } -@@ -471,7 +478,7 @@ class ReplaceFstImpl : public CacheImpl< - const Fst<A>* fst = fst_array_[tuple.fst_id]; - StateId fst_state = tuple.fst_state; - if (fst_state == kNoStateId) { -- SetArcs(s); -+ this->SetArcs(s); - return; - } - -@@ -483,7 +490,7 @@ class ReplaceFstImpl : public CacheImpl< - - StateId nextstate = state_table_->FindState( - StateTuple(prefix_id, top.fst_id, top.nextstate)); -- AddArc(s, A(0, 0, fst->Final(fst_state), nextstate)); -+ this->AddArc(s, A(0, 0, fst->Final(fst_state), nextstate)); - } - - // extend arcs leaving the state -@@ -493,7 +500,7 @@ class ReplaceFstImpl : public CacheImpl< - if (arc.olabel == 0) { // expand local fst - StateId nextstate = state_table_->FindState( - StateTuple(tuple.prefix_id, tuple.fst_id, arc.nextstate)); -- AddArc(s, A(arc.ilabel, arc.olabel, arc.weight, nextstate)); -+ this->AddArc(s, A(arc.ilabel, arc.olabel, arc.weight, nextstate)); - } else { - // check for non terminal - typename NonTerminalHash::const_iterator it = -@@ -511,17 +518,17 @@ class ReplaceFstImpl : public CacheImpl< - StateId nt_nextstate = state_table_->FindState( - StateTuple(nt_prefix, nonterminal, nt_start)); - Label ilabel = (epsilon_on_replace_) ? 0 : arc.ilabel; -- AddArc(s, A(ilabel, 0, arc.weight, nt_nextstate)); -+ this->AddArc(s, A(ilabel, 0, arc.weight, nt_nextstate)); - } - } else { - StateId nextstate = state_table_->FindState( - StateTuple(tuple.prefix_id, tuple.fst_id, arc.nextstate)); -- AddArc(s, A(arc.ilabel, arc.olabel, arc.weight, nextstate)); -+ this->AddArc(s, A(arc.ilabel, arc.olabel, arc.weight, nextstate)); - } - } - } - -- SetArcs(s); -+ this->SetArcs(s); - } - - |