forked from boostorg/throw_exception
Merged changes from trunk: dealing with warnings, and a compile error on Win CE.
[SVN r79026]
This commit is contained in:
committed by
Peter Dimov
parent
abec03383f
commit
9b26d9a9cc
@ -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
|
||||||
|
Reference in New Issue
Block a user