Patchwork [v3] typeinfo tuning

login
register
mail settings
Submitter Benjamin Kosnik
Date March 15, 2011, 5:40 a.m.
Message ID <20110314224009.57bf58bb@shotwell>
Download mbox | patch
Permalink /patch/86878/
State New
Headers show

Comments

Benjamin Kosnik - March 15, 2011, 5:40 a.m.
> It broke build, hopefully for trivial reasons.  It seems like
> your bugzilla options are set to not receive email, so I'll have
> to bug you like this, and ask that you please have a look at
> PR48130.

No problem. Sorry about the breakage. Indeed, it was trivial. 

> > tested x86_64/linux  

tested x86/64, compiled arm-eabi

-benjamin

Patch

2011-03-14  Benjamin Kosnik  <bkoz@redhat.com>

        PR libstdc++/48130
        * src/future.cc: Guard definitions.
        * libsupc++/nested_exception.cc: Same.


Index: src/future.cc
===================================================================
--- src/future.cc	(revision 170978)
+++ src/future.cc	(working copy)
@@ -79,11 +79,14 @@ 
   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
Index: libsupc++/nested_exception.cc
===================================================================
--- libsupc++/nested_exception.cc	(revision 170978)
+++ libsupc++/nested_exception.cc	(working copy)
@@ -25,5 +25,7 @@ 
 
 namespace std 
 {
+#ifdef _GLIBCXX_ATOMIC_BUILTINS_4
   nested_exception::~nested_exception() = default;
+#endif
 } // namespace std