From: Matthias Maier Date: Wed, 9 Jan 2013 11:06:28 +0000 (+0000) Subject: Merge from Mainline X-Git-Tag: v8.0.0~1079^2~191 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5ddc2b5e12565b73b2fa86c02aa7a4b648717de;p=dealii.git Merge from Mainline git-svn-id: https://svn.dealii.org/branches/branch_cmake@27994 0785d39b-7218-0410-832d-ea1e28bc413d --- c5ddc2b5e12565b73b2fa86c02aa7a4b648717de diff --cc deal.II/bundled/boost-1.49.0/include/boost/exception/detail/error_info_impl.hpp index 883d313a98,0000000000..f432aabbf6 mode 100644,000000..100644 --- a/deal.II/bundled/boost-1.49.0/include/boost/exception/detail/error_info_impl.hpp +++ b/deal.II/bundled/boost-1.49.0/include/boost/exception/detail/error_info_impl.hpp @@@ -1,75 -1,0 +1,75 @@@ +//Copyright (c) 2006-2010 Emil Dotchevski and Reverge Studios, Inc. + +//Distributed under the Boost Software License, Version 1.0. (See accompanying +//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) + +#ifndef UUID_CE6983AC753411DDA764247956D89593 +#define UUID_CE6983AC753411DDA764247956D89593 +#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) +#pragma GCC system_header +#endif +#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) +#pragma warning(push,1) +#endif + +#include + +namespace +boost + { + namespace + exception_detail + { + class + error_info_base + { + public: + + virtual std::string tag_typeid_name() const = 0; + virtual std::string value_as_string() const = 0; + + protected: + - ~error_info_base() throw() ++ virtual ~error_info_base() throw() + { + } + }; + } + + template + class + error_info: + public exception_detail::error_info_base + { + public: + + typedef T value_type; + + error_info( value_type const & value ); + ~error_info() throw(); + + value_type const & + value() const + { + return value_; + } + + value_type & + value() + { + return value_; + } + + private: + + std::string tag_typeid_name() const; + std::string value_as_string() const; + + value_type value_; + }; + } + +#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS) +#pragma warning(pop) +#endif +#endif