argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

bladeRF: minor fixups to keep clang happy

This commit is contained in:
Robert Ghilduta 2018-08-18 00:11:54 -07:00 committed by Eric Wild
parent 95b1025b01
commit 038a26501c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/bladerf/bladerf_common.cc
View File

@ -49,7 +49,7 @@ static size_t const STREAM_TIMEOUT_MS = 3000;
using namespace boost::assign; using namespace boost::assign;
std::mutex bladerf_common::_devs_mutex; std::mutex bladerf_common::_devs_mutex;
std::list<std::weak_ptr<struct bladerf>> bladerf_common::_devs; std::list<std::weak_ptr<struct bladerf> > bladerf_common::_devs;
/* name for system-wide gain (which is not its own libbladeRF gain stage) */ /* name for system-wide gain (which is not its own libbladeRF gain stage) */
static const char *SYSTEM_GAIN_NAME = "system"; static const char *SYSTEM_GAIN_NAME = "system";
@ -133,7 +133,7 @@ size_t num_streams(bladerf_channel_layout layout)
* Public methods * Public methods
******************************************************************************/ ******************************************************************************/
bladerf_common::bladerf_common() : bladerf_common::bladerf_common() :
_dev(NULL), _dev(boost::shared_ptr<struct bladerf>()),
_pfx("[bladeRF common] "), _pfx("[bladeRF common] "),
_failures(0), _failures(0),
_num_buffers(NUM_BUFFERS), _num_buffers(NUM_BUFFERS),
@ -1107,7 +1107,7 @@ bladerf_sptr bladerf_common::open(std::string const &device_name)
/* Add the device handle to our cache */ /* Add the device handle to our cache */
bladerf_sptr dev = bladerf_sptr(raw_dev, bladerf_common::close); bladerf_sptr dev = bladerf_sptr(raw_dev, bladerf_common::close);
_devs.push_back(static_cast<std::weak_ptr<struct bladerf>>(dev)); _devs.push_back(static_cast<std::weak_ptr<struct bladerf> >(dev));
return dev; return dev;
} }
@ -1115,7 +1115,7 @@ bladerf_sptr bladerf_common::open(std::string const &device_name)
void bladerf_common::close(void *dev) void bladerf_common::close(void *dev)
{ {
std::lock_guard<std::mutex> lock(_devs_mutex); std::lock_guard<std::mutex> lock(_devs_mutex);
std::list<std::weak_ptr<struct bladerf>>::iterator it(_devs.begin()); std::list<std::weak_ptr<struct bladerf> >::iterator it(_devs.begin());
/* Prune expired entries from device cache */ /* Prune expired entries from device cache */
while (it != _devs.end()) { while (it != _devs.end()) {

2
lib/bladerf/bladerf_common.h
View File

@ -287,7 +287,7 @@ private:
* Private members * Private members
****************************************************************************/ ****************************************************************************/
static std::mutex _devs_mutex; /**< mutex for access to _devs */ static std::mutex _devs_mutex; /**< mutex for access to _devs */
static std::list<std::weak_ptr<struct bladerf>> _devs; /**< dev cache */ static std::list<std::weak_ptr<struct bladerf> > _devs; /**< dev cache */
}; };
#endif #endif