diff options
author | Josh Blum <josh@joshknows.com> | 2012-04-03 15:53:18 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2012-04-03 15:53:18 -0700 |
commit | a1d8b94647b6149ca38282eefac6a5f1e89fad5b (patch) | |
tree | 7d1fcc50bee55159aa0206f148ee45188da963ec /host/lib/usrp/usrp1/usrp1_impl.cpp | |
parent | 40884c9411bf7d4bc91d24c939c22a3a04193d82 (diff) | |
parent | 51c81a39cc15ac221376e5acc4eceb572e0467f9 (diff) | |
download | uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.tar.gz uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.tar.bz2 uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.zip |
Merge branch 'master' into next
Conflicts:
host/examples/CMakeLists.txt
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 607badda9..1db2efa0d 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -413,8 +413,7 @@ usrp1_impl::~usrp1_impl(void){ this->enable_rx(false); this->enable_tx(false); ) - _tree.reset(); //resets counts on sptrs held in tree - _soft_time_ctrl.reset(); //stops cmd task before proceeding + _soft_time_ctrl->stop(); //stops cmd task before proceeding _io_impl.reset(); //stops vandal before other stuff gets deconstructed } |