diff options
author | David 'Digit' Turner <digit@google.com> | 2014-03-27 17:23:17 +0100 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2014-04-01 10:22:22 +0200 |
commit | 3d3ebb75c82c4d8c66d9c2029dac16a1d4758dd2 (patch) | |
tree | 99ffd8b7e5ca999624bd285fa2cbddfbd3bf6e6f /emulator/opengl/shared | |
parent | d06559227bc6071c96572334d2a2e3f6eb4de96d (diff) | |
download | sdk-3d3ebb75c82c4d8c66d9c2029dac16a1d4758dd2.zip sdk-3d3ebb75c82c4d8c66d9c2029dac16a1d4758dd2.tar.gz sdk-3d3ebb75c82c4d8c66d9c2029dac16a1d4758dd2.tar.bz2 |
emulator/opengl: Fix misc. compiler warnings.
These warnings appear when building the sources through the emulator's
standalone build system, not the platform one.
Change-Id: Ib5d51cf6211f32763be00c7436ae14c06f76b436
Diffstat (limited to 'emulator/opengl/shared')
5 files changed, 1 insertions, 7 deletions
diff --git a/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp b/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp index db7f418..59f7b97 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp +++ b/emulator/opengl/shared/OpenglCodecCommon/GLSharedGroup.cpp @@ -258,7 +258,7 @@ GLenum GLSharedGroup::subUpdateBufferData(GLuint bufferId, GLintptr offset, GLsi void GLSharedGroup::deleteBufferData(GLuint bufferId) { emugl::Mutex::AutoLock _lock(m_lock); - ssize_t idx = m_buffers.remove(bufferId); + (void) m_buffers.remove(bufferId); } void GLSharedGroup::addProgramData(GLuint program) diff --git a/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp b/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp index 3ef4c6f..726d359 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp +++ b/emulator/opengl/shared/OpenglCodecCommon/SocketStream.cpp @@ -112,7 +112,6 @@ int SocketStream::writeFully(const void* buffer, size_t size) const unsigned char *SocketStream::readFully(void *buf, size_t len) { - const unsigned char* ret = NULL; if (!valid()) return NULL; if (!buf) { return NULL; // do not allow NULL buf in that implementation diff --git a/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp b/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp index 76907a0..dcfb0c0 100644 --- a/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp +++ b/emulator/opengl/shared/OpenglCodecCommon/Win32PipeStream.cpp @@ -193,8 +193,6 @@ int Win32PipeStream::commitBuffer(size_t size) const unsigned char *Win32PipeStream::readFully(void *buf, size_t len) { - const unsigned char* ret = NULL; - if (m_pipe == INVALID_HANDLE_VALUE) return NULL; diff --git a/emulator/opengl/shared/emugl/common/pod_vector.cpp b/emulator/opengl/shared/emugl/common/pod_vector.cpp index 3fe8f15..c8ec3a6 100644 --- a/emulator/opengl/shared/emugl/common/pod_vector.cpp +++ b/emulator/opengl/shared/emugl/common/pod_vector.cpp @@ -90,7 +90,6 @@ void PodVectorBase::resize(size_t newSize, size_t itemSize) { } void PodVectorBase::reserve(size_t newSize, size_t itemSize) { - const size_t kMaxSize = maxItemCapacity(itemSize); if (newSize == 0) { ::free(mBegin); mBegin = NULL; diff --git a/emulator/opengl/shared/emugl/common/pod_vector.h b/emulator/opengl/shared/emugl/common/pod_vector.h index 22a8a1d..c4e184b 100644 --- a/emulator/opengl/shared/emugl/common/pod_vector.h +++ b/emulator/opengl/shared/emugl/common/pod_vector.h @@ -73,12 +73,10 @@ protected: const void* end() const { return mEnd; } void* itemAt(size_t pos, size_t itemSize) { - const size_t kMaxCapacity = SIZE_MAX / itemSize; return mBegin + pos * itemSize; } const void* itemAt(size_t pos, size_t itemSize) const { - const size_t kMaxCapacity = SIZE_MAX / itemSize; return mBegin + pos * itemSize; } |