Merging minor tested bugfixes from trunk.

[SVN r77592]
This commit is contained in:
Emil Dotchevski
2012-03-27 19:31:48 +00:00
committed by Peter Dimov
parent 3558cf31c5
commit abec03383f
2 changed files with 30 additions and 3 deletions

View File

@ -310,6 +310,11 @@ boost
namespace
exception_detail
{
#if defined(__GNUC__)
# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
# pragma GCC visibility push (default)
# endif
#endif
template <class T>
struct
error_info_injector:
@ -326,6 +331,11 @@ boost
{
}
};
#if defined(__GNUC__)
# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
# pragma GCC visibility pop
# endif
#endif
struct large_size { char c[256]; };
large_size dispatch_boost_exception( exception const * );
@ -373,6 +383,11 @@ boost
namespace
exception_detail
{
#if defined(__GNUC__)
# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
# pragma GCC visibility push (default)
# endif
#endif
class
clone_base
{
@ -386,6 +401,11 @@ boost
{
}
};
#if defined(__GNUC__)
# if (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ > 4)
# pragma GCC visibility pop
# endif
#endif
inline
void
@ -410,8 +430,15 @@ boost
class
clone_impl:
public T,
public clone_base
public virtual clone_base
{
struct clone_tag { };
clone_impl( clone_impl const & x, clone_tag ):
T(x)
{
copy_boost_exception(this,&x);
}
public:
explicit
@ -430,7 +457,7 @@ boost
clone_base const *
clone() const
{
return new clone_impl(*this);
return new clone_impl(*this,clone_tag());
}
void