Skip to content

D
dlib
Commit 24698f87 authored by Davis King's avatar Davis King
Browse files
Options

changed test to avoid compiler error in gcc 4.8

parent 3406a290
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 11 deletions
dlib/test/multithreaded_object.cpp
View file @ 24698f87
...@@ -183,18 +183,26 @@ namespace ...@@ -183,18 +183,26 @@ namespace
DLIB_TEST(is_running() == false); DLIB_TEST(is_running() == false);
} }
~test4_c2() throw (std::exception) ~test4_c2()
{ {
DLIB_TEST(number_of_threads_registered() == 2); try
DLIB_TEST(number_of_threads_alive() == 2); {
DLIB_TEST_MSG(is_running() == false,"is_running(): " << is_running()); DLIB_TEST(number_of_threads_registered() == 2);
stop(); DLIB_TEST(number_of_threads_alive() == 2);
DLIB_TEST(number_of_threads_registered() == 2); DLIB_TEST_MSG(is_running() == false,"is_running(): " << is_running());
DLIB_TEST(is_running() == false); stop();
wait(); DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_registered() == 2); DLIB_TEST(is_running() == false);
DLIB_TEST(number_of_threads_alive() == 0); wait();
DLIB_TEST(is_running() == false); DLIB_TEST(number_of_threads_registered() == 2);
DLIB_TEST(number_of_threads_alive() == 0);
DLIB_TEST(is_running() == false);
}
catch(std::exception& e)
{
std::cerr << e.what() << std::endl;
exit(1);
}
} }
private: private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment