cpp/openttd-patchpack/source Changeset - r23540:8ae17b2213ea

Changeset - r23540:8ae17b2213ea

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Henry Wilson - 6 years ago 2019-03-13 20:55:31
m3henry@googlemail.com

Codechange: Use range-based for-loop in Auto[Free|Delete]SmallVector

2 files changed with 5 insertions and 5 deletions:

src/core/smallvec_type.hpp

src/script/squirrel_helper.hpp

0 comments (0 inline, 0 general)

src/core/smallvec_type.hpp

➞

Show inline comments

@@ @@ -46,89 +46,89 @@ inline bool include(std::vector<T>& vec, @@
 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;
+}
 /**
  * Helper function to append N default-constructed elements and get a pointer to the first new element
  * Consider using std::back_inserter in new code
+ *
  * @param vec A reference to the vector to be extended
  * @param num Number of elements to be default-constructed
+ *
  * @return Pointer to the first new element
  */
 template <typename T>
 T* grow(std::vector<T>& vec, std::size_t num)
+{
 	std::size_t const pos = vec.size();
 	vec.resize(pos + 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 (uint i = 0; i < std::vector<T>::size(); i++) {
 			free(std::vector<T>::operator[](i));
 		for (T p : *this) {
 			free(p);
+		}
 		std::vector<T>::clear();
+	}
 };
 /**
  * Simple vector template class, with automatic delete.
+ *
  * @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 AutoDeleteSmallVector : public std::vector<T> {
 public:
 	~AutoDeleteSmallVector()
+	{
 		this->Clear();
+	}
 	/**
 	 * Remove all items from the list.
 	 */
 	inline void Clear()
+	{
 		for (uint i = 0; i < std::vector<T>::size(); i++) {
 			delete std::vector<T>::operator[](i);
 		for (T p : *this) {
 			delete p;
+		}
 		std::vector<T>::clear();
+	}
 };
 typedef AutoFreeSmallVector<char*> StringList; ///< Type for a list of strings.
 #endif /* SMALLVEC_TYPE_HPP */

src/script/squirrel_helper.hpp

➞

Show inline comments

 /* $Id$ */
 /*
  * 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 squirrel_helper.hpp declarations and parts of the implementation of the class for convert code */
 #ifndef SQUIRREL_HELPER_HPP
 #define SQUIRREL_HELPER_HPP
 #include "squirrel.hpp"
 #include "../core/smallvec_type.hpp"
 #include "../economy_type.h"
 #include "../string_func.h"
 #include "squirrel_helper_type.hpp"
 template <class CL, ScriptType ST> const char *GetClassName();
 /**
  * The Squirrel convert routines
  */
 namespace SQConvert {
 	/**
 	 * Pointers assigned to this class will be free'd when this instance
 	 *  comes out of scope. Useful to make sure you can use stredup(),
 	 *  without leaking memory.
 	 */
 	struct SQAutoFreePointers : std::vector<void *> {
 		~SQAutoFreePointers()
+		{
-			for (uint i = 0; i < std::vector<void *>::size(); i++) free(std::vector<void *>::operator[](i));
+			for (void * p : *this) free(p);
+		}
 	};
 	template <bool Y> struct YesT {
 		static const bool Yes = Y;
 		static const bool No = !Y;
 	};
 	/**
 	 * Helper class to recognize if the given type is void. Usage: 'IsVoidT<T>::Yes'
 	 */
 	template <typename T> struct IsVoidT : YesT<false> {};
 	template <> struct IsVoidT<void> : YesT<true> {};
 	/**
 	 * Helper class to recognize if the function/method return type is void.
 	 */
 	template <typename Tfunc> struct HasVoidReturnT;
 	/* functions */
 	template <typename Tretval> struct HasVoidReturnT<Tretval (*)()> : IsVoidT<Tretval> {};
 	template <typename Tretval, typename Targ1> struct HasVoidReturnT<Tretval (*)(Targ1)> : IsVoidT<Tretval> {};
 	template <typename Tretval, typename Targ1, typename Targ2> struct HasVoidReturnT<Tretval (*)(Targ1, Targ2)> : IsVoidT<Tretval> {};
 	template <typename Tretval, typename Targ1, typename Targ2, typename Targ3> struct HasVoidReturnT<Tretval (*)(Targ1, Targ2, Targ3)> : IsVoidT<Tretval> {};
 	template <typename Tretval, typename Targ1, typename Targ2, typename Targ3, typename Targ4> struct HasVoidReturnT<Tretval (*)(Targ1, Targ2, Targ3, Targ4)> : IsVoidT<Tretval> {};
 	template <typename Tretval, typename Targ1, typename Targ2, typename Targ3, typename Targ4, typename Targ5> struct HasVoidReturnT<Tretval (*)(Targ1, Targ2, Targ3, Targ4, Targ5)> : IsVoidT<Tretval> {};
 	template <typename Tretval, typename Targ1, typename Targ2, typename Targ3, typename Targ4, typename Targ5, typename Targ6, typename Targ7, typename Targ8, typename Targ9, typename Targ10> struct HasVoidReturnT<Tretval (*)(Targ1, Targ2, Targ3, Targ4, Targ5, Targ6, Targ7, Targ8, Targ9, Targ10)> : IsVoidT<Tretval> {};
 	/* methods */
 	template <class Tcls, typename Tretval> struct HasVoidReturnT<Tretval (Tcls::*)()> : IsVoidT<Tretval> {};
 	template <class Tcls, typename Tretval, typename Targ1> struct HasVoidReturnT<Tretval (Tcls::*)(Targ1)> : IsVoidT<Tretval> {};
 	template <class Tcls, typename Tretval, typename Targ1, typename Targ2> struct HasVoidReturnT<Tretval (Tcls::*)(Targ1, Targ2)> : IsVoidT<Tretval> {};
 	template <class Tcls, typename Tretval, typename Targ1, typename Targ2, typename Targ3> struct HasVoidReturnT<Tretval (Tcls::*)(Targ1, Targ2, Targ3)> : IsVoidT<Tretval> {};
 	template <class Tcls, typename Tretval, typename Targ1, typename Targ2, typename Targ3, typename Targ4> struct HasVoidReturnT<Tretval (Tcls::*)(Targ1, Targ2, Targ3, Targ4)> : IsVoidT<Tretval> {};
 	template <class Tcls, typename Tretval, typename Targ1, typename Targ2, typename Targ3, typename Targ4, typename Targ5> struct HasVoidReturnT<Tretval (Tcls::*)(Targ1, Targ2, Targ3, Targ4, Targ5)> : IsVoidT<Tretval> {};
 	template <class Tcls, typename Tretval, typename Targ1, typename Targ2, typename Targ3, typename Targ4, typename Targ5, typename Targ6, typename Targ7, typename Targ8, typename Targ9, typename Targ10> struct HasVoidReturnT<Tretval (Tcls::*)(Targ1, Targ2, Targ3, Targ4, Targ5, Targ6, Targ7, Targ8, Targ9, Targ10)> : IsVoidT<Tretval> {};
 	/**
 	 * Special class to make it possible for the compiler to pick the correct GetParam().
 	 */
 	template <typename T> class ForceType { };
 	/**
 	 * To return a value to squirrel, we call this function. It converts to the right format.
 	 */
 	template <typename T> static int Return(HSQUIRRELVM vm, T t);
 	template <> inline int Return<uint8>       (HSQUIRRELVM vm, uint8 res)       { sq_pushinteger(vm, (int32)res); return 1; }
 	template <> inline int Return<uint16>      (HSQUIRRELVM vm, uint16 res)      { sq_pushinteger(vm, (int32)res); return 1; }

0 comments (0 inline, 0 general)