OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Benjamin Kosnik 2011-03-15 06:19:08 +00:00 committed by Benjamin Kosnik
parent e5a44bd645
commit 0d2e205e34
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
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.

2
libstdc++-v3/libsupc++/nested_exception.cc
View File

@ -25,5 +25,7 @@
namespace std
{
#ifdef _GLIBCXX_ATOMIC_BUILTINS_4
nested_exception::~nested_exception() = default;
#endif
} // namespace std

3
libstdc++-v3/src/future.cc
View File

@ -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