2008-05-06 23:11:47 +02:00
|
|
|
// <condition_variable> -*- C++ -*-
|
|
|
|
|
2012-11-15 02:38:17 +01:00
|
|
|
// Copyright (C) 2008-2012 Free Software Foundation, Inc.
|
2008-05-06 23:11:47 +02:00
|
|
|
//
|
|
|
|
// 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
|
|
|
|
// terms of the GNU General Public License as published by the
|
2009-04-09 17:00:19 +02:00
|
|
|
// Free Software Foundation; either version 3, or (at your option)
|
2008-05-06 23:11:47 +02:00
|
|
|
// any later version.
|
|
|
|
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
|
|
// 3.1, as published by the Free Software Foundation.
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2009-04-09 17:00:19 +02:00
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
|
|
// <http://www.gnu.org/licenses/>.
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2010-12-19 10:21:16 +01:00
|
|
|
/** @file include/condition_variable
|
2008-05-06 23:11:47 +02:00
|
|
|
* This is a Standard C++ Library header.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _GLIBCXX_CONDITION_VARIABLE
|
|
|
|
#define _GLIBCXX_CONDITION_VARIABLE 1
|
|
|
|
|
|
|
|
#pragma GCC system_header
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#if __cplusplus < 201103L
|
2010-02-10 20:14:33 +01:00
|
|
|
# include <bits/c++0x_warning.h>
|
2008-05-26 04:19:57 +02:00
|
|
|
#else
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2008-09-03 19:46:09 +02:00
|
|
|
#include <chrono>
|
2008-05-06 23:11:47 +02:00
|
|
|
#include <mutex> // unique_lock
|
|
|
|
|
2008-09-03 19:46:09 +02:00
|
|
|
#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
|
|
|
|
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
namespace std _GLIBCXX_VISIBILITY(default)
|
|
|
|
{
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
2010-11-02 19:51:23 +01:00
|
|
|
|
2009-02-21 01:45:21 +01:00
|
|
|
/**
|
|
|
|
* @defgroup condition_variables Condition Variables
|
|
|
|
* @ingroup concurrency
|
|
|
|
*
|
|
|
|
* Classes for condition_variable support.
|
|
|
|
* @{
|
|
|
|
*/
|
|
|
|
|
2010-01-29 17:59:55 +01:00
|
|
|
/// cv_status
|
|
|
|
enum class cv_status { no_timeout, timeout };
|
|
|
|
|
2008-05-06 23:11:47 +02:00
|
|
|
/// condition_variable
|
|
|
|
class condition_variable
|
|
|
|
{
|
2009-02-10 09:29:57 +01:00
|
|
|
typedef chrono::system_clock __clock_t;
|
|
|
|
typedef __gthread_cond_t __native_type;
|
2011-10-25 01:26:25 +02:00
|
|
|
|
|
|
|
#ifdef __GTHREAD_COND_INIT
|
|
|
|
__native_type _M_cond = __GTHREAD_COND_INIT;
|
|
|
|
#else
|
2009-02-10 09:29:57 +01:00
|
|
|
__native_type _M_cond;
|
2011-10-25 01:26:25 +02:00
|
|
|
#endif
|
2008-09-23 19:34:29 +02:00
|
|
|
|
2008-05-06 23:11:47 +02:00
|
|
|
public:
|
2009-02-10 09:29:57 +01:00
|
|
|
typedef __native_type* native_handle_type;
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2011-10-25 01:26:25 +02:00
|
|
|
condition_variable() noexcept;
|
|
|
|
~condition_variable() noexcept;
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2008-09-03 19:46:09 +02:00
|
|
|
condition_variable(const condition_variable&) = delete;
|
|
|
|
condition_variable& operator=(const condition_variable&) = delete;
|
|
|
|
|
2009-02-13 01:14:42 +01:00
|
|
|
void
|
2011-10-25 01:26:25 +02:00
|
|
|
notify_one() noexcept;
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2009-02-13 01:14:42 +01:00
|
|
|
void
|
2011-10-25 01:26:25 +02:00
|
|
|
notify_all() noexcept;
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2009-02-13 01:14:42 +01:00
|
|
|
void
|
2008-05-06 23:11:47 +02:00
|
|
|
wait(unique_lock<mutex>& __lock);
|
|
|
|
|
|
|
|
template<typename _Predicate>
|
2009-02-13 01:14:42 +01:00
|
|
|
void
|
2008-05-06 23:11:47 +02:00
|
|
|
wait(unique_lock<mutex>& __lock, _Predicate __p)
|
|
|
|
{
|
|
|
|
while (!__p())
|
|
|
|
wait(__lock);
|
|
|
|
}
|
2009-02-13 01:14:42 +01:00
|
|
|
|
2008-09-23 19:34:29 +02:00
|
|
|
template<typename _Duration>
|
2010-01-29 17:59:55 +01:00
|
|
|
cv_status
|
2008-09-23 19:34:29 +02:00
|
|
|
wait_until(unique_lock<mutex>& __lock,
|
|
|
|
const chrono::time_point<__clock_t, _Duration>& __atime)
|
|
|
|
{ return __wait_until_impl(__lock, __atime); }
|
|
|
|
|
|
|
|
template<typename _Clock, typename _Duration>
|
2010-01-29 17:59:55 +01:00
|
|
|
cv_status
|
2008-09-23 19:34:29 +02:00
|
|
|
wait_until(unique_lock<mutex>& __lock,
|
2008-09-03 19:46:09 +02:00
|
|
|
const chrono::time_point<_Clock, _Duration>& __atime)
|
|
|
|
{
|
2008-09-23 19:34:29 +02:00
|
|
|
// DR 887 - Sync unknown clock to known clock.
|
2010-01-29 23:46:31 +01:00
|
|
|
const typename _Clock::time_point __c_entry = _Clock::now();
|
|
|
|
const __clock_t::time_point __s_entry = __clock_t::now();
|
2012-11-15 02:38:17 +01:00
|
|
|
const auto __delta = __atime - __c_entry;
|
|
|
|
const auto __s_atime = __s_entry + __delta;
|
2008-09-03 19:46:09 +02:00
|
|
|
|
2008-09-23 19:34:29 +02:00
|
|
|
return __wait_until_impl(__lock, __s_atime);
|
2008-09-03 19:46:09 +02:00
|
|
|
}
|
2008-07-24 00:17:31 +02:00
|
|
|
|
|
|
|
template<typename _Clock, typename _Duration, typename _Predicate>
|
|
|
|
bool
|
|
|
|
wait_until(unique_lock<mutex>& __lock,
|
|
|
|
const chrono::time_point<_Clock, _Duration>& __atime,
|
2008-09-23 19:34:29 +02:00
|
|
|
_Predicate __p)
|
|
|
|
{
|
2009-02-10 09:29:57 +01:00
|
|
|
while (!__p())
|
2010-01-29 17:59:55 +01:00
|
|
|
if (wait_until(__lock, __atime) == cv_status::timeout)
|
2008-09-23 19:34:29 +02:00
|
|
|
return __p();
|
|
|
|
return true;
|
|
|
|
}
|
2008-07-24 00:17:31 +02:00
|
|
|
|
|
|
|
template<typename _Rep, typename _Period>
|
2010-01-29 17:59:55 +01:00
|
|
|
cv_status
|
2008-07-24 00:17:31 +02:00
|
|
|
wait_for(unique_lock<mutex>& __lock,
|
2008-09-03 19:46:09 +02:00
|
|
|
const chrono::duration<_Rep, _Period>& __rtime)
|
2008-09-23 19:34:29 +02:00
|
|
|
{ return wait_until(__lock, __clock_t::now() + __rtime); }
|
2008-07-24 00:17:31 +02:00
|
|
|
|
|
|
|
template<typename _Rep, typename _Period, typename _Predicate>
|
|
|
|
bool
|
|
|
|
wait_for(unique_lock<mutex>& __lock,
|
|
|
|
const chrono::duration<_Rep, _Period>& __rtime,
|
2008-09-23 19:34:29 +02:00
|
|
|
_Predicate __p)
|
|
|
|
{ return wait_until(__lock, __clock_t::now() + __rtime, std::move(__p)); }
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2009-02-13 01:14:42 +01:00
|
|
|
native_handle_type
|
|
|
|
native_handle()
|
2008-09-03 19:46:09 +02:00
|
|
|
{ return &_M_cond; }
|
2008-05-06 23:11:47 +02:00
|
|
|
|
|
|
|
private:
|
2012-11-15 02:38:17 +01:00
|
|
|
template<typename _Dur>
|
2010-01-29 17:59:55 +01:00
|
|
|
cv_status
|
2008-09-23 19:34:29 +02:00
|
|
|
__wait_until_impl(unique_lock<mutex>& __lock,
|
2012-11-15 02:38:17 +01:00
|
|
|
const chrono::time_point<__clock_t, _Dur>& __atime)
|
2008-09-23 19:34:29 +02:00
|
|
|
{
|
2012-11-15 02:38:17 +01:00
|
|
|
auto __s = chrono::time_point_cast<chrono::seconds>(__atime);
|
|
|
|
auto __ns = chrono::duration_cast<chrono::nanoseconds>(__atime - __s);
|
2009-02-13 01:14:42 +01:00
|
|
|
|
|
|
|
__gthread_time_t __ts =
|
|
|
|
{
|
|
|
|
static_cast<std::time_t>(__s.time_since_epoch().count()),
|
|
|
|
static_cast<long>(__ns.count())
|
|
|
|
};
|
|
|
|
|
|
|
|
__gthread_cond_timedwait(&_M_cond, __lock.mutex()->native_handle(),
|
|
|
|
&__ts);
|
|
|
|
|
2012-11-15 02:38:17 +01:00
|
|
|
return (__clock_t::now() < __atime
|
2010-01-29 17:59:55 +01:00
|
|
|
? cv_status::no_timeout : cv_status::timeout);
|
2008-09-23 19:34:29 +02:00
|
|
|
}
|
2008-05-06 23:11:47 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/// condition_variable_any
|
2010-02-03 21:16:22 +01:00
|
|
|
// Like above, but mutex is not required to have try_lock.
|
2008-05-06 23:11:47 +02:00
|
|
|
class condition_variable_any
|
|
|
|
{
|
2010-02-03 21:16:22 +01:00
|
|
|
typedef chrono::system_clock __clock_t;
|
|
|
|
condition_variable _M_cond;
|
|
|
|
mutex _M_mutex;
|
2009-02-10 09:29:57 +01:00
|
|
|
|
2012-07-05 00:17:18 +02:00
|
|
|
// scoped unlock - unlocks in ctor, re-locks in dtor
|
|
|
|
template<typename _Lock>
|
|
|
|
struct _Unlock
|
|
|
|
{
|
|
|
|
explicit _Unlock(_Lock& __lk) : _M_lock(__lk) { __lk.unlock(); }
|
|
|
|
|
|
|
|
~_Unlock() noexcept(false)
|
|
|
|
{
|
|
|
|
if (uncaught_exception())
|
|
|
|
__try { _M_lock.lock(); } __catch(...) { }
|
|
|
|
else
|
|
|
|
_M_lock.lock();
|
|
|
|
}
|
|
|
|
|
|
|
|
_Unlock(const _Unlock&) = delete;
|
|
|
|
_Unlock& operator=(const _Unlock&) = delete;
|
|
|
|
|
|
|
|
_Lock& _M_lock;
|
|
|
|
};
|
|
|
|
|
2008-05-06 23:11:47 +02:00
|
|
|
public:
|
|
|
|
|
2011-10-25 01:26:25 +02:00
|
|
|
condition_variable_any() noexcept;
|
|
|
|
~condition_variable_any() noexcept;
|
2009-02-13 01:14:42 +01:00
|
|
|
|
2008-09-03 19:46:09 +02:00
|
|
|
condition_variable_any(const condition_variable_any&) = delete;
|
|
|
|
condition_variable_any& operator=(const condition_variable_any&) = delete;
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2009-02-13 01:14:42 +01:00
|
|
|
void
|
2011-10-25 01:26:25 +02:00
|
|
|
notify_one() noexcept
|
2010-02-03 21:16:22 +01:00
|
|
|
{
|
|
|
|
lock_guard<mutex> __lock(_M_mutex);
|
|
|
|
_M_cond.notify_one();
|
|
|
|
}
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2009-02-13 01:14:42 +01:00
|
|
|
void
|
2011-10-25 01:26:25 +02:00
|
|
|
notify_all() noexcept
|
2010-02-03 21:16:22 +01:00
|
|
|
{
|
|
|
|
lock_guard<mutex> __lock(_M_mutex);
|
|
|
|
_M_cond.notify_all();
|
|
|
|
}
|
2008-05-06 23:11:47 +02:00
|
|
|
|
|
|
|
template<typename _Lock>
|
2009-02-13 01:14:42 +01:00
|
|
|
void
|
2010-02-03 21:16:22 +01:00
|
|
|
wait(_Lock& __lock)
|
|
|
|
{
|
2011-10-25 22:56:43 +02:00
|
|
|
unique_lock<mutex> __my_lock(_M_mutex);
|
2012-07-05 00:17:18 +02:00
|
|
|
_Unlock<_Lock> __unlock(__lock);
|
2011-10-25 22:56:43 +02:00
|
|
|
// _M_mutex must be unlocked before re-locking __lock so move
|
|
|
|
// ownership of _M_mutex lock to an object with shorter lifetime.
|
|
|
|
unique_lock<mutex> __my_lock2(std::move(__my_lock));
|
|
|
|
_M_cond.wait(__my_lock2);
|
2010-02-03 21:16:22 +01:00
|
|
|
}
|
|
|
|
|
2008-05-06 23:11:47 +02:00
|
|
|
|
|
|
|
template<typename _Lock, typename _Predicate>
|
2009-02-13 01:14:42 +01:00
|
|
|
void
|
2010-01-29 17:59:55 +01:00
|
|
|
wait(_Lock& __lock, _Predicate __p)
|
|
|
|
{
|
|
|
|
while (!__p())
|
|
|
|
wait(__lock);
|
|
|
|
}
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2008-07-24 00:17:31 +02:00
|
|
|
template<typename _Lock, typename _Clock, typename _Duration>
|
2010-01-29 17:59:55 +01:00
|
|
|
cv_status
|
2008-07-24 00:17:31 +02:00
|
|
|
wait_until(_Lock& __lock,
|
2010-02-03 21:16:22 +01:00
|
|
|
const chrono::time_point<_Clock, _Duration>& __atime)
|
|
|
|
{
|
2012-07-05 00:17:18 +02:00
|
|
|
unique_lock<mutex> __my_lock(_M_mutex);
|
|
|
|
_Unlock<_Lock> __unlock(__lock);
|
|
|
|
// _M_mutex must be unlocked before re-locking __lock so move
|
|
|
|
// ownership of _M_mutex lock to an object with shorter lifetime.
|
|
|
|
unique_lock<mutex> __my_lock2(std::move(__my_lock));
|
|
|
|
return _M_cond.wait_until(__my_lock2, __atime);
|
2010-02-03 21:16:22 +01:00
|
|
|
}
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2009-02-13 01:14:42 +01:00
|
|
|
template<typename _Lock, typename _Clock,
|
2008-07-24 00:17:31 +02:00
|
|
|
typename _Duration, typename _Predicate>
|
2009-02-13 01:14:42 +01:00
|
|
|
bool
|
2008-07-24 00:17:31 +02:00
|
|
|
wait_until(_Lock& __lock,
|
|
|
|
const chrono::time_point<_Clock, _Duration>& __atime,
|
2010-01-29 17:59:55 +01:00
|
|
|
_Predicate __p)
|
|
|
|
{
|
|
|
|
while (!__p())
|
|
|
|
if (wait_until(__lock, __atime) == cv_status::timeout)
|
|
|
|
return __p();
|
|
|
|
return true;
|
|
|
|
}
|
2009-02-13 01:14:42 +01:00
|
|
|
|
2008-07-24 00:17:31 +02:00
|
|
|
template<typename _Lock, typename _Rep, typename _Period>
|
2010-01-29 17:59:55 +01:00
|
|
|
cv_status
|
2010-02-03 21:16:22 +01:00
|
|
|
wait_for(_Lock& __lock, const chrono::duration<_Rep, _Period>& __rtime)
|
|
|
|
{ return wait_until(__lock, __clock_t::now() + __rtime); }
|
2008-07-24 00:17:31 +02:00
|
|
|
|
|
|
|
template<typename _Lock, typename _Rep,
|
|
|
|
typename _Period, typename _Predicate>
|
|
|
|
bool
|
2009-02-13 01:14:42 +01:00
|
|
|
wait_for(_Lock& __lock,
|
2010-02-03 21:16:22 +01:00
|
|
|
const chrono::duration<_Rep, _Period>& __rtime, _Predicate __p)
|
|
|
|
{ return wait_until(__lock, __clock_t::now() + __rtime, std::move(__p)); }
|
2008-05-06 23:11:47 +02:00
|
|
|
};
|
2009-02-21 01:45:21 +01:00
|
|
|
|
|
|
|
// @} group condition_variables
|
PR libstdc++/36104 part four
2011-01-30 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/36104 part four
* include/bits/c++config (_GLIBCXX_STD): Remove.
(_GLIBCXX_STD_D, _GLIBCXX_PR): Now _GLIBCXX_STD_C.
(_GLIBCXX_P): Now _GLIBCXX_STD_A.
(_GLIBCXX_NAMESPACE_DEBUG, _GLIBCXX_NAMESPACE_PARALLEL,
_GLIBCXX_NAMESPACE_PROFILE, _GLIBCXX_NAMESPACE_VERSION): Remove.
(_GLIBCXX_INLINE_DEBUG, _GLIBCXX_INLINE_PARALLEL,
_GLIBCXX_INLINE_PROFILE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE(X)): Remove.
(_GLIBCXX_END_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NESTED_NAMESPACE(X, Y)): Remove.
(_GLIBCXX_END_NESTED_NAMESPACE): Remove.
(_GLIBCXX_BEGIN_NAMESPACE_ALGO): Add.
(_GLIBCXX_END_NAMESPACE_ALGO): Add.
(_GLIBCXX_BEGIN_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_END_NAMESPACE_CONTAINER): Add.
(_GLIBCXX_BEGIN_NAMESPACE_VERSION): Add.
(_GLIBCXX_END_NAMESPACE_VERSION): Add.
(_GLIBCXX_BEGIN_LDBL_NAMESPACE): To _GLIBCXX_BEGIN_NAMESPACE_LDBL.
(_GLIBCXX_END_LDBL_NAMESPACE): To _GLIBCXX_END_NAMESPACE_LDBL.
(_GLIBCXX_VISIBILITY_ATTR): Revert to _GLIBCXX_VISIBILITY.
* include/*: Use new macros for namespace scope.
* config/*: Same.
* src/*: Same.
* src/Makefile.am (sources): Remove debug_list.cc, add
compatibility-debug_list-2.cc.
(parallel_sources): Remove parallel_list.cc, add
compatibility-parallel_list-2.cc.
(compatibility-parallel_list-2.[o,lo]): New rule.
* src/Makefile.in: Regenerate.
* src/debug_list.cc: Remove.
* src/parallel_list.cc: Remove.
* src/compatibility-list-2.cc: New.
* src/compatibility-debug_list-2.cc: New.
* src/compatibility-parallel_list-2.cc: New.
* doc/doxygen/user.cfg.in: Adjust macros.
* testsuite/20_util/auto_ptr/assign_neg.cc: Adjust line numbers, macros.
* testsuite/20_util/declval/requirements/1_neg.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg2.cc: Same.
* testsuite/20_util/duration/requirements/typedefs_neg3.cc: Same.
* testsuite/20_util/forward/c_neg.cc: Same.
* testsuite/20_util/forward/f_neg.cc: Same.
* testsuite/20_util/make_signed/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc: Same.
* testsuite/20_util/ratio/cons/cons_overflow_neg.cc: Same.
* testsuite/20_util/ratio/operations/ops_overflow_neg.cc: Same.
* testsuite/20_util/shared_ptr/cons/43820_neg.cc: Same.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/forward_list/capacity/1.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
assign_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/forward_list/requirements/dr438/
insert_neg.cc: Same.
* testsuite/23_containers/list/capacity/29134.cc: Same.
* testsuite/23_containers/list/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/list/requirements/dr438/insert_neg.cc: Same.
* testsuite/23_containers/vector/bool/capacity/29134.cc: Same.
* testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/assign_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_1_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/
constructor_2_neg.cc: Same.
* testsuite/23_containers/vector/requirements/dr438/insert_neg.cc: Same.
* testsuite/25_algorithms/sort/35588.cc: Same.
* testsuite/27_io/ios_base/cons/assign_neg.cc: Same.
* testsuite/27_io/ios_base/cons/copy_neg.cc: Same.
* testsuite/ext/profile/mutex_extensions_neg.cc: Same.
* testsuite/ext/profile/profiler_algos.cc: Same.
* testsuite/ext/type_traits/add_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/add_unsigned_integer_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_floating_neg.cc: Same.
* testsuite/ext/type_traits/remove_unsigned_integer_neg.cc: Same.
* testsuite/tr1/2_general_utilities/shared_ptr/cons/43820_neg.cc: Same.
From-SVN: r169421
2011-01-30 23:39:36 +01:00
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
|
|
} // namespace
|
2008-05-06 23:11:47 +02:00
|
|
|
|
2008-09-03 19:46:09 +02:00
|
|
|
#endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
|
|
|
|
|
2012-11-10 18:27:22 +01:00
|
|
|
#endif // C++11
|
2008-05-26 04:19:57 +02:00
|
|
|
|
|
|
|
#endif // _GLIBCXX_CONDITION_VARIABLE
|