From e3b8f8fe272503ef7f738da2f577f68b0fe16eeb Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 8 Oct 2021 11:05:36 -0700
Subject: Make a construct_at method amd use it

---
 common/aloptional.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/aloptional.h')

diff --git a/common/aloptional.h b/common/aloptional.h
index a8ca18ba..0eafd4d1 100644
--- a/common/aloptional.h
+++ b/common/aloptional.h
@@ -58,9 +58,9 @@ class optional {
     storage_t mStore;
 
     template<typename... Args>
-    void doConstruct(Args&& ...args)
+    void doConstruct(Args&& ...args) noexcept(noexcept(al::construct_at(std::declval<T*>(), std::forward<Args>(args)...)))
     {
-        ::new(std::addressof(mStore.mValue)) T{std::forward<Args>(args)...};
+        al::construct_at(std::addressof(mStore.mValue), std::forward<Args>(args)...);
         mStore.mHasValue = true;
     }
 
-- 
cgit v1.2.3