diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-10 23:29:22 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-10 23:29:22 -0700 |
| commit | 293ccdccd1e111942e9cc48ab87690da5202e406 (patch) | |
| tree | 4e861ca41fabc1e2664b7d0807242ab9c61544fd /host/lib/usrp/dboard_ctor_args.hpp | |
| parent | 1301d665d621358ec6eccb41a020a4689cb0b566 (diff) | |
| parent | 9e419c7b7f35062ceb2ed4e508cadb163067593f (diff) | |
| download | uhd-293ccdccd1e111942e9cc48ab87690da5202e406.tar.gz uhd-293ccdccd1e111942e9cc48ab87690da5202e406.tar.bz2 uhd-293ccdccd1e111942e9cc48ab87690da5202e406.zip | |
usrp-e: merged master, does not build
Diffstat (limited to 'host/lib/usrp/dboard_ctor_args.hpp')
| -rw-r--r-- | host/lib/usrp/dboard_ctor_args.hpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/host/lib/usrp/dboard_ctor_args.hpp b/host/lib/usrp/dboard_ctor_args.hpp index 13abe79e8..708f2ea08 100644 --- a/host/lib/usrp/dboard_ctor_args.hpp +++ b/host/lib/usrp/dboard_ctor_args.hpp @@ -15,18 +15,22 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // -#ifndef INCLUDED_DBOARD_CTOR_ARGS_HPP -#define INCLUDED_DBOARD_CTOR_ARGS_HPP +#ifndef INCLUDED_LIBUHD_USRP_DBOARD_CTOR_ARGS_HPP +#define INCLUDED_LIBUHD_USRP_DBOARD_CTOR_ARGS_HPP #include <uhd/usrp/dboard_id.hpp> #include <uhd/usrp/dboard_base.hpp> #include <uhd/usrp/dboard_iface.hpp> #include <string> -struct uhd::usrp::dboard_base::ctor_args_impl{ - std::string sd_name; - dboard_iface::sptr db_iface; - dboard_id_t rx_id, tx_id; -}; +namespace uhd{ namespace usrp{ -#endif /* INCLUDED_DBOARD_CTOR_ARGS_HPP */ + struct dboard_ctor_args_t{ + std::string sd_name; + dboard_iface::sptr db_iface; + dboard_id_t rx_id, tx_id; + }; + +}} //namespace + +#endif /* INCLUDED_LIBUHD_USRP_DBOARD_CTOR_ARGS_HPP */ |