diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-01-13 11:58:41 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-01-13 11:58:41 (GMT) |
| commit | 0aa0fe08dc308c94379c47d0bf9745e341cb4c81 (patch) | |
| tree | 514b009d3d1658af6988e059874014fc26fc0395 /contrib/src/boost/exception | |
| parent | 6952ce94491e4b7bc2acded0788e4609ca2c76e8 (diff) | |
| download | uscxml-0aa0fe08dc308c94379c47d0bf9745e341cb4c81.zip uscxml-0aa0fe08dc308c94379c47d0bf9745e341cb4c81.tar.gz uscxml-0aa0fe08dc308c94379c47d0bf9745e341cb4c81.tar.bz2 | |
Updated boost headers
Diffstat (limited to 'contrib/src/boost/exception')
| -rw-r--r-- | contrib/src/boost/exception/exception.hpp | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/contrib/src/boost/exception/exception.hpp b/contrib/src/boost/exception/exception.hpp index 1f2bd9c..c0fdaf9 100644 --- a/contrib/src/boost/exception/exception.hpp +++ b/contrib/src/boost/exception/exception.hpp @@ -12,6 +12,14 @@ #pragma warning(push,1) #endif +#ifdef BOOST_EXCEPTION_MINI_BOOST +#include <memory> +namespace boost { namespace exception_detail { using std::shared_ptr; } } +#else +namespace boost { template <class T> class shared_ptr; }; +namespace boost { namespace exception_detail { using boost::shared_ptr; } } +#endif + namespace boost { @@ -144,9 +152,6 @@ boost # endif #endif - template <class T> - class shared_ptr; - namespace exception_detail { @@ -182,6 +187,18 @@ boost template <> struct get_info<throw_line>; + template <class> + struct set_info_rv; + + template <> + struct set_info_rv<throw_function>; + + template <> + struct set_info_rv<throw_file>; + + template <> + struct set_info_rv<throw_line>; + char const * get_diagnostic_information( exception const &, char const * ); void copy_boost_exception( exception *, exception const * ); @@ -264,6 +281,11 @@ boost friend struct exception_detail::get_info<throw_function>; friend struct exception_detail::get_info<throw_file>; friend struct exception_detail::get_info<throw_line>; + template <class> + friend struct exception_detail::set_info_rv; + friend struct exception_detail::set_info_rv<throw_function>; + friend struct exception_detail::set_info_rv<throw_file>; + friend struct exception_detail::set_info_rv<throw_line>; friend void exception_detail::copy_boost_exception( exception *, exception const * ); #endif mutable exception_detail::refcount_ptr<exception_detail::error_info_container> data_; |