diff options
author | redpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f> | 2010-07-26 18:41:17 +0000 |
---|---|---|
committer | redpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f> | 2010-07-26 18:41:17 +0000 |
commit | 18937ade50a25db677f10c8250c8815d539d0bb5 (patch) | |
tree | 30ceb1d80ace19cbd1d4a591294b790d2cd8881f | |
parent | 1924a35f48e1dba8557f9424c50f40e0c2d0235c (diff) |
fix name collision
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@423 ec762483-ff6d-05da-a07a-a48fb63a330f
-rw-r--r-- | decoder/hg.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/decoder/hg.h b/decoder/hg.h index b0785d33..6660a1f5 100644 --- a/decoder/hg.h +++ b/decoder/hg.h @@ -169,21 +169,21 @@ public: hg), and replace the list-of-edges viterbi.h with a tree-structured one. CreateViterbiHypergraph can do for 1best, though. */ - template <class EdgeRecurse,class EdgeHandle> - std::string derivation_tree(EdgeRecurse const& re,EdgeHandle const& eh,bool indent=true,int show_mask=SPAN|RULE,int maxdepth=0x7FFFFFFF,int depth=0) const { + template <class EdgeRecurse,class TEdgeHandle> + std::string derivation_tree(EdgeRecurse const& re,TEdgeHandle const& eh,bool indent=true,int show_mask=SPAN|RULE,int maxdepth=0x7FFFFFFF,int depth=0) const { std::ostringstream o; derivation_tree_stream(re,eh,o,indent,show_mask,maxdepth,depth); return o.str(); } - template <class EdgeRecurse,class EdgeHandle> - void derivation_tree_stream(EdgeRecurse const& re,EdgeHandle const& eh,std::ostream &o,bool indent=true,int show_mask=SPAN|RULE,int maxdepth=0x7FFFFFFF,int depth=0) const { + template <class EdgeRecurse,class TEdgeHandle> + void derivation_tree_stream(EdgeRecurse const& re,TEdgeHandle const& eh,std::ostream &o,bool indent=true,int show_mask=SPAN|RULE,int maxdepth=0x7FFFFFFF,int depth=0) const { if (depth>maxdepth) return; if (indent) for (int i=0;i<depth;++i) o<<' '; o<<'('; show(o,show_mask); if (indent) o<<'\n'; for (int i=0;i<tail_nodes_.size();++i) { - EdgeHandle c=re(tail_nodes_[i],i,eh); + TEdgeHandle c=re(tail_nodes_[i],i,eh); Edge const* cp=c; if (cp) { cp->derivation_tree_stream(re,c,o,indent,show_mask,maxdepth,depth+1); |