diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-24 14:18:52 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-24 14:18:52 -0800 |
| commit | 20a524d1a00497bdffda0292143d92e4d98cfbe9 (patch) | |
| tree | c06d120b95bf7f8ad99b4a3b1250b62a300784d2 /host/include | |
| parent | 4066b1f8fd87b1bca747d5b37a0b28179e188756 (diff) | |
| download | uhd-20a524d1a00497bdffda0292143d92e4d98cfbe9.tar.gz uhd-20a524d1a00497bdffda0292143d92e4d98cfbe9.tar.bz2 uhd-20a524d1a00497bdffda0292143d92e4d98cfbe9.zip | |
uhd: moved exception to top level include
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/include/uhd/exception.hpp (renamed from host/include/uhd/utils/exception.hpp) | 0 | ||||
| -rw-r--r-- | host/include/uhd/utils/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | host/include/uhd/utils/assert.hpp | 3 | ||||
| -rw-r--r-- | host/include/uhd/utils/props.hpp | 9 |
5 files changed, 7 insertions, 9 deletions
diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt index b7a22cf0b..db755511e 100644 --- a/host/include/uhd/CMakeLists.txt +++ b/host/include/uhd/CMakeLists.txt @@ -25,6 +25,7 @@ INSTALL(FILES config.hpp convert.hpp device.hpp + exception.hpp version.hpp wax.hpp DESTINATION ${INCLUDE_DIR}/uhd diff --git a/host/include/uhd/utils/exception.hpp b/host/include/uhd/exception.hpp index 71836e22e..71836e22e 100644 --- a/host/include/uhd/utils/exception.hpp +++ b/host/include/uhd/exception.hpp diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt index b39b6083c..b638431d3 100644 --- a/host/include/uhd/utils/CMakeLists.txt +++ b/host/include/uhd/utils/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright 2010 Ettus Research LLC +# Copyright 2010-2011 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ INSTALL(FILES assert.ipp byteswap.hpp byteswap.ipp - exception.hpp gain_group.hpp images.hpp pimpl.hpp diff --git a/host/include/uhd/utils/assert.hpp b/host/include/uhd/utils/assert.hpp index cd752c1c1..1be4237d6 100644 --- a/host/include/uhd/utils/assert.hpp +++ b/host/include/uhd/utils/assert.hpp @@ -19,8 +19,7 @@ #define INCLUDED_UHD_UTILS_ASSERT_HPP #include <uhd/config.hpp> -#include <uhd/utils/exception.hpp> -#include <stdexcept> +#include <uhd/exception.hpp> #include <string> namespace uhd{ diff --git a/host/include/uhd/utils/props.hpp b/host/include/uhd/utils/props.hpp index fbca03019..81737423a 100644 --- a/host/include/uhd/utils/props.hpp +++ b/host/include/uhd/utils/props.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010 Ettus Research LLC +// Copyright 2010-2011 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -20,8 +20,7 @@ #include <uhd/config.hpp> #include <uhd/wax.hpp> -#include <uhd/utils/exception.hpp> -#include <stdexcept> +#include <uhd/exception.hpp> #include <vector> #include <string> @@ -68,14 +67,14 @@ namespace uhd{ * Throw-site information will be included with this error. */ #define UHD_THROW_PROP_GET_ERROR() \ - throw std::runtime_error(UHD_THROW_SITE_INFO("cannot get this property")) + throw uhd::key_error(UHD_THROW_SITE_INFO("cannot get this property")) /*! * Throw when setting a not-implemented or read-only property. * Throw-site information will be included with this error. */ #define UHD_THROW_PROP_SET_ERROR() \ - throw std::runtime_error(UHD_THROW_SITE_INFO("cannot set this property")) + throw uhd::key_error(UHD_THROW_SITE_INFO("cannot set this property")) } //namespace uhd |