projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing default to switch/case block.
[pulseview.git]
/
pv
/
devicemanager.cpp
diff --git
a/pv/devicemanager.cpp
b/pv/devicemanager.cpp
index fb487a8163feb38861cf0f384a792d2704ebbf2c..bbcfbf247675b345ab5af39376a930af132ca2e8 100644
(file)
--- a/
pv/devicemanager.cpp
+++ b/
pv/devicemanager.cpp
@@
-26,15
+26,13
@@
#include <stdexcept>
#include <string>
#include <stdexcept>
#include <string>
-#include <boost/foreach.hpp>
-
#include <libsigrok/libsigrok.h>
#include <libsigrok/libsigrok.h>
-using boost::shared_ptr;
using std::list;
using std::map;
using std::ostringstream;
using std::runtime_error;
using std::list;
using std::map;
using std::ostringstream;
using std::runtime_error;
+using std::shared_ptr;
using std::string;
namespace pv {
using std::string;
namespace pv {
@@
-65,7
+63,7
@@
list< shared_ptr<device::Device> > DeviceManager::driver_scan(
// Remove any device instances from this driver from the device
// list. They will not be valid after the scan.
// Remove any device instances from this driver from the device
// list. They will not be valid after the scan.
-
list< shared_ptr<device::Device> >::iterator
i = _devices.begin();
+
auto
i = _devices.begin();
while (i != _devices.end()) {
if ((*i)->dev_inst()->driver == driver)
i = _devices.erase(i);
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
void DeviceManager::release_devices()
{
// Release all the used devices
-
BOOST_FOREACH(shared_ptr<device::Device> dev,
_devices) {
+
for (shared_ptr<device::Device> dev :
_devices) {
assert(dev);
dev->release();
}
assert(dev);
dev->release();
}
@@
-129,7
+127,7
@@
void DeviceManager::scan_all_drivers()
void DeviceManager::release_driver(struct sr_dev_driver *const driver)
{
void DeviceManager::release_driver(struct sr_dev_driver *const driver)
{
-
BOOST_FOREACH(shared_ptr<device::Device> dev,
_devices) {
+
for (shared_ptr<device::Device> dev :
_devices) {
assert(dev);
if(dev->dev_inst()->driver == driver)
dev->release();
assert(dev);
if(dev->dev_inst()->driver == driver)
dev->release();