diff options
| author | Josh Blum <josh@joshknows.com> | 2010-03-26 12:00:48 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-03-26 12:00:48 -0700 |
| commit | faaee09fbea080cf543ccd2ae96e37a390ec7fad (patch) | |
| tree | 894ed27baaf47e1db863e448d7e567f45b833459 /host/lib/usrp/usrp2/usrp2_impl.hpp | |
| parent | af586ae149fe6f7aa12d4d6766e4216f3f00d1c0 (diff) | |
| parent | 08f6b21ce7cc4aa4069b4461785fc7173bed2998 (diff) | |
| download | uhd-faaee09fbea080cf543ccd2ae96e37a390ec7fad.tar.gz uhd-faaee09fbea080cf543ccd2ae96e37a390ec7fad.tar.bz2 uhd-faaee09fbea080cf543ccd2ae96e37a390ec7fad.zip | |
Merge branch 'addrs' of git@ettus.sourcerepo.com:ettus/uhd into timing
Conflicts:
host/lib/usrp/usrp2/usrp2_impl.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp index 2794cc666..3a2963c5a 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.hpp +++ b/host/lib/usrp/usrp2/usrp2_impl.hpp @@ -21,6 +21,8 @@ #include <uhd/usrp/usrp2.hpp> #include <uhd/dict.hpp> #include <uhd/types.hpp> +#include <uhd/time_spec.hpp> +#include <boost/asio.hpp> #include <boost/thread.hpp> #include <boost/shared_ptr.hpp> #include <boost/function.hpp> |