King_DuckZ/wrenpp
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

Possible build fix for aarch64

Browse source
This commit is contained in:
King_DuckZ 2022-06-03 10:52:26 +02:00
commit f4b3600ee5
4 changed files with 163 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/wrenpp/detail/module_and_name.hpp
View file

@ -29,9 +29,9 @@ namespace wren {
class ModuleAndName;
namespace detail {
template <dhandy::bt::string S>
template <dhandy::bt::string Str>
struct ModuleAndNameStaticStorage {
static constexpr const auto value = S;
static constexpr dhandy::bt::string value = Str;
};
[[gnu::const]]
@ -148,7 +148,9 @@ namespace wren {
template <dhandy::bt::string S1, dhandy::bt::string S2>
consteval ModuleAndName make_module_and_name() noexcept {
using dhandy::bt::string;
using StaticStorage = detail::ModuleAndNameStaticStorage<S1 + string("\0") + S2>;
using detail::ModuleAndNameStaticStorage;
constexpr string null_char{"\0"};
using StaticStorage = ModuleAndNameStaticStorage<S1 + null_char + S2>;
constexpr const char* data = StaticStorage::value.data();
constexpr std::uint16_t s1_len = static_cast<std::uint16_t>(S1.size());