diff options
| author | msneck@google.com <msneck@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 20:04:59 +0000 |
|---|---|---|
| committer | msneck@google.com <msneck@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 20:04:59 +0000 |
| commit | 42af38a25b076918102de7d21c0876015f8d01be (patch) | |
| tree | 1b84f6cf24bb3d9712441d5379f1764a38b42b98 /gpu | |
| parent | 3aa84f05074c168c80629f7c923aa9e34dbc0333 (diff) | |
| download | chromium_src-42af38a25b076918102de7d21c0876015f8d01be.zip chromium_src-42af38a25b076918102de7d21c0876015f8d01be.tar.gz chromium_src-42af38a25b076918102de7d21c0876015f8d01be.tar.bz2 | |
Fix two problems with int32 <-> int32_t conversion when compiled in -pedantic
mode inside Native Client.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2834023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50760 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/pgl/command_buffer_pepper.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/pgl/command_buffer_pepper.cc b/gpu/pgl/command_buffer_pepper.cc index 53d67d2..323dc89 100644 --- a/gpu/pgl/command_buffer_pepper.cc +++ b/gpu/pgl/command_buffer_pepper.cc @@ -131,11 +131,11 @@ void CommandBufferPepper::SetGetOffset(int32 get_offset) { } int32 CommandBufferPepper::CreateTransferBuffer(size_t size) { - int32 id; + int32_t id; if (NPERR_NO_ERROR != device_->createBuffer(npp_, context_, size, &id)) return -1; - return id; + return static_cast<int32>(id); } void CommandBufferPepper::DestroyTransferBuffer(int32 id) { @@ -165,7 +165,7 @@ void CommandBufferPepper::SetParseError( } gpu::error::Error CommandBufferPepper::GetCachedError() { - int32 attrib_list[] = { + int32_t attrib_list[] = { NPAttrib_Error, 0, NPAttrib_End }; |