zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clang/win: Fix -Wextra warnings in webrtc.

Browse Source 
Fixes one sign mismatch warning, and one "const has no effect and is
ignored" warning.

BUG=chromium:567877

Review URL: https://codereview.webrtc.org/1510233002

Cr-Commit-Position: refs/heads/master@{#10976}
This commit is contained in:
thakis
2015-12-10 10:50:28 -08:00
committed by Commit bot
parent 5c1def8892
commit 61a90f94b6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/base/sec_buffer.h
View File

@ -119,7 +119,7 @@ class CSecBufferBundle : public SecBufferBundleBase {
} }
// Accessor for the descriptor // Accessor for the descriptor
const PSecBufferDesc desc() const { PSecBufferDesc desc() const {
return &desc_; return &desc_;
} }

2
webrtc/base/systeminfo.cc
View File

@ -110,7 +110,7 @@ int SystemInfo::GetCurCpus() {
DWORD_PTR process_mask = 0; DWORD_PTR process_mask = 0;
DWORD_PTR system_mask = 0; DWORD_PTR system_mask = 0;
::GetProcessAffinityMask(::GetCurrentProcess(), &process_mask, &system_mask); ::GetProcessAffinityMask(::GetCurrentProcess(), &process_mask, &system_mask);
for (int i = 0; i < sizeof(DWORD_PTR) * 8; ++i) { for (size_t i = 0; i < sizeof(DWORD_PTR) * 8; ++i) {
if (process_mask & 1) if (process_mask & 1)
++cur_cpus; ++cur_cpus;
process_mask >>= 1; process_mask >>= 1;

6
webrtc/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
View File

@ -236,7 +236,7 @@ BOOL ScreenCapturerWinMagnifier::OnMagImageScalingCallback(
RECT unclipped, RECT unclipped,
RECT clipped, RECT clipped,
HRGN dirty) { HRGN dirty) {
assert(tls_index_.Value() != TLS_OUT_OF_INDEXES); assert(tls_index_.Value() != static_cast<int32_t>(TLS_OUT_OF_INDEXES));
ScreenCapturerWinMagnifier* owner = ScreenCapturerWinMagnifier* owner =
reinterpret_cast<ScreenCapturerWinMagnifier*>( reinterpret_cast<ScreenCapturerWinMagnifier*>(
@ -369,7 +369,7 @@ bool ScreenCapturerWinMagnifier::InitializeMagnifier() {
} }
} }
if (tls_index_.Value() == TLS_OUT_OF_INDEXES) { if (tls_index_.Value() == static_cast<int32_t>(TLS_OUT_OF_INDEXES)) {
// More than one threads may get here at the same time, but only one will // More than one threads may get here at the same time, but only one will
// write to tls_index_ using CompareExchange. // write to tls_index_ using CompareExchange.
DWORD new_tls_index = TlsAlloc(); DWORD new_tls_index = TlsAlloc();
@ -377,7 +377,7 @@ bool ScreenCapturerWinMagnifier::InitializeMagnifier() {
TlsFree(new_tls_index); TlsFree(new_tls_index);
} }
assert(tls_index_.Value() != TLS_OUT_OF_INDEXES); assert(tls_index_.Value() != static_cast<int32_t>(TLS_OUT_OF_INDEXES));
TlsSetValue(tls_index_.Value(), this); TlsSetValue(tls_index_.Value(), this);
magnifier_initialized_ = true; magnifier_initialized_ = true;