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 | 1c733723583862a5fcee5352433022008a9dc4e0 (patch) | |
| tree | d4f9a17498d6bc9210e0e3cebbcfc3635736b669 /gi/pf | |
| parent | d3aa71d1095a5c45c1d3ca3155259e5fe0b58df2 (diff) | |
| parent | 44508c1ad1bf88b1568713317b4a1e0be78804f8 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
Makefile.am
configure.ac
Diffstat (limited to 'gi/pf')
| -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(); |