vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-16 13:40:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix deserializing into existing objects

Browse Source 
`read_object()` was trying to create copies.
This commit is contained in:
Robbert van der Helm
2020-12-06 14:02:59 +01:00
parent d5374e4540
commit a16cf3015f
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/communication/common.h
+8 -4
View File
@@ -104,7 +104,7 @@ inline void write_object(Socket& socket, const T& object) {
* @relates write_object
*/
template <typename T, typename Socket>
inline T read_object(Socket& socket, std::vector<uint8_t>& buffer, T& object) {
inline T& read_object(Socket& socket, std::vector<uint8_t>& buffer, T& object) {
// See the note above on the use of `uint64_t` instead of `size_t`
std::array<uint64_t, 1> message_length;
boost::asio::read(socket, boost::asio::buffer(message_length));
@@ -141,7 +141,9 @@ inline T read_object(Socket& socket, std::vector<uint8_t>& buffer, T& object) {
template <typename T, typename Socket>
inline T read_object(Socket& socket, std::vector<uint8_t>& buffer) {
T object;
return read_object<T>(socket, buffer, object);
read_object<T>(socket, buffer, object);
return object;
}
/**
@@ -151,7 +153,7 @@ inline T read_object(Socket& socket, std::vector<uint8_t>& buffer) {
* @overload
*/
template <typename T, typename Socket>
inline T read_object(Socket& socket, T& object) {
inline T& read_object(Socket& socket, T& object) {
std::vector<uint8_t> buffer(64);
return read_object<T>(socket, buffer, object);
}
@@ -166,7 +168,9 @@ template <typename T, typename Socket>
inline T read_object(Socket& socket) {
T object;
std::vector<uint8_t> buffer(64);
return read_object<T>(socket, buffer, object);
read_object<T>(socket, buffer, object);
return object;
}
/**