boostorg/exception
1
0
Fork 1
mirror of https://github.com/boostorg/exception.git synced 2025-07-13 12:36:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged changes from trunk: dealing with warnings, and a compile error on Win CE.

Browse Source 
[SVN r79026]
This commit is contained in:
Emil Dotchevski
2012-06-21 02:15:24 +00:00
parent b3b930b7f5
commit 7e116a36b9
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/boost/exception/detail/error_info_impl.hpp
View File

@ -30,6 +30,7 @@ boost
protected: protected:
virtual
~error_info_base() throw() ~error_info_base() throw()
{ {
} }

9
include/boost/exception/detail/exception_ptr.hpp
View File

@ -25,7 +25,7 @@
#include <stdexcept> #include <stdexcept>
#include <new> #include <new>
#include <ios> #include <ios>
#include <cstdlib> #include <stdlib.h>
namespace namespace
boost boost
@ -457,7 +457,12 @@ boost
BOOST_ASSERT(p); BOOST_ASSERT(p);
p.ptr_->rethrow(); p.ptr_->rethrow();
BOOST_ASSERT(0); BOOST_ASSERT(0);
std::abort(); #if defined(UNDER_CE)
// some CE platforms don't define ::abort()
exit(-1);
#else
abort();
#endif
} }
inline inline

17
include/boost/throw_exception.hpp
View File

@ -1,5 +1,11 @@
#ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED #ifndef UUID_AA15E74A856F11E08B8D93F24824019B
#define BOOST_THROW_EXCEPTION_HPP_INCLUDED #define UUID_AA15E74A856F11E08B8D93F24824019B
#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
// MS compatible compilers support #pragma once // MS compatible compilers support #pragma once
@ -79,7 +85,7 @@ template<class E> BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const
set_info( set_info(
set_info( set_info(
set_info( set_info(
boost::enable_error_info(x), enable_error_info(x),
throw_function(current_function)), throw_function(current_function)),
throw_file(file)), throw_file(file)),
throw_line(line))); throw_line(line)));
@ -88,4 +94,7 @@ template<class E> BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const
#endif #endif
} // namespace boost } // namespace boost
#endif // #ifndef BOOST_THROW_EXCEPTION_HPP_INCLUDED #if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
#pragma warning(pop)
#endif
#endif