diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 01:03:43 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 01:03:43 +0000 |
| commit | 104a608acbf0fe57728f95d21c59ed25f61b0482 (patch) | |
| tree | f62f6ce78a3379b043e0ff71cfccef0baa46d98f /courgette/assembly_program.cc | |
| parent | c840d52c54743d3353e90136fe17b8c697083d25 (diff) | |
| download | chromium_src-104a608acbf0fe57728f95d21c59ed25f61b0482.zip chromium_src-104a608acbf0fe57728f95d21c59ed25f61b0482.tar.gz chromium_src-104a608acbf0fe57728f95d21c59ed25f61b0482.tar.bz2 | |
Also build a 64-bit exe version of the 32-bit courgette
utility + library to support larger input sizes.
BUG=63793
TEST=None
Review URL: http://codereview.chromium.org/5096007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'courgette/assembly_program.cc')
| -rw-r--r-- | courgette/assembly_program.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/courgette/assembly_program.cc b/courgette/assembly_program.cc index e160d767..345ca89 100644 --- a/courgette/assembly_program.cc +++ b/courgette/assembly_program.cc @@ -228,10 +228,10 @@ void AssemblyProgram::AssignRemainingIndexes(RVAToLabel* labels) { for (RVAToLabel::iterator p = labels->begin(); p != labels->end(); ++p) { Label* current = p->second; if (current->index_ == Label::kNoIndex) { - size_t index = 0; + int index = 0; if (prev && prev->index_ != Label::kNoIndex) index = prev->index_ + 1; - if (index < available.size() && available.at(index)) { + if (index < static_cast<int>(available.size()) && available.at(index)) { current->index_ = index; available.at(index) = false; ++fill_forward_count; @@ -254,7 +254,7 @@ void AssemblyProgram::AssignRemainingIndexes(RVAToLabel* labels) { if (prev) prev_index = prev->index_; else - prev_index = available.size(); + prev_index = static_cast<uint32>(available.size()); if (prev_index != 0 && prev_index != Label::kNoIndex && available.at(prev_index - 1)) { |