Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

Former-commit-id: 3569a054e81dff3d44e433bedc9ef62526ebe367

include/Nazara/Core/Algorithm.hpp

@@ -23,6 +23,8 @@ namespace Nz
 	template<typename O, typename F, typename Tuple> auto Apply(O& object, F&& fn, Tuple&& t);
 	template<typename T> ByteArray ComputeHash(HashType hash, const T& v);
 	template<typename T> ByteArray ComputeHash(AbstractHash* hash, const T& v);
+	template<typename T, std::size_t N> constexpr std::size_t CountOf(T(&name)[N]) noexcept;
+	template<typename T> std::size_t CountOf(const T& c);
 	template<typename T> void HashCombine(std::size_t& seed, const T& v);
 
     template<typename T>

include/Nazara/Core/Algorithm.inl

@@ -62,6 +62,18 @@ namespace Nz
 		return hash->End();
 	}
 
+	template<typename T, std::size_t N> 
+	constexpr std::size_t CountOf(T(&name)[N]) noexcept
+	{
+		return N;
+	}
+
+	template<typename T> 
+	std::size_t CountOf(const T& c)
+	{
+		return c.size();
+	}
+
 	// Algorithme venant de CityHash par Google
 	// http://stackoverflow.com/questions/8513911/how-to-create-a-good-hash-combine-with-64-bit-output-inspired-by-boosthash-co
 	template<typename T>

include/Nazara/Utility/Image.inl.save-failed

@@ -1,20 +0,0 @@
-// Copyright (C) 2015 Jérôme Leclercq
-// This file is part of the "Nazara Engine - Utility module"
-// For conditions of distribution and use, see copyright notice in Config.hpp
-
-#include <memory>
-#include <Nazara/Utility/Debug.hpp>
-
-namespace Nz
-{
-	template<typename... Args>
-	ImageRef Image::New(Args&&... args)
-	{
-		std::unique_ptr<Image> object(new Image(std::forward<Args>(args)...));
-		object->SetPersistent(false);
-
-		return object.release();
-	}
-}
-
-#include <Nazara/Utility/DebugOff.hpp>