aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorAshish Chaudhari <ashish@ettus.com>2015-08-13 11:53:04 -0700
committerAshish Chaudhari <ashish@ettus.com>2015-08-13 11:53:04 -0700
commit9353d16391a1923be32f861e9810d1f271608721 (patch)
tree27459860384706ca43e79b5f51843d4009353e08 /host
parent60394a7092a05e3742551d61ec05a8ff73612ec5 (diff)
downloaduhd-9353d16391a1923be32f861e9810d1f271608721.tar.gz
uhd-9353d16391a1923be32f861e9810d1f271608721.tar.bz2
uhd-9353d16391a1923be32f861e9810d1f271608721.zip
uhd: Fixes to build with MSVC
- Included list header in soft_reg header - Fixed typo in x300_impl
Diffstat (limited to 'host')
-rw-r--r--host/include/uhd/utils/soft_register.hpp1
-rw-r--r--host/lib/usrp/x300/x300_impl.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/host/include/uhd/utils/soft_register.hpp b/host/include/uhd/utils/soft_register.hpp
index 6c712686a..9006ab5c7 100644
--- a/host/include/uhd/utils/soft_register.hpp
+++ b/host/include/uhd/utils/soft_register.hpp
@@ -29,6 +29,7 @@
#include <boost/tokenizer.hpp>
#include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp>
+#include <list>
/*! \file soft_register.hpp
* Utilities to access and index hardware registers.
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index 470c1e17d..5e3688bac 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -1340,7 +1340,7 @@ void x300_impl::register_loopback_self_test(wb_iface::sptr iface)
void x300_impl::set_time_source_out(mboard_members_t &mb, const bool enb)
{
- mb.fw_regmap->clock_ctrl_reg.write(fw_regmap_t::fw_regmap_t::clk_ctrl_reg_t::PPS_OUT_EN, enb?1:0);
+ mb.fw_regmap->clock_ctrl_reg.write(fw_regmap_t::clk_ctrl_reg_t::PPS_OUT_EN, enb?1:0);
}
void x300_impl::update_clock_source(mboard_members_t &mb, const std::string &source)