Merge branch 'main' into 2027

This commit is contained in:
Peter Johnson
2025-04-25 23:45:43 -07:00
79 changed files with 2093 additions and 415 deletions

View File

@@ -0,0 +1,18 @@
#if defined(__EMSCRIPTEN__)
# include <debugging.hpp>
# include <atomic>
# include <fstream>
# include <string>
namespace wpi {
bool is_debugger_present() noexcept
{
return false;
}
} // namespace wpi
#endif

View File

@@ -656,32 +656,32 @@ namespace wpi
/// \returns The number of bytes `value` is in the given unit.
/// \ingroup memory_core
/// @{
constexpr std::size_t operator"" _KiB(unsigned long long value) noexcept
constexpr std::size_t operator""_KiB(unsigned long long value) noexcept
{
return std::size_t(value * 1024);
}
constexpr std::size_t operator"" _KB(unsigned long long value) noexcept
constexpr std::size_t operator""_KB(unsigned long long value) noexcept
{
return std::size_t(value * 1000);
}
constexpr std::size_t operator"" _MiB(unsigned long long value) noexcept
constexpr std::size_t operator""_MiB(unsigned long long value) noexcept
{
return std::size_t(value * 1024 * 1024);
}
constexpr std::size_t operator"" _MB(unsigned long long value) noexcept
constexpr std::size_t operator""_MB(unsigned long long value) noexcept
{
return std::size_t(value * 1000 * 1000);
}
constexpr std::size_t operator"" _GiB(unsigned long long value) noexcept
constexpr std::size_t operator""_GiB(unsigned long long value) noexcept
{
return std::size_t(value * 1024 * 1024 * 1024);
}
constexpr std::size_t operator"" _GB(unsigned long long value) noexcept
constexpr std::size_t operator""_GB(unsigned long long value) noexcept
{
return std::size_t(value * 1000 * 1000 * 1000);
}

View File

@@ -4,7 +4,9 @@
#include "wpi/StackTrace.h"
#ifndef __EMSCRIPTEN__
#include <execinfo.h>
#endif
#include <string>
@@ -16,7 +18,7 @@
namespace wpi {
std::string GetStackTraceDefault(int offset) {
#ifndef __ANDROID__
#if !defined(__ANDROID__) && !defined(__EMSCRIPTEN__)
void* stackTrace[128];
int stackSize = backtrace(stackTrace, 128);
char** mangledSymbols = backtrace_symbols(stackTrace, stackSize);
@@ -40,7 +42,7 @@ std::string GetStackTraceDefault(int offset) {
return std::string{trace.str()};
#else
// backtrace_symbols not supported on android
// backtrace_symbols not supported
return "";
#endif
}