Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: client/settings.cc

Issue 1357833002: win: Get Crashpad compiling under VS2015 (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: include Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « client/crashpad_client_win.cc ('k') | compat/win/sys/types.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Crashpad Authors. All rights reserved. 1 // Copyright 2015 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "client/settings.h" 15 #include "client/settings.h"
16 16
17 #include <limits> 17 #include <limits>
18 18
19 #include "base/compiler_specific.h"
20 #include "base/logging.h" 19 #include "base/logging.h"
21 #include "base/posix/eintr_wrapper.h" 20 #include "base/posix/eintr_wrapper.h"
22 #include "util/numeric/in_range_cast.h" 21 #include "util/numeric/in_range_cast.h"
23 22
24 namespace crashpad { 23 namespace crashpad {
25 24
26 namespace internal { 25 namespace internal {
27 26
28 // static 27 // static
29 FileHandle ScopedLockedFileHandleTraits::InvalidValue() { 28 FileHandle ScopedLockedFileHandleTraits::InvalidValue() {
30 return kInvalidFileHandle; 29 return kInvalidFileHandle;
31 } 30 }
32 31
33 // static 32 // static
34 void ScopedLockedFileHandleTraits::Free(FileHandle handle) { 33 void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
35 if (handle != kInvalidFileHandle) { 34 if (handle != kInvalidFileHandle) {
36 LoggingUnlockFile(handle); 35 LoggingUnlockFile(handle);
37 CheckedCloseFile(handle); 36 CheckedCloseFile(handle);
38 } 37 }
39 } 38 }
40 39
41 } // namespace internal 40 } // namespace internal
42 41
43 struct ALIGNAS(4) Settings::Data { 42 struct Settings::Data {
44 static const uint32_t kSettingsMagic = 'CPds'; 43 static const uint32_t kSettingsMagic = 'CPds';
45 static const uint32_t kSettingsVersion = 1; 44 static const uint32_t kSettingsVersion = 1;
46 45
47 enum Options : uint32_t { 46 enum Options : uint32_t {
48 kUploadsEnabled = 1 << 0, 47 kUploadsEnabled = 1 << 0,
49 }; 48 };
50 49
51 Data() : magic(kSettingsMagic), 50 Data() : magic(kSettingsMagic),
52 version(kSettingsVersion), 51 version(kSettingsVersion),
53 options(0), 52 options(0),
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 253
255 bool Settings::InitializeSettings(FileHandle handle) { 254 bool Settings::InitializeSettings(FileHandle handle) {
256 Data settings; 255 Data settings;
257 if (!settings.client_id.InitializeWithNew()) 256 if (!settings.client_id.InitializeWithNew())
258 return false; 257 return false;
259 258
260 return WriteSettings(handle, settings); 259 return WriteSettings(handle, settings);
261 } 260 }
262 261
263 } // namespace crashpad 262 } // namespace crashpad
OLDNEW
« no previous file with comments | « client/crashpad_client_win.cc ('k') | compat/win/sys/types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698