diff options
| author | Patrick Simianer <p@simianer.de> | 2012-04-23 21:44:02 +0200 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2012-04-23 21:44:02 +0200 |
| commit | 2f427278616cbe3fa6f56d6b97c40b3894dbd950 (patch) | |
| tree | 6998435e4677437c474cf0f835ce9f72d70d3945 /gi | |
| parent | 6d0d0eb6bbfaee6b6998659a55e2195977ccd217 (diff) | |
| parent | 217c4aaeba1c9f19b3420b526235bffd86c7a92b (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
Makefile.am
configure.ac
Diffstat (limited to 'gi')
| -rw-r--r-- | gi/pf/base_distributions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gi/pf/base_distributions.h b/gi/pf/base_distributions.h index 84dacdf2..41b513f8 100644 --- a/gi/pf/base_distributions.h +++ b/gi/pf/base_distributions.h @@ -89,7 +89,7 @@ struct TableLookupBase { TableLookupBase(const std::string& fname); prob_t operator()(const TRule& rule) const { - const std::tr1::unordered_map<TRule,prob_t>::const_iterator it = table.find(rule); + const std::tr1::unordered_map<TRule,prob_t,RuleHasher>::const_iterator it = table.find(rule); if (it == table.end()) { std::cerr << rule << " not found\n"; abort(); |