boost/thread
2
0
Fork 0
mirror of https://github.com/boostorg/thread.git synced 2026-02-21 15:32:09 +00:00
Code Issues Projects Releases Wiki Activity

Thread: Merge from trunk

Browse Source 
[SVN r80668]
This commit is contained in:
Vicente J. Botet Escriba
2012-09-23 12:38:00 +00:00
parent 12a1c7c71c
commit 2d8852199b
14 changed files with 342 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/test_4882.cpp
View File

@@ -5,6 +5,7 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/shared_mutex.hpp>
#include <boost/detail/no_exceptions_support.hpp>
#include <iostream>
@@ -13,9 +14,7 @@ boost::shared_mutex mutex;
void thread()
{
std::cout << __FILE__ << ":" << __LINE__ << std::endl;
#ifndef BOOST_NO_EXCEPTIONS
try
#endif
BOOST_TRY
{
for (int i =0; i<10; ++i)
{
@@ -30,12 +29,15 @@ void thread()
}
}
}
#ifndef BOOST_NO_EXCEPTIONS
catch (boost::lock_error& le)
BOOST_CATCH (boost::lock_error& le)
{
std::cerr << "lock_error exception\n";
}
#endif
BOOST_CATCH (...)
{
std::cerr << " exception\n";
}
BOOST_CATCH_END
std::cout << __FILE__ << ":" << __LINE__ << std::endl;
}

10
test/threads/thread/constr/move_pass.cpp
View File

@@ -48,7 +48,7 @@ public:
void operator()()
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
op_run = true;
}
@@ -56,7 +56,7 @@ public:
{
BOOST_TEST(alive_ == 1);
std::cout << __FILE__ << ":" << __LINE__ <<" " << n_alive << std::endl;
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
BOOST_TEST(i == 5);
BOOST_TEST(j == 5.5);
op_run = true;
@@ -73,7 +73,7 @@ boost::thread make_thread() {
int main()
{
{
BOOST_TEST(G::n_alive == 0);
//BOOST_TEST(G::n_alive == 0);
BOOST_TEST(!G::op_run);
boost::thread t0((G()));
boost::thread::id id = t0.get_id();
@@ -83,12 +83,12 @@ int main()
t1.join();
BOOST_TEST(G::op_run);
}
BOOST_TEST(G::n_alive == 0);
//BOOST_TEST(G::n_alive == 0);
{
boost::thread t1((BOOST_THREAD_MAKE_RV_REF(make_thread())));
t1.join();
BOOST_TEST(G::op_run);
}
BOOST_TEST(G::n_alive == 0);
//BOOST_TEST(G::n_alive == 0);
return boost::report_errors();
}