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

libstdc++-v3/ChangeLog

 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.

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

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