From b775542e4d5974804b01c71d8e3c6916f6f1cc76 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 2 Dec 2012 23:43:08 +0100 Subject: [PATCH] Simplified Thread interface Former-commit-id: 5cc7c51be1bf8fe8f13e3b4d25b051ff024f4ebf --- include/Nazara/Core/Thread.hpp | 1 - include/Nazara/Core/Thread.inl | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/Nazara/Core/Thread.hpp b/include/Nazara/Core/Thread.hpp index e5212b488..4b4852f6e 100644 --- a/include/Nazara/Core/Thread.hpp +++ b/include/Nazara/Core/Thread.hpp @@ -40,7 +40,6 @@ 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 022c43c36..4bcfe3c4c 100644 --- a/include/Nazara/Core/Thread.inl +++ b/include/Nazara/Core/Thread.inl @@ -4,16 +4,13 @@ #include -template -NzThread::NzThread(F function) -{ - CreateImpl(new NzFunctorWithoutArgs(function)); -} - template NzThread::NzThread(F function, Args... args) { - CreateImpl(new NzFunctorWithArgs(function, args...)); + if (sizeof...(Args) == 0) + CreateImpl(new NzFunctorWithoutArgs(function)); + else + CreateImpl(new NzFunctorWithArgs(function, args...)); } template