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/utils | |
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/utils')
-rw-r--r-- | host/utils/discover_usrps.cpp | 3 | ||||
-rw-r--r-- | host/utils/usrp2_burner.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/host/utils/discover_usrps.cpp b/host/utils/discover_usrps.cpp index d670d1651..dc2b845bc 100644 --- a/host/utils/discover_usrps.cpp +++ b/host/utils/discover_usrps.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // +#include <uhd/utils/safe_main.hpp> #include <uhd/device.hpp> #include <uhd/props.hpp> #include <boost/program_options.hpp> @@ -23,7 +24,7 @@ namespace po = boost::program_options; -int main(int argc, char *argv[]){ +int UHD_SAFE_MAIN(int argc, char *argv[]){ po::options_description desc("Allowed options"); desc.add_options() ("help", "help message") diff --git a/host/utils/usrp2_burner.cpp b/host/utils/usrp2_burner.cpp index 941e71d0c..ff6d4426f 100644 --- a/host/utils/usrp2_burner.cpp +++ b/host/utils/usrp2_burner.cpp @@ -15,6 +15,7 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // +#include <uhd/utils/safe_main.hpp> #include <uhd/usrp/usrp2.hpp> #include <uhd/props.hpp> #include <boost/program_options.hpp> @@ -23,7 +24,7 @@ namespace po = boost::program_options; -int main(int argc, char *argv[]){ +int UHD_SAFE_MAIN(int argc, char *argv[]){ po::options_description desc("Allowed options"); desc.add_options() ("help", "help message") |