]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge from Mainline
authorMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 9 Jan 2013 11:06:28 +0000 (11:06 +0000)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 9 Jan 2013 11:06:28 +0000 (11:06 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27994 0785d39b-7218-0410-832d-ea1e28bc413d

1  2 
deal.II/bundled/boost-1.49.0/include/boost/exception/detail/error_info_impl.hpp
deal.II/include/deal.II/lac/sparse_matrix.h
deal.II/include/deal.II/multigrid/mg_tools.h
deal.II/source/lac/trilinos_sparse_matrix.cc
deal.II/source/multigrid/mg_tools.cc
deal.II/source/numerics/matrix_tools.cc

index 883d313a98fd85b875b64dbc1e2ea8f8e034ec05,0000000000000000000000000000000000000000..f432aabbf60e1ce5102c165d7f1c45c931dff122
mode 100644,000000..100644
--- /dev/null
@@@ -1,75 -1,0 +1,75 @@@
-             ~error_info_base() throw()
 +//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 <string>
 +
 +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:
 +
++            virtual ~error_info_base() throw()
 +                {
 +                }
 +            };
 +        }
 +
 +    template <class Tag,class T>
 +    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
Simple merge

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.