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 /base/memory/shared_memory_win.cc | |
| 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 'base/memory/shared_memory_win.cc')
| -rw-r--r-- | base/memory/shared_memory_win.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/base/memory/shared_memory_win.cc b/base/memory/shared_memory_win.cc index f58116a..5f706fe 100644 --- a/base/memory/shared_memory_win.cc +++ b/base/memory/shared_memory_win.cc @@ -29,37 +29,37 @@ namespace base { SharedMemory::SharedMemory() : mapped_file_(NULL), + mapped_size_(0), memory_(NULL), read_only_(false), - mapped_size_(0), requested_size_(0) { } SharedMemory::SharedMemory(const std::wstring& name) - : mapped_file_(NULL), + : name_(name), + mapped_file_(NULL), + mapped_size_(0), memory_(NULL), read_only_(false), - requested_size_(0), - mapped_size_(0), - name_(name) { + requested_size_(0) { } SharedMemory::SharedMemory(const SharedMemoryHandle& handle, bool read_only) : mapped_file_(handle), + mapped_size_(0), memory_(NULL), read_only_(read_only), - requested_size_(0), - mapped_size_(0) { + requested_size_(0) { } SharedMemory::SharedMemory(const SharedMemoryHandle& handle, bool read_only, ProcessHandle process) : mapped_file_(NULL), + mapped_size_(0), memory_(NULL), read_only_(read_only), - requested_size_(0), - mapped_size_(0) { + requested_size_(0) { ::DuplicateHandle(process, handle, GetCurrentProcess(), &mapped_file_, read_only_ ? FILE_MAP_READ : FILE_MAP_READ | |