diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-03 19:31:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-03 19:31:45 +0400 |
| commit | da8f71bffb1a33c695a368c1243b8aa9ac54c21d (patch) | |
| tree | 988f91e51c03a676fef598ce1e9b03f245244c0a /intern/cycles/device/device_network.h | |
| parent | 590b7ff102c0ac5ee1f45ef8e43664afd9131251 (diff) | |
Cycles: some tweaks to silence msvc assertions in debug mode.
Diffstat (limited to 'intern/cycles/device/device_network.h')
| -rw-r--r-- | intern/cycles/device/device_network.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_network.h b/intern/cycles/device/device_network.h index 775517586d3..3cdb70bb4df 100644 --- a/intern/cycles/device/device_network.h +++ b/intern/cycles/device/device_network.h @@ -125,7 +125,7 @@ typedef struct RPCReceive { size_t len = boost::asio::read(socket, boost::asio::buffer(data)); if(len == data_size) { - archive_str = string(&data[0], data.size()); + archive_str = (data.size())? string(&data[0], data.size()): string(""); /*istringstream archive_stream(archive_str); boost::archive::text_iarchive archive(archive_stream);*/ archive_stream = new istringstream(archive_str); |