diff options
| author | Philip Balister <philip@opensdr.com> | 2010-04-29 05:27:21 +0000 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-04-29 05:27:21 +0000 |
| commit | 4e97e9c4845814994e1e9d3deabb5abd4d177738 (patch) | |
| tree | 5e95b5e470e846dc261b0aec08c9a1d4344b3487 | |
| parent | 2de179640be9d897a63f7423f6e04399394abb8b (diff) | |
| parent | 6b44bf06b6c1c7961e2344e66b491129b062495a (diff) | |
| download | uhd-4e97e9c4845814994e1e9d3deabb5abd4d177738.tar.gz uhd-4e97e9c4845814994e1e9d3deabb5abd4d177738.tar.bz2 uhd-4e97e9c4845814994e1e9d3deabb5abd4d177738.zip | |
Merge branch 'usrp_e' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
| -rw-r--r-- | host/include/uhd/utils/assert.hpp | 4 | ||||
| -rw-r--r-- | host/include/uhd/utils/props.hpp | 4 | ||||
| -rw-r--r-- | host/include/uhd/utils/safe_main.hpp | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/host/include/uhd/utils/assert.hpp b/host/include/uhd/utils/assert.hpp index 01beed757..0a278312e 100644 --- a/host/include/uhd/utils/assert.hpp +++ b/host/include/uhd/utils/assert.hpp @@ -28,6 +28,10 @@ #include <stdexcept> #include <string> +#ifndef BOOST_THROW_EXCEPTION +#define BOOST_THROW_EXCEPTION(x) throw std::runtime_error("") +#endif + namespace uhd{ //! The exception to throw when assertions fail diff --git a/host/include/uhd/utils/props.hpp b/host/include/uhd/utils/props.hpp index 516102a5f..6c40c32e0 100644 --- a/host/include/uhd/utils/props.hpp +++ b/host/include/uhd/utils/props.hpp @@ -27,6 +27,10 @@ #include <vector> #include <string> +#ifndef BOOST_THROW_EXCEPTION +#define BOOST_THROW_EXCEPTION(x) throw std::runtime_error("") +#endif + namespace uhd{ //! The type for a vector of property names diff --git a/host/include/uhd/utils/safe_main.hpp b/host/include/uhd/utils/safe_main.hpp index a4e4e06e8..39d2282cd 100644 --- a/host/include/uhd/utils/safe_main.hpp +++ b/host/include/uhd/utils/safe_main.hpp @@ -19,7 +19,7 @@ #define INCLUDED_UHD_UTILS_SAFE_MAIN_HPP #include <uhd/config.hpp> -#include <boost/exception/diagnostic_information.hpp> +//#include <boost/exception/diagnostic_information.hpp> #include <iostream> #include <stdexcept> @@ -34,9 +34,9 @@ int main(int argc, char *argv[]){ \ try { \ return _main(argc, argv); \ - } catch(const boost::exception &e){ \ + } /*catch(const boost::exception &e){ \ std::cerr << "Error: " << boost::diagnostic_information(e) << std::endl; \ - } catch(const std::exception &e) { \ + }*/ catch(const std::exception &e) { \ std::cerr << "Error: " << e.what() << std::endl; \ } catch(...) { \ std::cerr << "Error: unknown exception" << std::endl; \ |