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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1c4be426a26d98fe878b605871937fe9f39f9a94..f38927fe5c42b64892408ddf712aa239dbff7ac3 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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.

diff --git a/libstdc++-v3/libsupc++/nested_exception.cc b/libstdc++-v3/libsupc++/nested_exception.cc
index 876e8e00aa137c854b9d14133f327b3ddf506942..ecbc4c81158cffe43f4162b4beed609324384d09 100644 (file)
--- 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 d2bc3237019dbed5e93812ac28b47ebeb4631fc3..d6149cbbf6df2ec8528bc04f9b28a1527ab13dab 100644 (file)
--- 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