summaryrefslogtreecommitdiffstats
path: root/contrib/libc++/include/condition_variable
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2013-04-27 22:47:52 +0000
committerdim <dim@FreeBSD.org>2013-04-27 22:47:52 +0000
commit815a6cc1e325a4e8596b91756039a7d699471b11 (patch)
treee5a6a26d0973c6968273f6fabb61cb3d624be555 /contrib/libc++/include/condition_variable
parent1497a98f71419ff66d08ad2b8c90530e65521ac2 (diff)
downloadFreeBSD-src-815a6cc1e325a4e8596b91756039a7d699471b11.zip
FreeBSD-src-815a6cc1e325a4e8596b91756039a7d699471b11.tar.gz
Merge libc++ trunk r180598. Contains several minor cleanups and bug
fixes, no major changes. MFC after: 2 weeks
Diffstat (limited to 'contrib/libc++/include/condition_variable')
-rw-r--r--contrib/libc++/include/condition_variable4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libc++/include/condition_variable b/contrib/libc++/include/condition_variable
index b1a50ee..dc67266 100644
--- a/contrib/libc++/include/condition_variable
+++ b/contrib/libc++/include/condition_variable
@@ -117,7 +117,7 @@ public:
_LIBCPP_BEGIN_NAMESPACE_STD
-class _LIBCPP_VISIBLE condition_variable_any
+class _LIBCPP_TYPE_VIS condition_variable_any
{
condition_variable __cv_;
shared_ptr<mutex> __mut_;
@@ -248,7 +248,7 @@ condition_variable_any::wait_for(_Lock& __lock,
_VSTD::move(__pred));
}
-_LIBCPP_VISIBLE
+_LIBCPP_FUNC_VIS
void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk);
_LIBCPP_END_NAMESPACE_STD
OpenPOWER on IntegriCloud