Merge remote-tracking branch 'origin/main' into update-readme

gofractally · Aug 10, 2023 · 9e3eeaa · 9e3eeaa
2 parents c40861b + e15bb01
commit 9e3eeaa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/libraries/psibase_http/jwt.cpp b/libraries/psibase_http/jwt.cpp
@@ -15,9 +15,9 @@ namespace psibase::http
       {
          std::array<char, 64> result = {};
          auto                 pos    = result.begin();
-         pos    = std::ranges::copy(std::ranges::views::iota('A', 'Z' + 1), pos).out;
-         pos    = std::ranges::copy(std::ranges::views::iota('a', 'z' + 1), pos).out;
-         pos    = std::ranges::copy(std::ranges::views::iota('0', '9' + 1), pos).out;
+         pos    = std::ranges::copy(std::ranges::views::iota('A', static_cast<char>('Z' + 1)), pos).out;
+         pos    = std::ranges::copy(std::ranges::views::iota('a', static_cast<char>('z' + 1)), pos).out;
+         pos    = std::ranges::copy(std::ranges::views::iota('0', static_cast<char>('9' + 1)), pos).out;
          *pos++ = '-';
          *pos++ = '_';
          if (pos != result.end())

diff --git a/programs/psitest/main.cpp b/programs/psitest/main.cpp
@@ -40,13 +40,15 @@ struct vm_options
    static constexpr std::uint32_t max_stack_bytes      = 1024 * 1024;
 };
 
+#ifdef __x86_64__
 template <>
 void eosio::vm::machine_code_writer<eosio::vm::jit_execution_context<callbacks, true>,
                                     true>::on_unreachable()
 {
    backtrace();
    eosio::vm::throw_<wasm_interpreter_exception>("unreachable");
 }
+#endif
 
 using backend_t = eosio::vm::backend<  //
     rhf_t,