diff options
author | Josh Blum <josh@joshknows.com> | 2010-10-27 11:34:58 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-10-27 11:34:58 -0700 |
commit | 1289d051a1934e48d77be695059b1d23f8668d8a (patch) | |
tree | 8aba5f6449c49113114779d57d3b31eb163598bf /host/lib/usrp | |
parent | fa689c7202a0cab6bf0debc3524f1f46636a7ba0 (diff) | |
parent | fbdb002223f54bedbc7a4093494011c1b266fa75 (diff) | |
download | uhd-1289d051a1934e48d77be695059b1d23f8668d8a.tar.gz uhd-1289d051a1934e48d77be695059b1d23f8668d8a.tar.bz2 uhd-1289d051a1934e48d77be695059b1d23f8668d8a.zip |
Merge branch 'usrp_e' into usrp_e_next
Diffstat (limited to 'host/lib/usrp')
-rw-r--r-- | host/lib/usrp/misc_utils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/misc_utils.cpp b/host/lib/usrp/misc_utils.cpp index 7e49baa52..5856d706f 100644 --- a/host/lib/usrp/misc_utils.cpp +++ b/host/lib/usrp/misc_utils.cpp @@ -164,13 +164,13 @@ static void verify_xx_subdev_spec( } //sanity check that the dboard/subdevice names exist for this mboard - BOOST_FOREACH(const subdev_spec_pair_t &pair, subdev_spec){ + BOOST_FOREACH(subdev_spec_pair_t &pair, subdev_spec){ //empty db name means select dboard automatically if (pair.db_name.empty()){ if (dboard_names.size() != 1) throw std::runtime_error( "A daughterboard name must be provided for multi-slot motherboards: " + subdev_spec.to_string() ); - pair.db_name == dboard_names.front(); + pair.db_name = dboard_names.front(); } uhd::assert_has(dboard_names, pair.db_name, xx_type + " dboard name"); wax::obj dboard = mboard[named_prop_t(dboard_prop, pair.db_name)]; @@ -181,7 +181,7 @@ static void verify_xx_subdev_spec( if (subdev_names.size() != 1) throw std::runtime_error( "A subdevice name must be provided for multi-subdev daughterboards: " + subdev_spec.to_string() ); - pair.sd_name == subdev_names.front(); + pair.sd_name = subdev_names.front(); } uhd::assert_has(subdev_names, pair.sd_name, xx_type + " subdev name"); } |