BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

C++: Don't clear Session::_owned_devices() in Session::remove_devices(). 

Owned devices are freed only when the session is destroyed.
This commit is contained in:
Martin Ling 2014-10-12 16:18:30 +01:00 committed by Bert Vermeulen
parent 1de3ccede9
commit f36f7d0282
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bindings/cxx/classes.cpp
View File

@ -871,16 +871,6 @@ vector<shared_ptr<Device>> Session::devices()
void Session::remove_devices() void Session::remove_devices()
{ {
for (auto entry : _owned_devices)
{
// We own this device. Make sure it's not referenced.
auto device = entry.second;
auto ptr = device->get_shared_pointer(this);
if (ptr.use_count() > 1)
throw Error(SR_ERR_BUG);
delete device;
}
_owned_devices.clear();
_other_devices.clear(); _other_devices.clear();
check(sr_session_dev_remove_all(_structure)); check(sr_session_dev_remove_all(_structure));
} }