Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed adding pointers. BMessage::AddPointer() was specifying const void* 

as the template param (where everything else was using void*) and
BMessage::AddData() was adding the pointer to the pointer as the data.
Unit tests save the day again!


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3385 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
ejakowatz 2003-05-29 06:28:28 +00:00
parent 8e8e1cf6c1
commit 67833f26bc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kits/app/Message.cpp
View File

@ -730,7 +730,7 @@ status_t BMessage::AddString(const char* name, const BString& a_string)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
status_t BMessage::AddPointer(const char* name, const void* ptr) status_t BMessage::AddPointer(const char* name, const void* ptr)
{ {
return fBody->AddData<const void*>(name, ptr, B_POINTER_TYPE); return fBody->AddData<void*>(name, (void*)ptr, B_POINTER_TYPE);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
status_t BMessage::AddMessenger(const char* name, BMessenger messenger) status_t BMessage::AddMessenger(const char* name, BMessenger messenger)
@ -874,7 +874,7 @@ status_t BMessage::AddData(const char* name, type_code type, const void* data,
err = AddMessenger(name, *(BMessenger*)data); err = AddMessenger(name, *(BMessenger*)data);
break; break;
case B_POINTER_TYPE: case B_POINTER_TYPE:
err = AddPointer(name, (void**)data); err = AddPointer(name, *(void**)data);
break; break;
case B_STRING_TYPE: case B_STRING_TYPE:
err = AddString(name, (const char*)data); err = AddString(name, (const char*)data);
@ -942,6 +942,7 @@ status_t BMessage::FindPointer(const char* name, void** ptr) const
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
status_t BMessage::FindPointer(const char* name, int32 index, void** ptr) const status_t BMessage::FindPointer(const char* name, int32 index, void** ptr) const
{ {
*ptr = NULL;
return fBody->FindData<void*>(name, index, ptr, B_POINTER_TYPE); return fBody->FindData<void*>(name, index, ptr, B_POINTER_TYPE);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -1062,7 +1063,7 @@ status_t BMessage::ReplacePointer(const char* name, const void* ptr)
status_t BMessage::ReplacePointer(const char* name, int32 index, status_t BMessage::ReplacePointer(const char* name, int32 index,
const void* ptr) const void* ptr)
{ {
return fBody->ReplaceData<const void*>(name, index, ptr, B_POINTER_TYPE); return fBody->ReplaceData<void*>(name, index, (void*)ptr, B_POINTER_TYPE);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
status_t BMessage::ReplaceMessenger(const char* name, BMessenger messenger) status_t BMessage::ReplaceMessenger(const char* name, BMessenger messenger)