src/olympic/turbine/include/turbine/context.hpp

@@ -60,7 +60,7 @@ struct Wrap: public WrapBase {
 class WrapPtr {
 	private:
 		WrapBase *m_wrapPtr{};
-		ox::Array<char, sizeof(Wrap<void*>)> m_wrapData;
+		ox::Array<char, sizeof(WrapBase) + sizeof(void*)> m_wrapData;
 	public:
 		template<typename T>
 		inline WrapPtr &operator=(T *ptr) noexcept {
@@ -88,7 +88,7 @@ void setApplicationDataRaw(Context &ctx, WrapBase &applicationData) noexcept;
 
 template<typename T>
 void setApplicationData(Context &ctx, T *applicationData) noexcept {
-	Wrap w(applicationData);
+	Wrap<T> w(applicationData);
 	setApplicationDataRaw(ctx, w);
 }
 
@@ -99,15 +99,12 @@ template<typename T>
 [[nodiscard]]
 T *applicationData(Context &ctx) noexcept {
 	auto const raw = applicationDataRaw(ctx);
-	if (!raw) [[unlikely]] {
-		return nullptr;
-	}
 #ifdef OX_BARE_METAL
 	auto const out = static_cast<Wrap<T>*>(raw);
 #else
 	auto const out = dynamic_cast<Wrap<T>*>(raw);
 #endif
-	oxAssert(out, "Cast failed - wrong type");
+	oxAssert(out || !raw, "Cast failed - wrong type");
 	return out->data;
 }