summaryrefslogtreecommitdiffstats
path: root/host/lib/utils
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-02-24 14:18:52 -0800
committerJosh Blum <josh@joshknows.com>2011-02-24 14:18:52 -0800
commit20a524d1a00497bdffda0292143d92e4d98cfbe9 (patch)
treec06d120b95bf7f8ad99b4a3b1250b62a300784d2 /host/lib/utils
parent4066b1f8fd87b1bca747d5b37a0b28179e188756 (diff)
downloaduhd-20a524d1a00497bdffda0292143d92e4d98cfbe9.tar.gz
uhd-20a524d1a00497bdffda0292143d92e4d98cfbe9.tar.bz2
uhd-20a524d1a00497bdffda0292143d92e4d98cfbe9.zip
uhd: moved exception to top level include
Diffstat (limited to 'host/lib/utils')
-rw-r--r--host/lib/utils/CMakeLists.txt1
-rw-r--r--host/lib/utils/exception.cpp47
2 files changed, 0 insertions, 48 deletions
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt
index 082553ff9..c0d99b37e 100644
--- a/host/lib/utils/CMakeLists.txt
+++ b/host/lib/utils/CMakeLists.txt
@@ -110,7 +110,6 @@ SET_SOURCE_FILES_PROPERTIES(
# Append sources
########################################################################
LIBUHD_APPEND_SOURCES(
- ${CMAKE_CURRENT_SOURCE_DIR}/exception.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gain_group.cpp
${CMAKE_CURRENT_SOURCE_DIR}/images.cpp
${CMAKE_CURRENT_SOURCE_DIR}/load_modules.cpp
diff --git a/host/lib/utils/exception.cpp b/host/lib/utils/exception.cpp
deleted file mode 100644
index e66addb0c..000000000
--- a/host/lib/utils/exception.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright 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
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd/utils/assert.hpp>
-#include <boost/functional/hash.hpp>
-#include <boost/format.hpp>
-
-using namespace uhd;
-
-static unsigned make_code(const std::string &name){
- boost::hash<std::string> string_hash;
- return unsigned(string_hash(name) & 0xfff);
-};
-
-exception::exception(const std::string &what):
- std::runtime_error(what){/* NOP */}
-
-#define make_exception_impl(name, class, base) \
- class::class(const std::string &what): \
- base(str(boost::format("%s: %s") % name % what)){} \
- unsigned class::code(void) const{return make_code(#class);}
-
-make_exception_impl("AssertionError", assertion_error, exception)
-make_exception_impl("LookupError", lookup_error, exception)
-make_exception_impl("IndexError", index_error, lookup_error)
-make_exception_impl("KeyError", key_error, lookup_error)
-make_exception_impl("ValueError", value_error, exception)
-make_exception_impl("RuntimeError", runtime_error, exception)
-make_exception_impl("NotImplementedError", not_implemented_error, runtime_error)
-make_exception_impl("EnvironmentError", environment_error, exception)
-make_exception_impl("IOError", io_error, environment_error)
-make_exception_impl("OSError", os_error, environment_error)
-make_exception_impl("SystemError", system_error, exception)