From 7ca1e73f14131c05746c7eb983258df5b356aeb0 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Wed, 1 Dec 2021 01:34:05 -0600 Subject: [PATCH] [ox/model] Add string type template parameter to getModelTypeName (synced from 97bf81ba2309a19a5e0a82acd8401a7d0652ac84) --- src/ox/model/typenamecatcher.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ox/model/typenamecatcher.hpp b/src/ox/model/typenamecatcher.hpp index a08084d1a..3a5938796 100644 --- a/src/ox/model/typenamecatcher.hpp +++ b/src/ox/model/typenamecatcher.hpp @@ -44,8 +44,8 @@ struct TypeNameCatcher { }; -template -constexpr const char *getModelTypeName() noexcept { +template +constexpr Str getModelTypeName() noexcept { auto a = std::allocator(); auto t = a.allocate(1); TypeNameCatcher nc; @@ -54,14 +54,14 @@ constexpr const char *getModelTypeName() noexcept { return nc.name; } -template -constexpr const char *getModelTypeName(T *val) noexcept { +template +constexpr Str getModelTypeName(T *val) noexcept { TypeNameCatcher nc; oxIgnoreError(model(&nc, val)); return nc.name; } -template -constexpr auto ModelTypeName_v = getModelTypeName(); +template +constexpr auto ModelTypeName_v = getModelTypeName(); }