|
From: <sv...@va...> - 2009-06-04 09:11:34
|
Author: bart
Date: 2009-06-04 10:11:28 +0100 (Thu, 04 Jun 2009)
New Revision: 10241
Log:
tsan_unittest.cpp does now compile cleanly even with -Wshadown enabled.
Modified:
trunk/drd/tests/Makefile.am
trunk/drd/tests/tsan_unittest.cpp
Modified: trunk/drd/tests/Makefile.am
===================================================================
--- trunk/drd/tests/Makefile.am 2009-06-04 02:25:39 UTC (rev 10240)
+++ trunk/drd/tests/Makefile.am 2009-06-04 09:11:28 UTC (rev 10241)
@@ -293,8 +293,7 @@
tsan_unittest_SOURCES = tsan_unittest.cpp
tsan_unittest_CXXFLAGS = $(AM_CXXFLAGS) \
- -DTHREAD_WRAPPERS='"tsan_thread_wrappers_pthread.h"' \
- -Wno-sign-compare -Wno-shadow
+ -DTHREAD_WRAPPERS='"tsan_thread_wrappers_pthread.h"'
if HAVE_BOOST_1_35
boost_thread_SOURCES = boost_thread.cpp
Modified: trunk/drd/tests/tsan_unittest.cpp
===================================================================
--- trunk/drd/tests/tsan_unittest.cpp 2009-06-04 02:25:39 UTC (rev 10240)
+++ trunk/drd/tests/tsan_unittest.cpp 2009-06-04 09:11:28 UTC (rev 10241)
@@ -1691,7 +1691,7 @@
std::vector<MyThread*> vec(Nlog);
- for (int i = 0; i < N_iter; i++) {
+ for (int j = 0; j < N_iter; j++) {
// Create and start Nlog threads
for (int i = 0; i < Nlog; i++) {
vec[i] = new MyThread(Worker);
@@ -5413,11 +5413,11 @@
// do few more random publishes.
for (int i = 0; i < 20; i++) {
- int beg = rand() % N;
- int size = (rand() % (N - beg)) + 1;
+ const int begin = rand() % N;
+ const int size = (rand() % (N - begin)) + 1;
CHECK(size > 0);
- CHECK(beg + size <= N);
- PublishRange(beg, beg + size);
+ CHECK(begin + size <= N);
+ PublishRange(begin, begin + size);
}
printf("GLOB = %d\n", (int)GLOB[0]);
|