i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reworded commented out code with regards to not knowing the data size yet,

Browse Source 
to decide whether to apply the mini data flag. Helps compilation with clang
according to ticket #5892.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36908 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2010-05-23 12:34:54 +00:00
parent 59193042cc
commit b1784a9dbd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/MessageAdapter.cpp
+4 -4
View File
@@ -324,7 +324,7 @@ MessageAdapter::_R5FlattenedSize(const BMessage *from)
#if 0 #if 0
bool miniData = field->dataSize <= 255 && field->count <= 255; bool miniData = field->dataSize <= 255 && field->count <= 255;
#else #else
// ToDo: we don't know the R5 dataSize yet (padding) // TODO: we don't know the R5 dataSize yet (padding)
bool miniData = false; bool miniData = false;
#endif #endif
@@ -420,9 +420,9 @@ MessageAdapter::_FlattenR5Message(uint32 format, const BMessage *from,
if (field->count == 1) if (field->count == 1)
flags |= R5_FIELD_FLAG_SINGLE_ITEM; flags |= R5_FIELD_FLAG_SINGLE_ITEM;
// ToDo: we don't really know the data size now (padding missing) // TODO: we don't really know the data size now (padding missing)
if (field->data_size <= 255 && field->count <= 255) // if (field->data_size <= 255 && field->count <= 255)
;//flags |= R5_FIELD_FLAG_MINI_DATA; // flags |= R5_FIELD_FLAG_MINI_DATA;
if (field->flags & FIELD_FLAG_FIXED_SIZE) if (field->flags & FIELD_FLAG_FIXED_SIZE)
flags |= R5_FIELD_FLAG_FIXED_SIZE; flags |= R5_FIELD_FLAG_FIXED_SIZE;