Remove base's ALIGNOF/ALIGNAS in favor of alignof/alignas.

third_party/crashpad/crashpad/minidump/minidump_extensions.h

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 84 matching lines @@
   // 0x4350 = "CP"
 
   //! \brief The stream type for MinidumpCrashpadInfo.
   kMinidumpStreamTypeCrashpadInfo = 0x43500001,
 };
 
 //! \brief A variable-length UTF-8-encoded string carried within a minidump
 //!     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.
 
   //! \brief The length of the #Buffer field in bytes, not including the `NUL`
   //!     terminator.
   //!
   //! \note This field is interpreted as a byte count, not a count of Unicode
   //!     code points.
   uint32_t Length;
 
   //! \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.
 //!
 //! \sa \ref PROCESSOR_ARCHITECTURE_x "PROCESSOR_ARCHITECTURE_*"
 enum MinidumpCPUArchitecture : uint16_t {
   //! \brief 32-bit x86.
   //!
   //! These systems identify their CPUs generically as “x86” or “ia32”, or with
   //! more specific names such as “i386”, “i486”, “i586”, and “i686”.
   kMinidumpCPUArchitectureX86 = PROCESSOR_ARCHITECTURE_INTEL,
@@ skipping 106 matching lines @@
 
   //! \brief Native Client (NaCl).
   kMinidumpOSNaCl = 0x8205,
 
   //! \brief Unknown operating system.
   kMinidumpOSUnknown = 0xffffffff,
 };
 
 
 //! \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;
 
   //! \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.
 //!
 //! This structure augments the information provided by MINIDUMP_MODULE. The
 //! minidump file must contain a module list stream
 //! (::kMinidumpStreamTypeModuleList) in order for this structure to appear.
 //!
 //! This structure is versioned. When changing this structure, leave the
 //! existing structure intact so that earlier parsers will be able to understand
 //! the fields they are aware of, and make additions at the end of the
 //! 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.
 //!
 //! \sa MinidumpModuleCrashpadInfoList
-struct ALIGNAS(4) PACKED MinidumpModuleCrashpadInfo {
+struct alignas(4) MinidumpModuleCrashpadInfo {
   //! \brief The structure’s currently-defined version number.
   //!
   //! \sa version
   static const uint32_t kVersion = 1;
 
   //! \brief The structure’s version number.
   //!
   //! Readers can use this field to determine which other fields in the
   //! structure are valid. Upon encountering a value greater than #kVersion, a
   //! reader should assume that the structure’s layout is compatible with the
@@ skipping 14 matching lines @@
 
   //! \brief A MinidumpSimpleStringDictionary pointing to strings interpreted as
   //!     key-value pairs. The module controls the data that appears here.
   //!
   //! These key-value pairs correspond to
   //! ModuleSnapshot::AnnotationsSimpleMap() and do not duplicate anything in
   //! #list_annotations.
   //!
   //! 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
   //! value must be in the range of MINIDUMP_MODULE_LIST::NumberOfEntries.
   uint32_t minidump_module_list_index;
 
   //! \brief A link to a MinidumpModuleCrashpadInfo structure.
   //!
   //! MinidumpModuleCrashpadInfo structures are accessed indirectly through
   //! 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.
 //!
 //! This structure augments the information provided by
 //! MINIDUMP_MODULE_LIST. The minidump file must contain a module list stream
 //! (::kMinidumpStreamTypeModuleList) in order for this structure to appear.
 //!
 //! MinidumpModuleCrashpadInfoList::count may be less than the value of
 //! MINIDUMP_MODULE_LIST::NumberOfModules because not every MINIDUMP_MODULE
 //! 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;
 
   //! \brief Crashpad-specific information about modules, along with links to
   //!     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.
 //!
 //! This structure is versioned. When changing this structure, leave the
 //! existing structure intact so that earlier parsers will be able to understand
 //! the fields they are aware of, and make additions at the end of the
 //! 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.
   MinidumpCrashpadInfo()
       : version(),
         report_id(),
         client_id(),
         simple_annotations(),
         module_list() {
   }
@@ skipping 43 matching lines @@
   //! These key-value pairs correspond to
   //! ProcessSnapshot::AnnotationsSimpleMap().
   //!
   //! This field is present when #version is at least `1`.
   MINIDUMP_LOCATION_DESCRIPTOR simple_annotations;
 
   //! \brief A pointer to a MinidumpModuleCrashpadInfoList structure.
   //!
   //! This field is present when #version is at least `1`.
   MINIDUMP_LOCATION_DESCRIPTOR module_list;
-};
+} PACKED;
 
 #if defined(COMPILER_MSVC)
 #pragma pack(pop)
 #endif  // COMPILER_MSVC
 #undef PACKED
 
 MSVC_POP_WARNING();  // C4200
 
 }  // namespace crashpad
 
 #endif  // CRASHPAD_MINIDUMP_MINIDUMP_EXTENSIONS_H_