From 91a272482eeef79996fa399ac7625e4919d81a32 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Wed, 3 Apr 2013 16:42:54 +0200
Subject: [PATCH] Initializer will initialize several class at once

Former-commit-id: b64c87006e5fd237399b623fca32ec03d0d3d50c
---
 include/Nazara/Core/Initializer.hpp |  7 ++-
 include/Nazara/Core/Initializer.inl | 68 ++++++++++++++++++++++-------
 2 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/include/Nazara/Core/Initializer.hpp b/include/Nazara/Core/Initializer.hpp
index 4935cc925..dff53a4a1 100644
--- a/include/Nazara/Core/Initializer.hpp
+++ b/include/Nazara/Core/Initializer.hpp
@@ -9,16 +9,19 @@
 
 #include <Nazara/Prerequesites.hpp>
 
-template<typename T>
+template<typename... Args>
 class NzInitializer
 {
 	public:
-		template<typename... Args> NzInitializer(Args... args);
+		NzInitializer();
 		~NzInitializer();
 
 		bool IsInitialized() const;
 
 		operator bool() const;
+
+	private:
+		bool m_initialized;
 };
 
 #include <Nazara/Core/Initializer.inl>
diff --git a/include/Nazara/Core/Initializer.inl b/include/Nazara/Core/Initializer.inl
index 8fc1d1ff2..4cc9f5aa2 100644
--- a/include/Nazara/Core/Initializer.inl
+++ b/include/Nazara/Core/Initializer.inl
@@ -2,33 +2,69 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
-#include <Nazara/Core/Initializer.hpp>
 #include <Nazara/Core/Debug.hpp>
 
-template<typename T>
-template<typename... Args>
-NzInitializer<T>::NzInitializer(Args... args)
-{
-	T::Initialize(args...);
-}
+template<typename...> struct NzImplInitializer;
 
-template<typename T>
-NzInitializer<T>::~NzInitializer()
+template<typename T, typename... Rest>
+struct NzImplInitializer<T, Rest...>
 {
-	if (T::IsInitialized())
+	static bool Init()
+	{
+		if (T::Initialize())
+		{
+			if (NzImplInitializer<Rest...>::Init())
+				return true;
+			else
+				T::Uninitialize();
+		}
+
+		return false;
+	}
+
+	static void Uninit()
+	{
 		T::Uninitialize();
+		NzImplInitializer<Rest...>::Uninit();
+	}
+};
+
+template<>
+struct NzImplInitializer<>
+{
+	static bool Init()
+	{
+		return true;
+	}
+
+	static void Uninit()
+	{
+	}
+};
+
+template<typename... Args>
+NzInitializer<Args...>::NzInitializer()
+{
+	m_initialized = NzImplInitializer<Args...>::Init();
 }
 
-template<typename T>
-bool NzInitializer<T>::IsInitialized() const
+template<typename... Args>
+NzInitializer<Args...>::~NzInitializer()
 {
-	return T::IsInitialized();
+	if (m_initialized)
+		NzImplInitializer<Args...>::Uninit();
 }
 
-template<typename T>
-NzInitializer<T>::operator bool() const
+template<typename... Args>
+bool NzInitializer<Args...>::IsInitialized() const
 {
-	return T::IsInitialized();
+	return m_initialized;
+}
+
+template<typename... Args>
+NzInitializer<Args...>::operator bool() const
+{
+	return m_initialized;
 }
 
 #include <Nazara/Core/DebugOff.hpp>