OLD | NEW |
---|---|
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, |
(...skipping 26 matching lines...) Expand all Loading... | |
37 | 37 |
38 CrashpadInfo(); | 38 CrashpadInfo(); |
39 | 39 |
40 void set_simple_annotations(SimpleStringDictionary* simple_annotations) { | 40 void set_simple_annotations(SimpleStringDictionary* simple_annotations) { |
41 simple_annotations_ = simple_annotations; | 41 simple_annotations_ = simple_annotations; |
42 } | 42 } |
43 | 43 |
44 static const uint32_t kSignature = 'CPad'; | 44 static const uint32_t kSignature = 'CPad'; |
45 | 45 |
46 private: | 46 private: |
47 // The compiler won’t necessarily see anyone using these fields, but it | 47 // The compiler won’t necessarily see anyone using these fields, but it |
Mark Mentovai
2014/12/15 23:36:15
This comment conceptually belongs with the pragmas
scottmg
2014/12/15 23:40:58
Done.
| |
48 // shouldn’t warn about that. These fields aren’t intended for use by the | 48 // shouldn’t warn about that. These fields aren’t intended for use by the |
49 // process they’re found in, they’re supposed to be read by the crash | 49 // process they’re found in, they’re supposed to be read by the crash |
50 // reporting process. | 50 // reporting process. |
51 #if defined(__clang__) | |
51 #pragma clang diagnostic push | 52 #pragma clang diagnostic push |
52 #pragma clang diagnostic ignored "-Wunused-private-field" | 53 #pragma clang diagnostic ignored "-Wunused-private-field" |
54 #endif | |
53 // Fields present in version 1: | 55 // Fields present in version 1: |
54 uint32_t signature_; // kSignature | 56 uint32_t signature_; // kSignature |
55 uint32_t size_; // The size of the entire CrashpadInfo structure. | 57 uint32_t size_; // The size of the entire CrashpadInfo structure. |
56 uint32_t version_; // kVersion | 58 uint32_t version_; // kVersion |
57 uint32_t padding_0_; | 59 uint32_t padding_0_; |
58 SimpleStringDictionary* simple_annotations_; // weak | 60 SimpleStringDictionary* simple_annotations_; // weak |
61 #if defined(__clang__) | |
59 #pragma clang diagnostic pop | 62 #pragma clang diagnostic pop |
63 #endif | |
60 | 64 |
61 DISALLOW_COPY_AND_ASSIGN(CrashpadInfo); | 65 DISALLOW_COPY_AND_ASSIGN(CrashpadInfo); |
62 }; | 66 }; |
63 | 67 |
64 } // namespace crashpad | 68 } // namespace crashpad |
65 | 69 |
66 #endif // CRASHPAD_CLIENT_CRASHPAD_INFO_H_ | 70 #endif // CRASHPAD_CLIENT_CRASHPAD_INFO_H_ |
OLD | NEW |