Merge branch 'master' into jgrpp

# Conflicts:
#	CMakeLists.txt
#	src/3rdparty/md5/md5.h
#	src/3rdparty/squirrel/squirrel/squtils.h
#	src/animated_tile.cpp
#	src/console_func.h
#	src/core/CMakeLists.txt
#	src/core/container_func.hpp
#	src/core/smallstack_type.hpp
#	src/crashlog.cpp
#	src/crashlog.h
#	src/debug.h
#	src/economy.cpp
#	src/gamelog.cpp
#	src/industry_gui.cpp
#	src/lang/catalan.txt
#	src/misc_gui.cpp
#	src/network/network_content.h
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/newgrf_gui.cpp
#	src/os/unix/font_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/rail_cmd.cpp
#	src/saveload/animated_tile_sl.cpp
#	src/script/api/script_tilelist.cpp
#	src/settings.cpp
#	src/settingsgen/settingsgen.cpp
#	src/sl/oldloader_sl.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_cmd.cpp
#	src/vehicle_gui_base.h
#	src/viewport_sprite_sorter.h

src/core/CMakeLists.txt

@@ -12,6 +12,7 @@ add_files(
     endian_type.hpp
     enum_type.hpp
     hash_func.hpp
+    format.hpp
     geometry_func.cpp
     geometry_func.hpp
     geometry_type.hpp
@@ -30,7 +31,6 @@ add_files(
     serialisation.cpp
     serialisation.hpp
     smallstack_type.hpp
-    smallvec_type.hpp
     tinystring_type.hpp
     y_combinator.hpp
 )

src/core/container_func.hpp

@@ -5,7 +5,7 @@
  * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** @file container_func.hpp Functions related to use of containers. */
+/** @file container_func.hpp Some simple functions to help with accessing containers. */
 
 #ifndef CONTAINER_FUNC_HPP
 #define CONTAINER_FUNC_HPP
@@ -13,6 +13,42 @@
 #include <iterator>
 #include <algorithm>
 
+/**
+ * Helper function to append an item to a container if it is not already contained.
+ * The container must have a \c emplace_back function.
+ * Consider using std::set, std::unordered_set or std::flat_set in new code.
+ *
+ * @param container A reference to the container to be extended
+ * @param item Reference to the item to be copy-constructed if not found
+ *
+ * @return Whether the item was already present
+ */
+template <typename Container>
+inline bool include(Container &container, typename Container::const_reference &item)
+{
+	const bool is_member = std::find(container.begin(), container.end(), item) != container.end();
+	if (!is_member) container.emplace_back(item);
+	return is_member;
+}
+
+/**
+ * Helper function to get the index of an item
+ * Consider using std::set, std::unordered_set or std::flat_set in new code.
+ *
+ * @param container A reference to the container to be searched.
+ * @param item Reference to the item to be search for
+ *
+ * @return Index of element if found, otherwise -1
+ */
+template <typename Container>
+int find_index(Container const &container, typename Container::const_reference item)
+{
+	auto const it = std::find(container.begin(), container.end(), item);
+	if (it != container.end()) return std::distance(container.begin(), it);
+
+	return -1;
+}
+
 template <typename C, typename UP> unsigned int container_unordered_remove_if (C &container, UP predicate) {
 	unsigned int removecount = 0;
 	for (auto it = container.begin(); it != container.end();) {

src/core/format.hpp

@@ -0,0 +1,44 @@
+/*
+ * This file is part of OpenTTD.
+ * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
+ * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** @file format.hpp String formatting functions and helpers. */
+
+#ifndef FORMAT_HPP
+#define FORMAT_HPP
+
+#include "../3rdparty/fmt/format.h"
+//#include "strong_typedef_type.hpp"
+
+template <typename E, typename Char>
+struct fmt::formatter<E, Char, std::enable_if_t<std::is_enum<E>::value>> : fmt::formatter<typename std::underlying_type<E>::type> {
+	using underlying_type = typename std::underlying_type<E>::type;
+	using parent = typename fmt::formatter<underlying_type>;
+
+	constexpr fmt::format_parse_context::iterator parse(fmt::format_parse_context &ctx) {
+		return parent::parse(ctx);
+	}
+
+	fmt::format_context::iterator format(const E &e, format_context &ctx) const {
+		return parent::format(underlying_type(e), ctx);
+	}
+};
+
+//template <typename T, typename Char>
+//struct fmt::formatter<T, Char, std::enable_if_t<std::is_base_of<StrongTypedefBase, T>::value>> : fmt::formatter<typename T::Type> {
+//	using underlying_type = typename T::Type;
+//	using parent = typename fmt::formatter<underlying_type>;
+//
+//	constexpr fmt::format_parse_context::iterator parse(fmt::format_parse_context &ctx) {
+//		return parent::parse(ctx);
+//	}
+//
+//	fmt::format_context::iterator format(const T &t, format_context &ctx) const {
+//		return parent::format(underlying_type(t), ctx);
+//	}
+//};
+
+#endif /* FORMAT_HPP */

src/core/pool_type.hpp

@@ -10,7 +10,6 @@
 #ifndef POOL_TYPE_HPP
 #define POOL_TYPE_HPP
 
-#include "smallvec_type.hpp"
 #include "enum_type.hpp"
 
 /** Various types of a pool. */

src/core/smallstack_type.hpp

@@ -10,8 +10,6 @@
 #ifndef SMALLSTACK_TYPE_HPP
 #define SMALLSTACK_TYPE_HPP
 
-#include "smallvec_type.hpp"
-
 /**
  * A simplified pool which stores values instead of pointers and doesn't
  * redefine operator new/delete. It also never zeroes memory and always reuses

src/core/smallvec_type.hpp

@@ -1,52 +0,0 @@
-/*
- * This file is part of OpenTTD.
- * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
- * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** @file smallvec_type.hpp Simple vector class that allows allocating an item without the need to copy this->data needlessly. */
-
-#ifndef SMALLVEC_TYPE_HPP
-#define SMALLVEC_TYPE_HPP
-
-#include "alloc_func.hpp"
-#include "mem_func.hpp"
-#include <vector>
-
-/**
- * Helper function to append an item to a vector if it is not already contained
- * Consider using std::set, std::unordered_set or std::flat_set in new code
- *
- * @param vec A reference to the vector to be extended
- * @param item Reference to the item to be copy-constructed if not found
- *
- * @return Whether the item was already present
- */
-template <typename T>
-inline bool include(std::vector<T>& vec, const T &item)
-{
-	const bool is_member = std::find(vec.begin(), vec.end(), item) != vec.end();
-	if (!is_member) vec.emplace_back(item);
-	return is_member;
-}
-
-/**
- * Helper function to get the index of an item
- * Consider using std::set, std::unordered_set or std::flat_set in new code
- *
- * @param vec A reference to the vector to be extended
- * @param item Reference to the item to be search for
- *
- * @return Index of element if found, otherwise -1
- */
-template <typename T>
-int find_index(std::vector<T> const& vec, T const& item)
-{
-	auto const it = std::find(vec.begin(), vec.end(), item);
-	if (it != vec.end()) return it - vec.begin();
-
-	return -1;
-}
-
-#endif /* SMALLVEC_TYPE_HPP */