[container] Implement Pair using std::pair

Author: chris-durand

src/modm/container/pair.hpp

@@ -3,6 +3,7 @@
  * Copyright (c) 2009-2010, Martin Rosekeit
  * Copyright (c) 2009-2011, Fabian Greif
  * Copyright (c) 2012, Niklas Hauser
+ * Copyright (c) 2023, Christopher Durand
  *
  * This file is part of the modm project.
  *
@@ -15,6 +16,8 @@
 #ifndef	MODM_PAIR_HPP
 #define	MODM_PAIR_HPP
 
+#include <utility>
+
 namespace modm
 {
 	/**
@@ -63,49 +66,38 @@ namespace modm
 	 * \ingroup		modm_container
 	 */
 	template<typename T1, typename T2>
-	class Pair
+	class Pair : public std::pair<T1, T2>
 	{
 	public:
-		typedef T1 FirstType;
-		typedef T2 SecondType;
+		using FirstType = T1;
+		using SecondType = T2;
 
 	public:
-		// No non-trivial constructor is allowed, otherwise this class
-		// won't be POD (plain old data) :-(
-		// (this behavior changes with C++0x)
-		/*Pair(const FirstType& first, const SecondType& second) :
-			first(first), second(second)
-		{
-		}*/
+		using std::pair<T1, T2>::pair;
 
 		FirstType&
 		getFirst()
 		{
-			return first;
+			return this->first;
 		}
 
 		const FirstType&
 		getFirst() const
 		{
-			return first;
+			return this->first;
 		}
 
 		SecondType&
 		getSecond()
 		{
-			return second;
+			return this->second;
 		}
 
 		const SecondType&
 		getSecond() const
 		{
-			return second;
+			return this->second;
 		}
-
-	// ... not allowed either, only public attributes :-(
-	//private:
-		FirstType first;
-		SecondType second;
 	};
 }