aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2010-02-11 14:00:13 -0500
committerJason Merrill <jason@gcc.gnu.org>2010-02-11 14:00:13 -0500
commit4094aee8bf71ddd667f7f2c96534ac9af2ab0679 (patch)
tree23be8fe514c97c2f780d1c7283966fec501a908d
parent932b650839a319e0f4236d74252cad0bd0b017b2 (diff)
downloadgcc-4094aee8bf71ddd667f7f2c96534ac9af2ab0679.zip
gcc-4094aee8bf71ddd667f7f2c96534ac9af2ab0679.tar.gz
gcc-4094aee8bf71ddd667f7f2c96534ac9af2ab0679.tar.bz2
thread (~_Impl_base): Declare inline.
* include/std/thread (~_Impl_base): Declare inline. * libsupc++/nested_exception.h (~nested_exception): Likewise. From-SVN: r156707
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/std/thread2
-rw-r--r--libstdc++-v3/libsupc++/nested_exception.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a571531..560303f 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-11 Jason Merrill <jason@redhat.com>
+
+ * include/std/thread (~_Impl_base): Declare inline.
+ * libsupc++/nested_exception.h (~nested_exception): Likewise.
+
2010-02-11 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/41975, DR 579
diff --git a/libstdc++-v3/include/std/thread b/libstdc++-v3/include/std/thread
index 628c34a..f72f5e5 100644
--- a/libstdc++-v3/include/std/thread
+++ b/libstdc++-v3/include/std/thread
@@ -97,7 +97,7 @@ namespace std
{
__shared_base_type _M_this_ptr;
- virtual ~_Impl_base();
+ inline virtual ~_Impl_base();
virtual void _M_run() = 0;
};
diff --git a/libstdc++-v3/libsupc++/nested_exception.h b/libstdc++-v3/libsupc++/nested_exception.h
index 713c334..9fc2f8a 100644
--- a/libstdc++-v3/libsupc++/nested_exception.h
+++ b/libstdc++-v3/libsupc++/nested_exception.h
@@ -63,7 +63,7 @@ namespace std
nested_exception& operator=(const nested_exception&) = default;
- virtual ~nested_exception();
+ inline virtual ~nested_exception();
void
rethrow_nested() const __attribute__ ((__noreturn__))