diff options
| author | sammc <sammc@chromium.org> | 2015-07-01 18:25:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-02 01:25:35 +0000 |
| commit | 5648c8598f20bc9756a82cf90cee204db44ea269 (patch) | |
| tree | c64a9115d6d3dd5e79a6c92c4de1072ccd197316 /cloud_print/service | |
| parent | 984fbc18b3c734abdef6a36f547f5eb99a2143d4 (diff) | |
| download | chromium_src-5648c8598f20bc9756a82cf90cee204db44ea269.zip chromium_src-5648c8598f20bc9756a82cf90cee204db44ea269.tar.gz chromium_src-5648c8598f20bc9756a82cf90cee204db44ea269.tar.bz2 | |
clang/win: Fix warnings to prepare for building without -Wno-reorder.
This changes constructor initializer list ordering to match field
declaration ordering, except for gtest and breakpad, where the warning
is disabled.
BUG=505304
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1210013007
Cr-Commit-Position: refs/heads/master@{#337152}
Diffstat (limited to 'cloud_print/service')
| -rw-r--r-- | cloud_print/service/win/chrome_launcher.cc | 3 | ||||
| -rw-r--r-- | cloud_print/service/win/service.gyp | 6 | ||||
| -rw-r--r-- | cloud_print/service/win/setup_listener.cc | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc index e9bcee1..8c00556 100644 --- a/cloud_print/service/win/chrome_launcher.cc +++ b/cloud_print/service/win/chrome_launcher.cc @@ -173,8 +173,7 @@ void DeleteAutorunKeys(const base::FilePath& user_data_dir) { } // namespace ChromeLauncher::ChromeLauncher(const base::FilePath& user_data) - : stop_event_(true, true), - user_data_(user_data) { + : user_data_(user_data), stop_event_(true, true) { } ChromeLauncher::~ChromeLauncher() { diff --git a/cloud_print/service/win/service.gyp b/cloud_print/service/win/service.gyp index a00c5d3..e8ff624 100644 --- a/cloud_print/service/win/service.gyp +++ b/cloud_print/service/win/service.gyp @@ -93,6 +93,12 @@ }], ], }, + 'variables': { + 'clang_warning_flags': [ + # atlgdi.h fails with -Wreorder enabled. + '-Wno-reorder', + ] + }, }, { 'target_name': 'cloud_print_service_setup', diff --git a/cloud_print/service/win/setup_listener.cc b/cloud_print/service/win/setup_listener.cc index 57c3a15..67cb85b 100644 --- a/cloud_print/service/win/setup_listener.cc +++ b/cloud_print/service/win/setup_listener.cc @@ -27,10 +27,10 @@ const wchar_t SetupListener::kSetupPipeName[] = L"\\\\.\\pipe\\CloudPrintServiceSetup"; SetupListener::SetupListener(const base::string16& user) - : done_event_(new base::WaitableEvent(true, false)), - ipc_thread_(new base::Thread("ipc_thread")), + : is_xps_available_(false), succeded_(false), - is_xps_available_(false) { + done_event_(new base::WaitableEvent(true, false)), + ipc_thread_(new base::Thread("ipc_thread")) { ipc_thread_->StartWithOptions( base::Thread::Options(base::MessageLoop::TYPE_IO, 0)); ipc_thread_->message_loop()->PostTask( |