Inline Mutex and Thread methods

src/core/threads/Mutex.cpp

@@ -1,55 +0,0 @@
-/*
-Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include "Mutex.h"
-
-namespace crown
-{
-
-//-----------------------------------------------------------------------------
-Mutex::Mutex()
-{
-	os::mutex_create(m_mutex);
-}
-
-//-----------------------------------------------------------------------------
-Mutex::~Mutex()
-{
-	os::mutex_destroy(m_mutex);
-}
-
-//-----------------------------------------------------------------------------
-void Mutex::lock()
-{
-	os::mutex_lock(m_mutex);
-}
-
-//-----------------------------------------------------------------------------
-void Mutex::unlock()
-{
-	os::mutex_unlock(m_mutex);
-}
-
-} // namespace crown

src/core/threads/Mutex.h

@@ -46,4 +46,28 @@ private:
 	os::OSMutex		m_mutex;
 };
 
+//-----------------------------------------------------------------------------
+inline Mutex::Mutex()
+{
+	os::mutex_create(&m_mutex);
+}
+
+//-----------------------------------------------------------------------------
+inline Mutex::~Mutex()
+{
+	os::mutex_destroy(&m_mutex);
+}
+
+//-----------------------------------------------------------------------------
+inline void Mutex::lock()
+{
+	os::mutex_lock(&m_mutex);
+}
+
+//-----------------------------------------------------------------------------
+inline void Mutex::unlock()
+{
+	os::mutex_unlock(&m_mutex);
+}
+
 } // namespace crown

src/core/threads/Thread.cpp

@@ -1,56 +0,0 @@
-/*
-Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include "Thread.h"
-
-namespace crown
-{
-
-//-----------------------------------------------------------------------------
-Thread::Thread(os::ThreadFunction f, void* args, const char* name)
-{
-	memset(&m_thread, 0, sizeof(os::OSThread));
-
-	os::thread_create(f, args, m_thread, name);
-}
-
-//-----------------------------------------------------------------------------
-Thread::~Thread()
-{
-}
-
-//-----------------------------------------------------------------------------
-void Thread::join()
-{
-	os::thread_join(m_thread);
-}
-
-//-----------------------------------------------------------------------------
-void Thread::detach()
-{
-	os::thread_detach(m_thread);
-}
-
-} // namespace crown

src/core/threads/Thread.h

@@ -46,4 +46,29 @@ private:
 	os::OSThread	m_thread;
 };
 
+//-----------------------------------------------------------------------------
+inline Thread::Thread(os::ThreadFunction f, void* args, const char* name)
+{
+	memset(&m_thread, 0, sizeof(os::OSThread));
+
+	os::thread_create(f, args, &m_thread, name);
+}
+
+//-----------------------------------------------------------------------------
+inline Thread::~Thread()
+{
+}
+
+//-----------------------------------------------------------------------------
+inline void Thread::join()
+{
+	os::thread_join(&m_thread);
+}
+
+//-----------------------------------------------------------------------------
+inline void Thread::detach()
+{
+	os::thread_detach(&m_thread);
+}
+
 } // namespace crown