From 0d2e205e3460f91bc6da4919f0894a44effbaf99 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 15 Mar 2011 06:19:08 +0000 Subject: re PR libstdc++/48130 (build fails on libsupc++/nested_exception.cc) 2011-03-14 Benjamin Kosnik PR libstdc++/48130 * src/future.cc: Guard definitions. * libsupc++/nested_exception.cc: Same. From-SVN: r170979 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/libsupc++/nested_exception.cc | 2 ++ libstdc++-v3/src/future.cc | 3 +++ 3 files changed, 11 insertions(+) (limited to 'libstdc++-v3') diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1c4be42..f38927f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 2011-03-14 Benjamin Kosnik + PR libstdc++/48130 + * src/future.cc: Guard definitions. + * libsupc++/nested_exception.cc: Same. + +2011-03-14 Benjamin Kosnik + * src/Makefile.am: Add functional.cc, shared_ptr.cc. * src/Makefile.in: Regenerate. * libsupc++/Makefile.am: Add nested_exception.cc. diff --git a/libstdc++-v3/libsupc++/nested_exception.cc b/libstdc++-v3/libsupc++/nested_exception.cc index 876e8e0..ecbc4c8 100644 --- a/libstdc++-v3/libsupc++/nested_exception.cc +++ b/libstdc++-v3/libsupc++/nested_exception.cc @@ -25,5 +25,7 @@ namespace std { +#ifdef _GLIBCXX_ATOMIC_BUILTINS_4 nested_exception::~nested_exception() = default; +#endif } // namespace std diff --git a/libstdc++-v3/src/future.cc b/libstdc++-v3/src/future.cc index d2bc323..d6149cb 100644 --- a/libstdc++-v3/src/future.cc +++ b/libstdc++-v3/src/future.cc @@ -79,11 +79,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const char* future_error::what() const throw() { return _M_code.message().c_str(); } +#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \ + && defined(_GLIBCXX_ATOMIC_BUILTINS_4) __future_base::_Result_base::_Result_base() = default; __future_base::_Result_base::~_Result_base() = default; __future_base::_State_base::~_State_base() = default; +#endif _GLIBCXX_END_NAMESPACE_VERSION } // namespace std -- cgit v1.1