aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/src
diff options
context:
space:
mode:
authorDavid Adler <d.adler.s@gmail.com>2012-08-13 19:56:50 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2012-08-13 20:56:50 +0100
commit2942db6337e4982a520f596554c9ae409afc69af (patch)
tree3acdeb48ee81a3d57e4d44a6da604f2a8cb4d082 /libstdc++-v3/src
parent181a5a136f5b7e1690e94591d608c851bca19451 (diff)
downloadgcc-2942db6337e4982a520f596554c9ae409afc69af.zip
gcc-2942db6337e4982a520f596554c9ae409afc69af.tar.gz
gcc-2942db6337e4982a520f596554c9ae409afc69af.tar.bz2
re PR libstdc++/54185 (condition_variable not properly destructed)
2012-08-13 David Adler <d.adler.s@gmail.com> PR libstdc++/54185 * src/c++11/condition_variable.cc (condition_variable): Always destroy native type in destructor. * testsuite/30_threads/condition_variable/54185.cc: New. From-SVN: r190356
Diffstat (limited to 'libstdc++-v3/src')
-rw-r--r--libstdc++-v3/src/c++11/condition_variable.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/libstdc++-v3/src/c++11/condition_variable.cc b/libstdc++-v3/src/c++11/condition_variable.cc
index 9cd0763..001d95c 100644
--- a/libstdc++-v3/src/c++11/condition_variable.cc
+++ b/libstdc++-v3/src/c++11/condition_variable.cc
@@ -1,6 +1,6 @@
// condition_variable -*- C++ -*-
-// Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+// Copyright (C) 2008-2012 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -32,12 +32,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#ifdef __GTHREAD_COND_INIT
condition_variable::condition_variable() noexcept = default;
- condition_variable::~condition_variable() noexcept = default;
#else
condition_variable::condition_variable() noexcept
{
__GTHREAD_COND_INIT_FUNCTION(&_M_cond);
}
+#endif
condition_variable::~condition_variable() noexcept
{
@@ -45,7 +45,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/* int __e = */ __gthread_cond_destroy(&_M_cond);
// if __e == EBUSY then blocked
}
-#endif
void
condition_variable::wait(unique_lock<mutex>& __lock)