3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-20 18:53:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

win: Disable more warnings when not building with Crashpad's common.gypi

Browse Source 
Roll mini_chromium deps to remove disabling of those warnings in common.gypi:
  8e12d3d win: Remove disabling some warnings

R=mark@chromium.org
BUG=chromium:546288, crashpad:1

Review URL: https://codereview.chromium.org/1430523002 .
This commit is contained in:
Scott Graham 2015-10-27 16:03:26 -07:00
parent a96f5ace5b
commit ba0e7de07b
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -28,7 +28,7 @@ deps = {
'01528c7244837168a1c80f06ff60fa5a9793c824', '01528c7244837168a1c80f06ff60fa5a9793c824',
'crashpad/third_party/mini_chromium/mini_chromium': 'crashpad/third_party/mini_chromium/mini_chromium':
Var('chromium_git') + '/chromium/mini_chromium@' + Var('chromium_git') + '/chromium/mini_chromium@' +
'8d42e2439aa0bd677dca64ba3070f3fa2353b7f2', '8e12d3df2f1c0fcd84d649f4619323558db63a85',
} }
hooks = [ hooks = [

6
build/crashpad.gypi
View File

@ -20,4 +20,10 @@
# build, this variable has no effect. # build, this variable has no effect.
'chromium_code': 1, 'chromium_code': 1,
}, },
'target_defaults': {
'msvs_disabled_warnings': [
4201, # nonstandard extension used : nameless struct/union.
4324, # structure was padded due to __declspec(align()).
],
},
} }

6
client/simple_string_dictionary_test.cc
View File

@ -172,8 +172,10 @@ TEST(SimpleStringDictionary, Iterator) {
int totalCount = 0; int totalCount = 0;
const SimpleStringDictionary::Entry* entry; for (;;) {
while ((entry = iter.Next())) { const SimpleStringDictionary::Entry* entry = iter.Next();
if (!entry)
break;
totalCount++; totalCount++;
// Extract keyNumber from a string of the form key<keyNumber> // Extract keyNumber from a string of the form key<keyNumber>

7
snapshot/win/process_reader_win.cc
View File

@ -86,10 +86,13 @@ process_types::SYSTEM_PROCESS_INFORMATION<Traits>* GetProcessInformation(
reinterpret_cast<process_types::SYSTEM_PROCESS_INFORMATION<Traits>*>( reinterpret_cast<process_types::SYSTEM_PROCESS_INFORMATION<Traits>*>(
buffer->get()); buffer->get());
DWORD process_id = GetProcessId(process_handle); DWORD process_id = GetProcessId(process_handle);
do { for (;;) {
if (process->UniqueProcessId == process_id) if (process->UniqueProcessId == process_id)
return process; return process;
} while (process = NextProcess(process)); process = NextProcess(process);
if (!process)
break;
}
LOG(ERROR) << "process " << process_id << " not found"; LOG(ERROR) << "process " << process_id << " not found";
return nullptr; return nullptr;