Merge branch 'use_alignas' of https://github.com/gre-42/cereal into u…

…se_alignas

include/cereal/types/memory.hpp

@@ -134,7 +134,10 @@ namespace cereal
       // typedefs for parent type and storage type
       using BaseType = typename ::cereal::traits::get_shared_from_this_base<T>::type;
       using ParentType = std::enable_shared_from_this<BaseType>;
-      using StorageType = typename std::aligned_storage<sizeof(ParentType), CEREAL_ALIGNOF(ParentType)>::type;
+      class alignas(ParentType) StorageType {
+      private:
+        std::byte data[sizeof(ParentType)];
+      };
 
       public:
         //! Saves the state of some type inheriting from enable_shared_from_this
@@ -380,7 +383,10 @@ namespace cereal
       using NonConstT = typename std::remove_const<T>::type;
       // Storage type for the pointer - since we can't default construct this type,
       // we'll allocate it using std::aligned_storage
-      using AlignedStorage = typename std::aligned_storage<sizeof(NonConstT), CEREAL_ALIGNOF(NonConstT)>::type;
+      class alignas(NonConstT) AlignedStorage {
+      private:
+        std::byte data[sizeof(NonConstT)];
+      };
 
       // Allocate storage - note the AlignedStorage type so that deleter is correct if
       //                    an exception is thrown before we are initialized