Author: David Spickett Date: 2022-10-17T10:55:19Z New Revision: 66763b287007ac4a2fd19b8db2bdd8b52d503666
URL: https://github.com/llvm/llvm-project/commit/66763b287007ac4a2fd19b8db2bdd8b52d503666 DIFF: https://github.com/llvm/llvm-project/commit/66763b287007ac4a2fd19b8db2bdd8b52d503666.diff LOG: Revert "[lldb] Use std::underlying_type_t (NFC)" This reverts commit 921a4d5be4bbe3c337419dfcc313b3eb892c2870. Due to buildbot failures on Arm and Arm64. https://lab.llvm.org/buildbot/#/builders/96/builds/30231 Added: Modified: lldb/include/lldb/lldb-enumerations.h lldb/source/Breakpoint/BreakpointResolverName.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/lldb-enumerations.h b/lldb/include/lldb/lldb-enumerations.h index 9f1183a06b536..2ac1a74214b42 100644 --- a/lldb/include/lldb/lldb-enumerations.h +++ b/lldb/include/lldb/lldb-enumerations.h @@ -20,15 +20,18 @@ // this entire block, as it is not necessary for swig processing. #define LLDB_MARK_AS_BITMASK_ENUM(Enum) \ constexpr Enum operator|(Enum a, Enum b) { \ - return static_cast<Enum>(static_cast<std::underlying_type_t<Enum>>(a) | \ - static_cast<std::underlying_type_t<Enum>>(b)); \ + return static_cast<Enum>( \ + static_cast<std::underlying_type<Enum>::type>(a) | \ + static_cast<std::underlying_type<Enum>::type>(b)); \ } \ constexpr Enum operator&(Enum a, Enum b) { \ - return static_cast<Enum>(static_cast<std::underlying_type_t<Enum>>(a) & \ - static_cast<std::underlying_type_t<Enum>>(b)); \ + return static_cast<Enum>( \ + static_cast<std::underlying_type<Enum>::type>(a) & \ + static_cast<std::underlying_type<Enum>::type>(b)); \ } \ constexpr Enum operator~(Enum a) { \ - return static_cast<Enum>(~static_cast<std::underlying_type_t<Enum>>(a)); \ + return static_cast<Enum>( \ + ~static_cast<std::underlying_type<Enum>::type>(a)); \ } \ inline Enum &operator|=(Enum &a, Enum b) { \ a = a | b; \ diff --git a/lldb/source/Breakpoint/BreakpointResolverName.cpp b/lldb/source/Breakpoint/BreakpointResolverName.cpp index 5f42a96cd8c2e..dbaeec9c9afb9 100644 --- a/lldb/source/Breakpoint/BreakpointResolverName.cpp +++ b/lldb/source/Breakpoint/BreakpointResolverName.cpp @@ -164,7 +164,7 @@ BreakpointResolver *BreakpointResolverName::CreateFromStructuredData( error.SetErrorString("BRN::CFSD: name entry is not a string."); return nullptr; } - std::underlying_type_t<FunctionNameType> fnt; + std::underlying_type<FunctionNameType>::type fnt; success = names_mask_array->GetItemAtIndexAsInteger(i, fnt); if (!success) { error.SetErrorString("BRN::CFSD: name mask entry is not an integer."); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
