Commit 2d5e3740 by Jonathan Wakely Committed by Jonathan Wakely

Rename shadowed variable in libstdc++ test.

	* testsuite/30_threads/timed_mutex/try_lock_until/57641.cc: Rename
	shadowed variable.

From-SVN: r227519
parent d8356196
2015-09-07 Jonathan Wakely <jwakely@redhat.com> 2015-09-07 Jonathan Wakely <jwakely@redhat.com>
* testsuite/30_threads/timed_mutex/try_lock_until/57641.cc: Rename
shadowed variable.
* testsuite/30_threads/recursive_timed_mutex/unlock/2.cc: Run on * testsuite/30_threads/recursive_timed_mutex/unlock/2.cc: Run on
darwin. darwin.
* testsuite/30_threads/timed_mutex/unlock/2.cc: Run on darwin. * testsuite/30_threads/timed_mutex/unlock/2.cc: Run on darwin.
......
...@@ -48,21 +48,21 @@ struct clock ...@@ -48,21 +48,21 @@ struct clock
}; };
std::timed_mutex mx; std::timed_mutex mx;
bool test = false; bool locked = false;
void f() void f()
{ {
test = mx.try_lock_until(clock::now() + C::milliseconds(1)); locked = mx.try_lock_until(clock::now() + C::milliseconds(1));
} }
int main() int main()
{ {
bool test = false; bool test __attribute__((unused)) = true;
std::lock_guard<std::timed_mutex> l(mx); std::lock_guard<std::timed_mutex> l(mx);
auto start = C::system_clock::now(); auto start = C::system_clock::now();
std::thread t(f); std::thread t(f);
t.join(); t.join();
auto stop = C::system_clock::now(); auto stop = C::system_clock::now();
VERIFY( (stop - start) < C::seconds(9) ); VERIFY( (stop - start) < C::seconds(9) );
VERIFY( !test ); VERIFY( !locked );
} }
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