X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fplatform%2Fthreads%2Fthreads.h;h=dc304f056e9b7472fbaac95874dd17ea4ee9f042;hb=d9de2aae6b2f47b8e1faacc69adba7406b9d85f0;hp=ead0ebdcb18c5e53525f60bb1882cdf9f12fabe6;hpb=99aeafb929fa132a096c236c4ae1eb78c2a595ec;p=deb_libcec.git diff --git a/src/lib/platform/threads/threads.h b/src/lib/platform/threads/threads.h index ead0ebd..dc304f0 100644 --- a/src/lib/platform/threads/threads.h +++ b/src/lib/platform/threads/threads.h @@ -2,7 +2,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -42,17 +42,14 @@ namespace PLATFORM m_bStop(false), m_bRunning(false), m_bStopped(false), - m_thread(NULL) {} + m_thread(INVALID_THREAD_VALUE) {} virtual ~CThread(void) { StopThread(0); - void *retVal; - if (m_thread) - ThreadsWait(m_thread, &retVal); - #if defined(__WINDOWS__) - (void *)retVal; //"unreferenced local variable" warning - #endif + void *retVal = NULL; + if (m_thread != INVALID_THREAD_VALUE) + if (ThreadsWait(m_thread, &retVal)){}; // silence unused warning } static void *ThreadHandler(CThread *thread)