Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Headers/DebugServer2/Base.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
typedef SSIZE_T ssize_t;
#endif
#else
#include <cstdint>
#include <cstdlib>
#endif
#include <iostream>
Expand Down Expand Up @@ -117,7 +118,7 @@ typedef SSIZE_T ssize_t;
// structure, and not held as a reference or a pointer.
template <typename T>
typename std::enable_if<
!std::is_pointer<T>::value && std::is_pod<T>::value,
!std::is_pointer_v<T> && std::is_standard_layout_v<T>,
size_t>::type static inline constexpr array_sizeof(T const &array) {
return sizeof(array) / (reinterpret_cast<uintptr_t>(&array[1]) -
reinterpret_cast<uintptr_t>(&array[0]));
Expand Down
4 changes: 2 additions & 2 deletions Headers/DebugServer2/Core/CPUTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ enum CPUSubType {
};

static inline bool CPUTypeIs64Bit(CPUType type) {
return type & kCPUArchABI64 || type == kCPUTypeALPHA ||
type == kCPUTypeRISCV64;
return static_cast<int>(type) & static_cast<int>(kCPUArchABI64) ||
type == kCPUTypeALPHA || type == kCPUTypeRISCV64;
}

char const *GetCPUTypeName(CPUType type);
Expand Down
Loading