Replace deprecated std::iterator, std::is_pod, and std::aligned_storage

Author: VReaperV

src.cmake

@@ -39,6 +39,7 @@ set(COMMONLIST
     ${COMMON_DIR}/String.h
     ${COMMON_DIR}/System.cpp
     ${COMMON_DIR}/System.h
+    ${COMMON_DIR}/Type.h
     ${COMMON_DIR}/Util.cpp
     ${COMMON_DIR}/Util.h
     ${COMMON_DIR}/cm/cm_load.cpp

src/common/FileSystem.h

@@ -207,10 +207,16 @@ namespace Path {
 } // namespace Path
 
 // Iterator which iterates over all files in a directory
-template<typename State> class DirectoryIterator: public std::iterator<std::input_iterator_tag, std::string> {
+template<typename State> class DirectoryIterator {
 	// State interface:
 	// bool Advance(std::error_code& err);
 	// std::string current;
+	using iterator_category = std::input_iterator_tag;
+	using value_type = std::string;
+	using difference_type = void;
+	using pointer = void;
+	using reference = void;
+
 public:
 	DirectoryIterator()
 		: state(nullptr) {}

src/common/Serialize.h

@@ -45,6 +45,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Optional.h"
 #include "String.h"
 
+#include "Type.h"
+
 namespace Util {
 
     /*
@@ -229,7 +231,7 @@ namespace Util {
 	// This is only safe to use if every possible byte sequence represents a valid value for the
 	// object. So it cannot be used for bool or a struct containing a bool.
 	template<typename T>
-	struct SerializeTraits<T, typename std::enable_if<std::is_pod<T>::value && !std::is_array<T>::value>::type> {
+	struct SerializeTraits<T, typename std::enable_if<IsPod<T> && !std::is_array<T>::value>::type> {
 		static void Write(Writer& stream, const T& value)
 		{
 			stream.WriteData(std::addressof(value), sizeof(value));
@@ -257,7 +259,7 @@ namespace Util {
 
 	// std::array for non-POD types (POD types are already handled by the base case)
 	template<typename T, size_t N>
-	struct SerializeTraits<std::array<T, N>, typename std::enable_if<!std::is_pod<T>::value>::type> {
+	struct SerializeTraits<std::array<T, N>, typename std::enable_if<!IsPod<T>>::type> {
 		static void Write(Writer& stream, const std::array<T, N>& value)
 		{
 			for (const T& x: value)
@@ -274,7 +276,7 @@ namespace Util {
 
 	// std::vector, with a specialization for POD types
 	template<typename T>
-	struct SerializeTraits<std::vector<T>, typename std::enable_if<std::is_pod<T>::value>::type> {
+	struct SerializeTraits<std::vector<T>, typename std::enable_if<IsPod<T>>::type> {
 		static void Write(Writer& stream, const std::vector<T>& value)
 		{
 			stream.WriteSize(value.size());
@@ -289,7 +291,7 @@ namespace Util {
 		}
 	};
 	template<typename T>
-	struct SerializeTraits<std::vector<T>, typename std::enable_if<!std::is_pod<T>::value>::type> {
+	struct SerializeTraits<std::vector<T>, typename std::enable_if<!IsPod<T>>::type> {
 		static void Write(Writer& stream, const std::vector<T>& value)
 		{
 			stream.WriteSize(value.size());

src/common/Type.h

@@ -0,0 +1,39 @@
+/*
+===========================================================================
+Daemon BSD Source Code
+Copyright (c) 2013-2016, Daemon Developers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the Daemon developers nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL DAEMON DEVELOPERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===========================================================================
+*/
+
+#ifndef COMMON_TYPE_H_
+#define COMMON_TYPE_H_
+
+#include <type_traits>
+
+template<typename T>
+constexpr bool IsPod = std::is_standard_layout<T>::value && std::is_trivially_copyable<T>::value && std::is_trivially_default_constructible<T>::value;
+
+#endif // COMMON_TYPE_H_

src/common/Util.h

@@ -151,6 +151,8 @@ template<typename T> class uninitialized {
 	uninitialized& operator=(const uninitialized&) = delete;
 	uninitialized& operator=(uninitialized&&) = delete;
 
+	alignas( T ) uint8_t data[sizeof( T )];
+
 	template<typename... Args> void construct(Args&&... args)
 	{
 		new(&data) T(std::forward<Args>(args)...);
@@ -171,9 +173,6 @@ template<typename T> class uninitialized {
 	{
 		return *reinterpret_cast<const T*>(&data);
 	}
-
-private:
-	typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type data;
 };
 
 // std::make_unique is not available until C++14.