From 8b1880187a15173c11b9aeed69db3d8be2fd36b3 Mon Sep 17 00:00:00 2001
From: Michael Lutz <michi@icosahedron.de>
Date: Tue, 2 Apr 2019 21:31:41 +0200
Subject: [PATCH] Remove: AutoFreeSmallVector.

The last use was for storing a list of memory blocks. As the way these lists are accessed is very
specific, it is easier to just write an explicit destructor instead of trying to exactly match the behaviour.
---
 src/core/smallvec_type.hpp     | 30 ------------------------------
 src/network/network_client.cpp |  9 ++++++++-
 src/saveload/saveload.cpp      | 13 ++++++++++---
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/core/smallvec_type.hpp b/src/core/smallvec_type.hpp
index 6e726f556d..11ceb3fa84 100644
--- a/src/core/smallvec_type.hpp
+++ b/src/core/smallvec_type.hpp
@@ -69,34 +69,4 @@ T* grow(std::vector<T>& vec, std::size_t num)
 	return vec.data() + pos;
 }
 
-/**
- * Simple vector template class, with automatic free.
- *
- * @note There are no asserts in the class so you have
- *       to care about that you grab an item which is
- *       inside the list.
- *
- * @param T The type of the items stored, must be a pointer
- */
-template <typename T>
-class AutoFreeSmallVector : public std::vector<T> {
-public:
-	~AutoFreeSmallVector()
-	{
-		this->Clear();
-	}
-
-	/**
-	 * Remove all items from the list.
-	 */
-	inline void Clear()
-	{
-		for (T p : *this) {
-			free(p);
-		}
-
-		std::vector<T>::clear();
-	}
-};
-
 #endif /* SMALLVEC_TYPE_HPP */
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 8c68b98f87..4dc5a80415 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -42,7 +42,7 @@
 struct PacketReader : LoadFilter {
 	static const size_t CHUNK = 32 * 1024;  ///< 32 KiB chunks of memory.
 
-	AutoFreeSmallVector<byte *> blocks;     ///< Buffer with blocks of allocated memory.
+	std::vector<byte *> blocks;             ///< Buffer with blocks of allocated memory.
 	byte *buf;                              ///< Buffer we're going to write to/read from.
 	byte *bufe;                             ///< End of the buffer we write to/read from.
 	byte **block;                           ///< The block we're reading from/writing to.
@@ -54,6 +54,13 @@ struct PacketReader : LoadFilter {
 	{
 	}
 
+	~PacketReader() override
+	{
+		for (auto p : this->blocks) {
+			free(p);
+		}
+	}
+
 	/**
 	 * Add a packet to this buffer.
 	 * @param p The packet to add.
diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 721631fe68..f03e3d659f 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -126,15 +126,22 @@ struct ReadBuffer {
 
 /** Container for dumping the savegame (quickly) to memory. */
 struct MemoryDumper {
-	AutoFreeSmallVector<byte *> blocks; ///< Buffer with blocks of allocated memory.
-	byte *buf;                          ///< Buffer we're going to write to.
-	byte *bufe;                         ///< End of the buffer we write to.
+	std::vector<byte *> blocks; ///< Buffer with blocks of allocated memory.
+	byte *buf;                  ///< Buffer we're going to write to.
+	byte *bufe;                 ///< End of the buffer we write to.
 
 	/** Initialise our variables. */
 	MemoryDumper() : buf(NULL), bufe(NULL)
 	{
 	}
 
+	~MemoryDumper()
+	{
+		for (auto p : this->blocks) {
+			free(p);
+		}
+	}
+
 	/**
 	 * Write a single byte into the dumper.
 	 * @param b The byte to write.