2
0
mirror of https://github.com/boostorg/thread.git synced 2026-02-21 15:32:09 +00:00

Thread: merge 82459,82457,82456,82455

[SVN r82491]
This commit is contained in:
Vicente J. Botet Escriba
2013-01-14 17:17:50 +00:00
parent e160cf0254
commit ce46c31555
19 changed files with 80 additions and 52 deletions

View File

@@ -49,7 +49,7 @@ public:
void operator()()
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
op_run = true;
}

View File

@@ -52,7 +52,7 @@ public:
void operator()()
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
op_run = true;
}

View File

@@ -84,7 +84,7 @@ public:
void operator()(int i, double j)
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive >= 1);
//BOOST_TEST(n_alive >= 1);
BOOST_TEST(i == 5);
BOOST_TEST(j == 5.5);
op_run = true;

View File

@@ -82,7 +82,7 @@ public:
void operator()()
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive >= 1);
//BOOST_TEST(n_alive >= 1);
op_run = true;
}

View File

@@ -49,14 +49,14 @@ public:
void operator()()
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
op_run = true;
}
void operator()(int i, double j)
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
BOOST_TEST(i == 5);
BOOST_TEST(j == 5.5);
op_run = true;

View File

@@ -50,7 +50,7 @@ public:
void operator()()
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
op_run = true;
}
};

View File

@@ -49,7 +49,7 @@ public:
void operator()()
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
op_run = true;
}
};

View File

@@ -49,7 +49,7 @@ public:
void operator()()
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
op_run = true;
}
};

View File

@@ -88,7 +88,7 @@ int main()
{
boost::thread t0( (G()));
BOOST_TEST(t0.joinable());
BOOST_TEST(t0.try_join_for(boost::chrono::milliseconds(50)));
BOOST_TEST(t0.try_join_for(boost::chrono::milliseconds(150)));
BOOST_TEST(!t0.joinable());
}
{

View File

@@ -89,7 +89,7 @@ int main()
{
boost::thread t0( (G()));
BOOST_TEST(t0.joinable());
t0.try_join_until(boost::chrono::steady_clock::now()+boost::chrono::milliseconds(50));
t0.try_join_until(boost::chrono::steady_clock::now()+boost::chrono::milliseconds(150));
BOOST_TEST(!t0.joinable());
}
{
@@ -141,7 +141,7 @@ int main()
{
boost::thread t0( (G()));
BOOST_TEST(t0.joinable());
t0.try_join_until(boost::chrono::steady_clock::now()+boost::chrono::milliseconds(50));
t0.try_join_until(boost::chrono::steady_clock::now()+boost::chrono::milliseconds(150));
try
{
t0.join();

View File

@@ -47,7 +47,7 @@ public:
void operator()()
{
BOOST_TEST(alive_ == 1);
BOOST_TEST(n_alive == 1);
//BOOST_TEST(n_alive == 1);
op_run = true;
}
};