summaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-03-10 14:44:56 -0800
committerJosh Blum <josh@joshknows.com>2011-03-10 14:44:56 -0800
commitfd35b0fdfd7012e3c37499f2bbcde6540c604a09 (patch)
tree8c8c9da0be31ffd12acdbe3d92c5f7495e6a579a /host/include
parent09149bbf7d28f67e68d65f7ba153ccd31ae48e5b (diff)
parent4c7cc6b1355a1ab7c8a60014061999f2338df1b1 (diff)
downloaduhd-fd35b0fdfd7012e3c37499f2bbcde6540c604a09.tar.gz
uhd-fd35b0fdfd7012e3c37499f2bbcde6540c604a09.tar.bz2
uhd-fd35b0fdfd7012e3c37499f2bbcde6540c604a09.zip
Merge branch 'master' into next
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/utils/safe_call.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/include/uhd/utils/safe_call.hpp b/host/include/uhd/utils/safe_call.hpp
index 6b2c210af..e23e508c8 100644
--- a/host/include/uhd/utils/safe_call.hpp
+++ b/host/include/uhd/utils/safe_call.hpp
@@ -19,7 +19,7 @@
#define INCLUDED_UHD_UTILS_SAFE_CALL_HPP
#include <uhd/config.hpp>
-#include <uhd/exception.hpp>
+#include <uhd/utils/exception.hpp>
#include <uhd/utils/warning.hpp>
//! helper macro for safe call to produce warnings