From b317f4df86d24cc9a47b8a8191f57545875f3afe Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Sun, 25 Apr 2010 00:42:52 +0000
Subject: removed boost exception stuff that makes it incompadible with 1.36,
remember this diff
---
host/include/uhd/utils/assert.hpp | 4 ++++
host/include/uhd/utils/props.hpp | 4 ++++
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; \
--
cgit v1.2.3