From: Benjamin Kosnik <bkoz@redhat.com>
Date: Tue, 15 Mar 2011 06:19:08 +0000 (+0000)
Subject: re PR libstdc++/48130 (build fails on libsupc++/nested_exception.cc)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d2e205e3460f91bc6da4919f0894a44effbaf99;p=gcc.git

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 1c4be426a26..f38927fe5c4 100644
--- 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 876e8e00aa1..ecbc4c81158 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 d2bc3237019..d6149cbbf6d 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