From cadeae5e21834be65122a096ce8f5d7f96a6aeb7 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 24 Feb 2015 19:57:00 +0100 Subject: [PATCH] Moved UnpackTuple to an algorithm header Former-commit-id: 9abfd6edd40481c26cd07d070eb56fa6d0e6826a --- include/Nazara/Core/{Tuple.hpp => Algorithm.hpp} | 9 +++++---- include/Nazara/Core/{Tuple.inl => Algorithm.inl} | 2 ++ include/Nazara/Core/Functor.hpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) rename include/Nazara/Core/{Tuple.hpp => Algorithm.hpp} (63%) rename include/Nazara/Core/{Tuple.inl => Algorithm.inl} (95%) diff --git a/include/Nazara/Core/Tuple.hpp b/include/Nazara/Core/Algorithm.hpp similarity index 63% rename from include/Nazara/Core/Tuple.hpp rename to include/Nazara/Core/Algorithm.hpp index 1626e5177..f094c8976 100644 --- a/include/Nazara/Core/Tuple.hpp +++ b/include/Nazara/Core/Algorithm.hpp @@ -4,13 +4,14 @@ #pragma once -#ifndef NAZARA_TUPLE_HPP -#define NAZARA_TUPLE_HPP +#ifndef NAZARA_ALGORITHM_CORE_HPP +#define NAZARA_ALGORITHM_CORE_HPP +#include #include template void NzUnpackTuple(F func, const std::tuple& t); -#include +#include -#endif // NAZARA_TUPLE_HPP +#endif // NAZARA_ALGORITHM_CORE_HPP diff --git a/include/Nazara/Core/Tuple.inl b/include/Nazara/Core/Algorithm.inl similarity index 95% rename from include/Nazara/Core/Tuple.inl rename to include/Nazara/Core/Algorithm.inl index 46c6b5753..5a8bbeccf 100644 --- a/include/Nazara/Core/Tuple.inl +++ b/include/Nazara/Core/Algorithm.inl @@ -8,6 +8,8 @@ #include +///TODO: Améliorer l'implémentation de UnpackTuple + template struct NzImplTupleUnpack { diff --git a/include/Nazara/Core/Functor.hpp b/include/Nazara/Core/Functor.hpp index 4ecbeed25..be6e617e1 100644 --- a/include/Nazara/Core/Functor.hpp +++ b/include/Nazara/Core/Functor.hpp @@ -7,7 +7,7 @@ #ifndef NAZARA_FUNCTOR_HPP #define NAZARA_FUNCTOR_HPP -#include +#include // Inspiré du code de la SFML par Laurent Gomila