diff options
-rw-r--r-- | filedistribution/src/vespa/filedistribution/common/exception.cpp | 20 | ||||
-rw-r--r-- | filedistribution/src/vespa/filedistribution/common/exception.h | 32 |
2 files changed, 0 insertions, 52 deletions
diff --git a/filedistribution/src/vespa/filedistribution/common/exception.cpp b/filedistribution/src/vespa/filedistribution/common/exception.cpp index f886f963837..c9bb5f43ab0 100644 --- a/filedistribution/src/vespa/filedistribution/common/exception.cpp +++ b/filedistribution/src/vespa/filedistribution/common/exception.cpp @@ -2,28 +2,8 @@ #include <vespa/fastos/fastos.h> #include "exception.h" -#include <execinfo.h> - namespace filedistribution { VESPA_IMPLEMENT_EXCEPTION(FileDoesNotExistException, vespalib::Exception); -std::ostream& -operator<<(std::ostream& stream, const Backtrace& backtrace) { - char** strings = backtrace_symbols(&*backtrace._frames.begin(), backtrace._size); - - stream <<"Backtrace:" <<std::endl; - for (size_t i = 0; i<backtrace._size; ++i) { - stream <<strings[i] <<std::endl; - } - - free(strings); - return stream; -} - - -Backtrace::Backtrace() - :_size(backtrace(&*_frames.begin(), _frames.size())) -{} - } diff --git a/filedistribution/src/vespa/filedistribution/common/exception.h b/filedistribution/src/vespa/filedistribution/common/exception.h index deeb054a99a..d55b218c7cf 100644 --- a/filedistribution/src/vespa/filedistribution/common/exception.h +++ b/filedistribution/src/vespa/filedistribution/common/exception.h @@ -1,42 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <boost/array.hpp> -#include <boost/version.hpp> #include <vespa/vespalib/util/exceptions.h> namespace filedistribution { -class Backtrace { - static const size_t _maxBacktraceSize = 200; - public: - boost::array<void*, _maxBacktraceSize> _frames; - const size_t _size; - - Backtrace(); -}; - VESPA_DEFINE_EXCEPTION(FileDoesNotExistException, vespalib::Exception); - -std::ostream& operator<<(std::ostream& stream, const Backtrace& backtrace); - -} //namespace filedistribution - -//********** Begin: Please remove when fixed upstream. -//boost 1.36 & 1.37 bugfix: allow attaching a boost::filesytem::path to a boost::exception -//using the error info mechanism. -#include <boost/filesystem/path.hpp> - -namespace boost{ -namespace to_string_detail { -std::basic_ostream<boost::filesystem::path::string_type::value_type, - boost::filesystem::path::string_type::traits_type > & -operator<< -( std::basic_ostream<boost::filesystem::path::string_type::value_type, - boost::filesystem::path::string_type::traits_type >& os, const boost::filesystem::path & ph ); -} } - -//********** End: Please remove when fixed upstream. - |