diff options
| author | Josh Blum <josh@joshknows.com> | 2010-03-27 01:02:58 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-03-27 01:02:58 -0700 |
| commit | 52df9afd679fd0f42edeef29f0bbc0d7bd76559e (patch) | |
| tree | bcb28585a0195560e0551012ec2cfb33833ef917 /host/lib/usrp/dboard_manager.cpp | |
| parent | dd41206f2a5127871fc4c9911a748f7f4e3b6c51 (diff) | |
| download | uhd-52df9afd679fd0f42edeef29f0bbc0d7bd76559e.tar.gz uhd-52df9afd679fd0f42edeef29f0bbc0d7bd76559e.tar.bz2 uhd-52df9afd679fd0f42edeef29f0bbc0d7bd76559e.zip | |
Split utils.hpp into subdir with multiple files.
static for static block and static instance (singleton)
assert for assertion and throwing related stuff
algorithm for my addons to std::algorithm (has)
and a new one, safe main, for having a main catch-all
Diffstat (limited to 'host/lib/usrp/dboard_manager.cpp')
| -rw-r--r-- | host/lib/usrp/dboard_manager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp index 6683534f1..0f2189cd1 100644 --- a/host/lib/usrp/dboard_manager.cpp +++ b/host/lib/usrp/dboard_manager.cpp @@ -17,7 +17,8 @@ #include <uhd/usrp/dboard_manager.hpp> #include <uhd/gain_handler.hpp> -#include <uhd/utils.hpp> +#include <uhd/utils/static.hpp> +#include <uhd/utils/assert.hpp> #include <uhd/dict.hpp> #include <boost/tuple/tuple.hpp> #include <boost/format.hpp> @@ -35,7 +36,7 @@ typedef boost::tuple<dboard_manager::dboard_ctor_t, std::string, prop_names_t> a //map a dboard id to a dboard constructor typedef uhd::dict<dboard_id_t, args_t> id_to_args_map_t; -STATIC_INSTANCE(id_to_args_map_t, get_id_to_args_map) +UHD_SINGLETON_FCN(id_to_args_map_t, get_id_to_args_map) void dboard_manager::register_dboard( dboard_id_t dboard_id, |