diff options
| author | Jonathan Clark <jon.h.clark@gmail.com> | 2011-03-10 06:54:59 -0500 |
|---|---|---|
| committer | Jonathan Clark <jon.h.clark@gmail.com> | 2011-03-10 06:54:59 -0500 |
| commit | 7491d7f72bd50cbc08a28f64cc3939a310d65801 (patch) | |
| tree | fe18c5bc6ca1e0bf18f0ca473833162ecd3a908b /decoder/bottom_up_parser.cc | |
| parent | 8c8ff6c6915ebc5ce30156e3f05bf8d1966ec0a1 (diff) | |
| parent | 4f9933d668d247ea5831c3f2af0b996a94da28f7 (diff) | |
Merge branch 'master' of git://github.com/redpony/cdec
Diffstat (limited to 'decoder/bottom_up_parser.cc')
| -rw-r--r-- | decoder/bottom_up_parser.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/decoder/bottom_up_parser.cc b/decoder/bottom_up_parser.cc index e3751e23..63939221 100644 --- a/decoder/bottom_up_parser.cc +++ b/decoder/bottom_up_parser.cc @@ -221,7 +221,7 @@ void PassiveChart::ApplyUnaryRules(const int i, const int j) { bool PassiveChart::Parse() { size_t in_size_2 = input_.size() * input_.size(); forest_->nodes_.reserve(in_size_2 * 2); - size_t res = min(2000000ul, in_size_2 * 1000); + size_t res = min(static_cast<size_t>(2000000), static_cast<size_t>(in_size_2 * 1000)); forest_->edges_.reserve(res); goal_idx_ = -1; for (int gi = 0; gi < grammars_.size(); ++gi) |