Index: third_party/crashpad/crashpad/minidump/minidump_extensions.h |
diff --git a/third_party/crashpad/crashpad/minidump/minidump_extensions.h b/third_party/crashpad/crashpad/minidump/minidump_extensions.h |
index 245ef8b5baa563f4e14a7f64e47a6b94b3765490..be2430421db2643d6cd16d0a0dee4fd08ded2ae6 100644 |
--- a/third_party/crashpad/crashpad/minidump/minidump_extensions.h |
+++ b/third_party/crashpad/crashpad/minidump/minidump_extensions.h |
@@ -102,7 +102,7 @@ enum MinidumpStreamType : uint32_t { |
//! file. |
//! |
//! \sa MINIDUMP_STRING |
-struct ALIGNAS(4) PACKED MinidumpUTF8String { |
+struct alignas(4) MinidumpUTF8String { |
// The field names do not conform to typical style, they match the names used |
// in MINIDUMP_STRING. This makes it easier to operate on MINIDUMP_STRING (for |
// UTF-16 strings) and MinidumpUTF8String using templates. |
@@ -116,7 +116,7 @@ struct ALIGNAS(4) PACKED MinidumpUTF8String { |
//! \brief The string, encoded in UTF-8, and terminated with a `NUL` byte. |
uint8_t Buffer[0]; |
-}; |
+} PACKED; |
//! \brief CPU type values for MINIDUMP_SYSTEM_INFO::ProcessorArchitecture. |
//! |
@@ -243,16 +243,16 @@ enum MinidumpOS : uint32_t { |
//! \brief A list of ::RVA pointers. |
-struct ALIGNAS(4) PACKED MinidumpRVAList { |
+struct alignas(4) MinidumpRVAList { |
//! \brief The number of children present in the #children array. |
uint32_t count; |
//! \brief Pointers to other structures in the minidump file. |
RVA children[0]; |
-}; |
+} PACKED; |
//! \brief A key-value pair. |
-struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionaryEntry { |
+struct alignas(4) MinidumpSimpleStringDictionaryEntry { |
//! \brief ::RVA of a MinidumpUTF8String containing the key of a key-value |
//! pair. |
RVA key; |
@@ -260,16 +260,16 @@ struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionaryEntry { |
//! \brief ::RVA of a MinidumpUTF8String containing the value of a key-value |
//! pair. |
RVA value; |
-}; |
+} PACKED; |
//! \brief A list of key-value pairs. |
-struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionary { |
+struct alignas(4) MinidumpSimpleStringDictionary { |
//! \brief The number of key-value pairs present. |
uint32_t count; |
//! \brief A list of MinidumpSimpleStringDictionaryEntry entries. |
MinidumpSimpleStringDictionaryEntry entries[0]; |
-}; |
+} PACKED; |
//! \brief Additional Crashpad-specific information about a module carried |
//! within a minidump file. |
@@ -286,7 +286,7 @@ struct ALIGNAS(4) PACKED MinidumpSimpleStringDictionary { |
//! fields are valid or not. |
//! |
//! \sa MinidumpModuleCrashpadInfoList |
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfo { |
+struct alignas(4) MinidumpModuleCrashpadInfo { |
//! \brief The structure’s currently-defined version number. |
//! |
//! \sa version |
@@ -321,12 +321,12 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfo { |
//! |
//! This field is present when #version is at least `1`. |
MINIDUMP_LOCATION_DESCRIPTOR simple_annotations; |
-}; |
+} PACKED; |
//! \brief A link between a MINIDUMP_MODULE structure and additional |
//! Crashpad-specific information about a module carried within a minidump |
//! file. |
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink { |
+struct alignas(4) MinidumpModuleCrashpadInfoLink { |
//! \brief A link to a MINIDUMP_MODULE structure in the module list stream. |
//! |
//! This field is an index into MINIDUMP_MODULE_LIST::Modules. This field’s |
@@ -339,7 +339,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink { |
//! MINIDUMP_LOCATION_DESCRIPTOR pointers to allow for future growth of the |
//! MinidumpModuleCrashpadInfo structure. |
MINIDUMP_LOCATION_DESCRIPTOR location; |
-}; |
+} PACKED; |
//! \brief Additional Crashpad-specific information about modules carried within |
//! a minidump file. |
@@ -353,7 +353,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoLink { |
//! structure carried within the minidump file will necessarily have |
//! Crashpad-specific information provided by a MinidumpModuleCrashpadInfo |
//! structure. |
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList { |
+struct alignas(4) MinidumpModuleCrashpadInfoList { |
//! \brief The number of children present in the #modules array. |
uint32_t count; |
@@ -361,7 +361,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList { |
//! MINIDUMP_MODULE structures that contain module information |
//! traditionally carried within minidump files. |
MinidumpModuleCrashpadInfoLink modules[0]; |
-}; |
+} PACKED; |
//! \brief Additional Crashpad-specific information carried within a minidump |
//! file. |
@@ -372,7 +372,7 @@ struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfoList { |
//! structure. Revise #kVersion and document each field’s validity based on |
//! #version, so that newer parsers will be able to determine whether the added |
//! fields are valid or not. |
-struct ALIGNAS(4) PACKED MinidumpCrashpadInfo { |
+struct alignas(4) MinidumpCrashpadInfo { |
// UUID has a constructor, which makes it non-POD, which makes this structure |
// non-POD. In order for the default constructor to zero-initialize other |
// members, an explicit constructor must be provided. |
@@ -436,7 +436,7 @@ struct ALIGNAS(4) PACKED MinidumpCrashpadInfo { |
//! |
//! This field is present when #version is at least `1`. |
MINIDUMP_LOCATION_DESCRIPTOR module_list; |
-}; |
+} PACKED; |
#if defined(COMPILER_MSVC) |
#pragma pack(pop) |