X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=41f2ae9c5f5bc6346aff24b895062d1e8d51ae53;hp=f1f4c542ca227bca236f050f9e226f30c7271422;hb=26f209b713171014a4f6dc3546b64bf691727cfd;hpb=e71eb81c946c3524e01eaef9781ccbf170143d0c diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp index f1f4c542..41f2ae9c 100644 --- a/pv/devicemanager.cpp +++ b/pv/devicemanager.cpp @@ -65,10 +65,6 @@ DeviceManager::DeviceManager(shared_ptr context) : driver_scan(entry.second, map()); } -DeviceManager::~DeviceManager() -{ -} - const std::shared_ptr& DeviceManager::context() const { return context_; @@ -151,10 +147,12 @@ const shared_ptr DeviceManager::find_device_from_info( // If present, vendor and model always have to match. if (dev_info.count("vendor") > 0 && search_info.count("vendor") > 0) - if (dev_info.at("vendor") != search_info.at("vendor")) continue; + if (dev_info.at("vendor") != search_info.at("vendor")) + continue; if (dev_info.count("model") > 0 && search_info.count("model") > 0) - if (dev_info.at("model") != search_info.at("model")) continue; + if (dev_info.at("model") != search_info.at("model")) + continue; // Most unique match: vendor/model/serial_num (but don't match a S/N of 0) if ((dev_info.count("serial_num") > 0) && (dev_info.at("serial_num") != "0") @@ -189,7 +187,8 @@ const shared_ptr DeviceManager::find_device_from_info( } bool DeviceManager::compare_devices(shared_ptr a, - shared_ptr b) { + shared_ptr b) +{ assert(a); assert(b); return a->display_name(*this).compare(b->display_name(*this)) < 0;