| 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 30 matching lines...) Expand all Loading... |
| 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 |
| 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 |
| 55 |
| 53 // Fields present in version 1: | 56 // Fields present in version 1: |
| 54 uint32_t signature_; // kSignature | 57 uint32_t signature_; // kSignature |
| 55 uint32_t size_; // The size of the entire CrashpadInfo structure. | 58 uint32_t size_; // The size of the entire CrashpadInfo structure. |
| 56 uint32_t version_; // kVersion | 59 uint32_t version_; // kVersion |
| 57 uint32_t padding_0_; | 60 uint32_t padding_0_; |
| 58 SimpleStringDictionary* simple_annotations_; // weak | 61 SimpleStringDictionary* simple_annotations_; // weak |
| 62 |
| 63 #if defined(__clang__) |
| 59 #pragma clang diagnostic pop | 64 #pragma clang diagnostic pop |
| 65 #endif |
| 60 | 66 |
| 61 DISALLOW_COPY_AND_ASSIGN(CrashpadInfo); | 67 DISALLOW_COPY_AND_ASSIGN(CrashpadInfo); |
| 62 }; | 68 }; |
| 63 | 69 |
| 64 } // namespace crashpad | 70 } // namespace crashpad |
| 65 | 71 |
| 66 #endif // CRASHPAD_CLIENT_CRASHPAD_INFO_H_ | 72 #endif // CRASHPAD_CLIENT_CRASHPAD_INFO_H_ |
| OLD | NEW |