[Boost-commit] svn:boost r85059 - trunk/libs/circular_buffer/test

Subject: [Boost-commit] svn:boost r85059 - trunk/libs/circular_buffer/test
From: antoshkka_at_[hidden]
Date: 2013-07-17 10:09:32

Author: apolukhin
Date: 2013-07-17 10:09:32 EDT (Wed, 17 Jul 2013)
New Revision: 85059
URL: http://svn.boost.org/trac/boost/changeset/85059

Log:
Fix errors in circular_buffer tests(refs #7888).

Text files modified: 
   trunk/libs/circular_buffer/test/bounded_buffer_comparison.cpp |    18 +++++++++---------                      
   trunk/libs/circular_buffer/test/common.ipp                    |     6 ++++++                                  
   2 files changed, 15 insertions(+), 9 deletions(-)

Modified: trunk/libs/circular_buffer/test/bounded_buffer_comparison.cpp
==============================================================================
--- trunk/libs/circular_buffer/test/bounded_buffer_comparison.cpp	Wed Jul 17 10:09:07 2013	(r85058)
+++ trunk/libs/circular_buffer/test/bounded_buffer_comparison.cpp	2013-07-17 10:09:32 EDT (Wed, 17 Jul 2013)	(r85059)
@@ -11,7 +11,7 @@
 
 #include <boost/circular_buffer.hpp>
 #include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
+#include <boost/thread/condition_variable.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/call_traits.hpp>
 #include <boost/progress.hpp>
@@ -62,8 +62,8 @@
     size_type m_unread;
     container_type m_container;
     boost::mutex m_mutex;
-    boost::condition m_not_empty;
-    boost::condition m_not_full;
+    boost::condition_variable m_not_empty;
+    boost::condition_variable m_not_full;
 };
 
 template <class T>
@@ -104,8 +104,8 @@
 
     container_type m_container;
     boost::mutex m_mutex;
-    boost::condition m_not_empty;
-    boost::condition m_not_full;
+    boost::condition_variable m_not_empty;
+    boost::condition_variable m_not_full;
 };
 
 template <class T>
@@ -147,8 +147,8 @@
     const size_type m_capacity;
     container_type m_container;
     boost::mutex m_mutex;
-    boost::condition m_not_empty;
-    boost::condition m_not_full;
+    boost::condition_variable m_not_empty;
+    boost::condition_variable m_not_full;
 };
 
 template <class T>
@@ -190,8 +190,8 @@
     const size_type m_capacity;
     container_type m_container;
     boost::mutex m_mutex;
-    boost::condition m_not_empty;
-    boost::condition m_not_full;
+    boost::condition_variable m_not_empty;
+    boost::condition_variable m_not_full;
 };
 
 template<class Buffer>

Modified: trunk/libs/circular_buffer/test/common.ipp
==============================================================================
--- trunk/libs/circular_buffer/test/common.ipp	Wed Jul 17 10:09:07 2013	(r85058)
+++ trunk/libs/circular_buffer/test/common.ipp	2013-07-17 10:09:32 EDT (Wed, 17 Jul 2013)	(r85059)
@@ -2292,7 +2292,13 @@
 
 void check_containers_exception_specifications() {
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+
+#ifndef BOOST_CLANG
+    // Clang has an error in __has_nothrow_constructor implementation:
+    // http://llvm.org/bugs/show_bug.cgi?id=16627 
     BOOST_CHECK(boost::is_nothrow_move_constructible<CB_CONTAINER<int> >::value);
+#endif
+
     BOOST_CHECK(boost::is_nothrow_move_assignable<CB_CONTAINER<int> >::value);
     BOOST_CHECK(boost::has_nothrow_constructor<CB_CONTAINER<int> >::value);
 #endif