diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2011-03-15 06:19:08 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2011-03-15 06:19:08 +0000 |
| commit | 0d2e205e3460f91bc6da4919f0894a44effbaf99 (patch) | |
| tree | 7421653e49bc7fc0aef65bc1dd1bff4f4a76e41e | |
| parent | e5a44bd64558d3350194666155288ef81e723b91 (diff) | |
| download | gcc-0d2e205e3460f91bc6da4919f0894a44effbaf99.zip gcc-0d2e205e3460f91bc6da4919f0894a44effbaf99.tar.gz gcc-0d2e205e3460f91bc6da4919f0894a44effbaf99.tar.bz2 | |
re PR libstdc++/48130 (build fails on libsupc++/nested_exception.cc)
2011-03-14 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/48130
* src/future.cc: Guard definitions.
* libsupc++/nested_exception.cc: Same.
From-SVN: r170979
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/nested_exception.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/future.cc | 3 |
3 files changed, 11 insertions, 0 deletions
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 <bkoz@redhat.com> + PR libstdc++/48130 + * src/future.cc: Guard definitions. + * libsupc++/nested_exception.cc: Same. + +2011-03-14 Benjamin Kosnik <bkoz@redhat.com> + * 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 |