From 023e497777b46072b0f8dbf0d33240ca9df6b30e Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 3 Dec 2012 00:25:39 +0100 Subject: [PATCH] Revert "Simplified Thread interface" This reverts commit 49927a03e4a9bfd4681691bb859b08374cd309c6 [formerly f3cfc12d8c18eef8a8aa21c164ad994fff4a33b7]. Former-commit-id: 8315c5f18d29aff59749c2efe98208ee3f5e1a42 --- include/Nazara/Core/Thread.hpp | 1 + include/Nazara/Core/Thread.inl | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Core/Thread.hpp b/include/Nazara/Core/Thread.hpp index 4b4852f6e..e5212b488 100644 --- a/include/Nazara/Core/Thread.hpp +++ b/include/Nazara/Core/Thread.hpp @@ -40,6 +40,7 @@ class NAZARA_API NzThread : NzNonCopyable }; NzThread() = default; + template NzThread(F function); template NzThread(F function, Args... args); template NzThread(void (C::*function)(), C* object); NzThread(NzThread&& other); diff --git a/include/Nazara/Core/Thread.inl b/include/Nazara/Core/Thread.inl index 4bcfe3c4c..022c43c36 100644 --- a/include/Nazara/Core/Thread.inl +++ b/include/Nazara/Core/Thread.inl @@ -4,13 +4,16 @@ #include +template +NzThread::NzThread(F function) +{ + CreateImpl(new NzFunctorWithoutArgs(function)); +} + template NzThread::NzThread(F function, Args... args) { - if (sizeof...(Args) == 0) - CreateImpl(new NzFunctorWithoutArgs(function)); - else - CreateImpl(new NzFunctorWithArgs(function, args...)); + CreateImpl(new NzFunctorWithArgs(function, args...)); } template