3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 22:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build break after 6d829e9af7d7630422d8095747905015d347b3be.

Browse Source 
../../handler/crash_report_upload_thread.cc:142:7: error: field 'database_' will be initialized after field 'thread_' [-Werror,-Wreorder]
      database_(database),
      ^
1 error generated.

And:

..\util\thread\worker_thread_test.cc(25) : warning C4244: 'initializing' : conversion from 'double' to 'const uint64_t', possible loss of data

BUG=crashpad:22
R=mark@chromium.org

Review URL: https://codereview.chromium.org/1556043005 .
This commit is contained in:
Robert Sesek 2016-01-04 17:42:04 -05:00
parent 6d829e9af7
commit 5e24471188
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
handler/crash_report_upload_thread.cc
View File

@ -139,12 +139,12 @@ class CallRecordUploadAttempt {
CrashReportUploadThread::CrashReportUploadThread(CrashReportDatabase* database, CrashReportUploadThread::CrashReportUploadThread(CrashReportDatabase* database,
const std::string& url) const std::string& url)
: url_(url), : url_(url),
database_(database),
// Check for pending reports every 15 minutes, even in the absence of a // Check for pending reports every 15 minutes, even in the absence of a
// signal from the handler thread. This allows for failed uploads to be // signal from the handler thread. This allows for failed uploads to be
// retried periodically, and for pending reports written by other // retried periodically, and for pending reports written by other
// processes to be recognized. // processes to be recognized.
thread_(15 * 60, this) { thread_(15 * 60, this),
database_(database) {
} }
CrashReportUploadThread::~CrashReportUploadThread() { CrashReportUploadThread::~CrashReportUploadThread() {

2
util/thread/worker_thread_test.cc
View File

@ -22,7 +22,7 @@ namespace crashpad {
namespace test { namespace test {
namespace { namespace {
const uint64_t kNanosecondsPerSecond = 1E9; const uint64_t kNanosecondsPerSecond = static_cast<uint64_t>(1E9);
class WorkDelegate : public WorkerThread::Delegate { class WorkDelegate : public WorkerThread::Delegate {
public: public: