Replace deprecated std::aligned_storage with alignas, fixes #309 (#310)

see https://stackoverflow.com/a/71828512/1866775
Dobiasd · Aug 8, 2024 · 82bcb06 · 82bcb06
1 parent cc7c01e
commit 82bcb06
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/include/fplus/maybe.hpp b/include/fplus/maybe.hpp
@@ -240,7 +240,14 @@ class maybe {
         }
     }
     bool is_present_;
-    typename std::aligned_storage<sizeof(T), alignof(T)>::type value_;
+#ifdef _MSC_VER
+    __pragma(warning(push))
+        __pragma(warning(disable : 4324))
+#endif
+            alignas(T) unsigned char value_[sizeof(T)];
+#ifdef _MSC_VER
+    __pragma(warning(pop))
+#endif
 };
 
 // API search type: is_just : Maybe a -> Bool

diff --git a/include_all_in_one/include/fplus/fplus.hpp b/include_all_in_one/include/fplus/fplus.hpp
@@ -2797,7 +2797,14 @@ class maybe {
         }
     }
     bool is_present_;
-    typename std::aligned_storage<sizeof(T), alignof(T)>::type value_;
+#ifdef _MSC_VER
+    __pragma(warning(push))
+        __pragma(warning(disable : 4324))
+#endif
+            alignas(T) unsigned char value_[sizeof(T)];
+#ifdef _MSC_VER
+    __pragma(warning(pop))
+#endif
 };
 
 // API search type: is_just : Maybe a -> Bool