From 815a6cc1e325a4e8596b91756039a7d699471b11 Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Sat, 27 Apr 2013 22:47:52 +0000
Subject: Merge libc++ trunk r180598.  Contains several minor cleanups and bug
 fixes, no major changes.

MFC after:	2 weeks
---
 contrib/libc++/include/condition_variable | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'contrib/libc++/include/condition_variable')

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
-- 
cgit v1.1