r7949 - in /branches/gui-in-main-thread/licq/src/plugins: plugin.cpp pluginthread.cpp
| Newsgroups | gmane.network.licq.cvs |
|---|---|
| Message-ID | <20101026181435.B235A224B80@thejon> |
Author: erijo
Date: Wed Oct 27 03:14:30 2010
New Revision: 7949
Log:
Use static_cast since it seems to be more appropiate
Modified:
branches/gui-in-main-thread/licq/src/plugins/plugin.cpp
branches/gui-in-main-thread/licq/src/plugins/pluginthread.cpp
Modified: branches/gui-in-main-thread/licq/src/plugins/plugin.cpp
==============================================================================
--- branches/gui-in-main-thread/licq/src/plugins/plugin.cpp (original)
+++ branches/gui-in-main-thread/licq/src/plugins/plugin.cpp Wed Oct 27 03:14:30 2010
@@ -62,7 +62,7 @@
void* result = myThread->join();
if (result != NULL && result != PTHREAD_CANCELED)
{
- int* retval = reinterpret_cast<int*>(result);
+ int* retval = static_cast<int*>(result);
int value = *retval;
delete retval;
return value;
Modified: branches/gui-in-main-thread/licq/src/plugins/pluginthread.cpp
==============================================================================
--- branches/gui-in-main-thread/licq/src/plugins/pluginthread.cpp (original)
+++ branches/gui-in-main-thread/licq/src/plugins/pluginthread.cpp Wed Oct 27 03:14:30 2010
@@ -66,7 +66,7 @@
static void* pluginThreadEntry(void* arg)
{
- PluginThread::Data& data = *reinterpret_cast<PluginThread::Data*>(arg);
+ PluginThread::Data& data = *static_cast<PluginThread::Data*>(arg);
// The following signals should not directed to the plugin but to the daemon;
// thus we block them here.
@@ -162,7 +162,7 @@
if (::pthread_join(newThread, &result) == 0
&& result != NULL && result != PTHREAD_CANCELED)
{
- int* retval = reinterpret_cast<int*>(result);
+ int* retval = static_cast<int*>(result);
int value = *retval;
delete retval;
return value;
@@ -312,7 +312,7 @@
void* PluginThread::newThreadEntry(void* voidData)
{
- NewThreadData* data = reinterpret_cast<NewThreadData*>(voidData);
+ NewThreadData* data = static_cast<NewThreadData*>(voidData);
data->myPluginThread->waitForThreadToStart();
int* retval = new int;