diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 22:16:40 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-17 22:16:40 +0000 |
| commit | b52e6b30f13514f414c6658adf91632531e505ee (patch) | |
| tree | 07f4ec00304c1f6b012badca304692559bb8a682 /o3d/command_buffer/service | |
| parent | b5218f50e208870f66058afc00dca77356447389 (diff) | |
| download | chromium_src-b52e6b30f13514f414c6658adf91632531e505ee.zip chromium_src-b52e6b30f13514f414c6658adf91632531e505ee.tar.gz chromium_src-b52e6b30f13514f414c6658adf91632531e505ee.tar.bz2 | |
This updates the DEPS for V8, Chrome and NaCl.
It also fixes two other minor problems:
a signed/unsigned mismatch in the gapi_decoder,
and a switch from sys.argv[0] to __file__ in codegen.py.
Review URL: http://codereview.chromium.org/208015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/command_buffer/service')
| -rw-r--r-- | o3d/command_buffer/service/cross/gapi_decoder.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/o3d/command_buffer/service/cross/gapi_decoder.cc b/o3d/command_buffer/service/cross/gapi_decoder.cc index 47a3418..aa9f019 100644 --- a/o3d/command_buffer/service/cross/gapi_decoder.cc +++ b/o3d/command_buffer/service/cross/gapi_decoder.cc @@ -86,8 +86,9 @@ BufferSyncInterface::ParseError GAPIDecoder::DoCommand( const void* args) { if (command < arraysize(g_command_info)) { const CommandInfo& info = g_command_info[command]; - if ((info.arg_flags == cmd::kFixed && arg_count == info.arg_count) || - (info.arg_flags == cmd::kAtLeastN && arg_count > info.arg_count)) { + unsigned int info_arg_count = static_cast<unsigned int>(info.arg_count); + if ((info.arg_flags == cmd::kFixed && arg_count == info_arg_count) || + (info.arg_flags == cmd::kAtLeastN && arg_count > info_arg_count)) { switch (command) { #define O3D_COMMAND_BUFFER_CMD_OP(name) \ case cmd::name::kCmdId: \ |