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

Side by Side Diff: snapshot/mac/mach_o_image_annotations_reader.cc

Issue 1566713002: Use base/macros.h instead of base/basictypes.h (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: Windows #incldue → #include Created 4 years, 11 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
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 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 "snapshot/mac/mach_o_image_annotations_reader.h" 15 #include "snapshot/mac/mach_o_image_annotations_reader.h"
16 16
17 #include <mach-o/loader.h> 17 #include <mach-o/loader.h>
18 #include <mach/mach.h> 18 #include <mach/mach.h>
19 #include <sys/types.h>
19 20
20 #include <utility> 21 #include <utility>
21 22
22 #include "base/logging.h" 23 #include "base/logging.h"
23 #include "client/crashpad_info.h" 24 #include "client/crashpad_info.h"
24 #include "client/simple_string_dictionary.h" 25 #include "client/simple_string_dictionary.h"
25 #include "snapshot/mac/mach_o_image_reader.h" 26 #include "snapshot/mac/mach_o_image_reader.h"
26 #include "snapshot/mac/process_reader.h" 27 #include "snapshot/mac/process_reader.h"
27 #include "util/mach/task_memory.h" 28 #include "util/mach/task_memory.h"
28 #include "util/stdlib/strnlen.h" 29 #include "util/stdlib/strnlen.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 std::string key(entry.key, key_length); 167 std::string key(entry.key, key_length);
167 std::string value(entry.value, strnlen(entry.value, sizeof(entry.value))); 168 std::string value(entry.value, strnlen(entry.value, sizeof(entry.value)));
168 if (!simple_map_annotations->insert(std::make_pair(key, value)).second) { 169 if (!simple_map_annotations->insert(std::make_pair(key, value)).second) {
169 LOG(INFO) << "duplicate simple annotation " << key << " in " << name_; 170 LOG(INFO) << "duplicate simple annotation " << key << " in " << name_;
170 } 171 }
171 } 172 }
172 } 173 }
173 } 174 }
174 175
175 } // namespace crashpad 176 } // namespace crashpad
OLDNEW
« no previous file with comments | « snapshot/mac/mach_o_image_annotations_reader.h ('k') | snapshot/mac/mach_o_image_annotations_reader_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698