X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=bbcfbf247675b345ab5af39376a930af132ca2e8;hp=fb487a8163feb38861cf0f384a792d2704ebbf2c;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hpb=996b7c9da9b5cb56413e829217e1e7d7d7d520da diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index fb487a81..bbcfbf24 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -26,15 +26,13 @@ #include #include -#include - #include -using boost::shared_ptr; using std::list; using std::map; using std::ostringstream; using std::runtime_error; +using std::shared_ptr; using std::string; namespace pv { @@ -65,7 +63,7 @@ list< shared_ptr > DeviceManager::driver_scan( // Remove any device instances from this driver from the device // list. They will not be valid after the scan. - list< shared_ptr >::iterator i = _devices.begin(); + auto i = _devices.begin(); while (i != _devices.end()) { if ((*i)->dev_inst()->driver == driver) i = _devices.erase(i); @@ -108,7 +106,7 @@ void DeviceManager::init_drivers() void DeviceManager::release_devices() { // Release all the used devices - BOOST_FOREACH(shared_ptr dev, _devices) { + for (shared_ptr dev : _devices) { assert(dev); dev->release(); } @@ -129,7 +127,7 @@ void DeviceManager::scan_all_drivers() void DeviceManager::release_driver(struct sr_dev_driver *const driver) { - BOOST_FOREACH(shared_ptr dev, _devices) { + for (shared_ptr dev : _devices) { assert(dev); if(dev->dev_inst()->driver == driver) dev->release();