diff options
author | Martin Braun <martin.braun@ettus.com> | 2014-12-15 11:27:02 +0100 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2014-12-15 11:27:02 +0100 |
commit | 84e1e3c9ced44eec4c93a474cef8c6f9b54acdd2 (patch) | |
tree | 9519eaec40d56d74250459b4515d01f7c2a50674 /host/lib/usrp/b200 | |
parent | c7796ea9714d1781df3acb4cf2283c0266babf13 (diff) | |
parent | f6dcf4a96449d2406ee0cb07aa6668377ceb3889 (diff) | |
download | uhd-84e1e3c9ced44eec4c93a474cef8c6f9b54acdd2.tar.gz uhd-84e1e3c9ced44eec4c93a474cef8c6f9b54acdd2.tar.bz2 uhd-84e1e3c9ced44eec4c93a474cef8c6f9b54acdd2.zip |
Merge branch 'maint'
Conflicts:
host/examples/rx_samples_to_file.cpp
Diffstat (limited to 'host/lib/usrp/b200')
-rw-r--r-- | host/lib/usrp/b200/b200_cores.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/b200/b200_cores.hpp b/host/lib/usrp/b200/b200_cores.hpp index 8a8900412..32e583794 100644 --- a/host/lib/usrp/b200/b200_cores.hpp +++ b/host/lib/usrp/b200/b200_cores.hpp @@ -57,7 +57,7 @@ public: typedef boost::shared_ptr<b200_ref_pll_ctrl> sptr; b200_ref_pll_ctrl(b200_local_spi_core::sptr spi); - void set_lock_to_ext_ref(bool external); + virtual void set_lock_to_ext_ref(bool external); private: b200_local_spi_core::sptr _spi; |