jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

* Fixed reading and writing of fixed-size arrays

Browse source 
git-svn-id: http://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs/dbus@9595 30a43799-04e7-0310-8b2b-ea0d24f86d0e
This commit is contained in:
pdurante 2007-02-02 19:58:02 +00:00
parent 47150044cf
commit d0c224af9f
5 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/dbus-c++/types.h
View file

@ -288,7 +288,9 @@ inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const std::vect
template<>
inline DBus::MessageIter& operator << ( DBus::MessageIter& iter, const std::vector<DBus::Byte>& val )
{
iter.append_array('y', &val.front(), val.size());
DBus::MessageIter ait = iter.new_array("y");
ait.append_array('y', &val.front(), val.size());
iter.close_container(ait);
return iter;
}
@ -447,9 +449,12 @@ inline DBus::MessageIter& operator >> ( DBus::MessageIter& iter, std::vector<DBu
if(iter.array_type() != 'y')
throw DBus::ErrorInvalidArgs("byte-array expected");
val.reserve(iter.array_length());
DBus::MessageIter ait = iter.recurse();
iter.get_array(const_cast<DBus::Byte*>(&val.front()));
DBus::Byte* array;
size_t length = ait.get_array(&array);
val.insert(val.end(), array, array+length);
return ++iter;
}