minor update.

8 files changed, 14 insertions, 16 deletions

diff --git a/cpp/test/IceUtil/thread/.depend b/cpp/test/IceUtil/thread/.depend
index 26e721f75a9..63de77efacc 100644
--- a/cpp/test/IceUtil/thread/.depend
+++ b/cpp/test/IceUtil/thread/.depend
@@ -1,9 +1,9 @@
-TestBase.o: TestBase.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h TestBase.h
-CreateTest.o: CreateTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h CreateTest.h TestBase.h ../../include/TestCommon.h
-RWRecMutexTest.o: RWRecMutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h RWRecMutexTest.h TestBase.h ../../include/TestCommon.h
-RecMutexTest.o: RecMutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h RecMutexTest.h TestBase.h ../../include/TestCommon.h
-MutexTest.o: MutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h MutexTest.h TestBase.h ../../include/TestCommon.h
-MonitorMutexTest.o: MonitorMutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h MonitorMutexTest.h TestBase.h ../../include/TestCommon.h
-MonitorRecMutexTest.o: MonitorRecMutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h MonitorRecMutexTest.h TestBase.h ../../include/TestCommon.h
+TestBase.o: TestBase.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h TestBase.h
+CreateTest.o: CreateTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h CreateTest.h TestBase.h ../../include/TestCommon.h
+RWRecMutexTest.o: RWRecMutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h RWRecMutexTest.h TestBase.h ../../include/TestCommon.h
+RecMutexTest.o: RecMutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h RecMutexTest.h TestBase.h ../../include/TestCommon.h
+MutexTest.o: MutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h MutexTest.h TestBase.h ../../include/TestCommon.h
+MonitorMutexTest.o: MonitorMutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h MonitorMutexTest.h TestBase.h ../../include/TestCommon.h
+MonitorRecMutexTest.o: MonitorRecMutexTest.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h MonitorRecMutexTest.h TestBase.h ../../include/TestCommon.h
 TestSuite.o: TestSuite.cpp TestSuite.h TestBase.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h MutexTest.h RecMutexTest.h RWRecMutexTest.h CreateTest.h MonitorMutexTest.h MonitorRecMutexTest.h
-Client.o: Client.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Base64.h ../../include/TestCommon.h TestSuite.h TestBase.h
+Client.o: Client.cpp ../../../include/IceUtil/IceUtil.h ../../../include/IceUtil/Functional.h ../../../include/IceUtil/Handle.h ../../../include/IceUtil/Exception.h ../../../include/IceUtil/Config.h ../../../include/IceUtil/Shared.h ../../../include/IceUtil/Unicode.h ../../../include/IceUtil/UUID.h ../../../include/IceUtil/Mutex.h ../../../include/IceUtil/Lock.h ../../../include/IceUtil/RecMutex.h ../../../include/IceUtil/RWRecMutex.h ../../../include/IceUtil/Cond.h ../../../include/IceUtil/Thread.h ../../../include/IceUtil/Monitor.h ../../../include/IceUtil/Base64.h ../../include/TestCommon.h TestSuite.h TestBase.h
diff --git a/cpp/test/IceUtil/thread/CreateTest.cpp b/cpp/test/IceUtil/thread/CreateTest.cpp
index b63194a5c87..fb91e8e8b89 100644
--- a/cpp/test/IceUtil/thread/CreateTest.cpp
+++ b/cpp/test/IceUtil/thread/CreateTest.cpp
@@ -18,7 +18,7 @@
 using namespace std;
 using namespace IceUtil;
 
-static const std::string createTestName("thread create");
+static const string createTestName("thread create");
 
 class CreateTestThread : public Thread
 {
diff --git a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
index 0fc6e0eb857..415acfa0ba0 100644
--- a/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorMutexTest.cpp
@@ -93,7 +93,7 @@ private:
 
 typedef Handle<MonitorMutexTestThread2> MonitorMutexTestThread2Ptr;
 
-static const std::string monitorMutexTestName("monitor<mutex>");
+static const string monitorMutexTestName("monitor<mutex>");
 
 MonitorMutexTest::MonitorMutexTest() :
     TestBase(monitorMutexTestName)
diff --git a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
index 6667521610f..ce9264aca63 100644
--- a/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MonitorRecMutexTest.cpp
@@ -93,7 +93,7 @@ private:
 
 typedef Handle<MonitorRecMutexTestThread2> MonitorRecMutexTestThread2Ptr;
 
-static const std::string monitorRecMutexTestName("monitor<recmutex>");
+static const string monitorRecMutexTestName("monitor<recmutex>");
 
 MonitorRecMutexTest::MonitorRecMutexTest() :
     TestBase(monitorRecMutexTestName)
diff --git a/cpp/test/IceUtil/thread/MutexTest.cpp b/cpp/test/IceUtil/thread/MutexTest.cpp
index 1443dfeaa87..33e131c42a1 100644
--- a/cpp/test/IceUtil/thread/MutexTest.cpp
+++ b/cpp/test/IceUtil/thread/MutexTest.cpp
@@ -16,7 +16,7 @@
 using namespace std;
 using namespace IceUtil;
 
-static const std::string mutexTestName("mutex");
+static const string mutexTestName("mutex");
 
 class MutexTestThread : public Thread
 {
diff --git a/cpp/test/IceUtil/thread/RecMutexTest.cpp b/cpp/test/IceUtil/thread/RecMutexTest.cpp
index a66c1efe1bf..1a95c4e3f44 100644
--- a/cpp/test/IceUtil/thread/RecMutexTest.cpp
+++ b/cpp/test/IceUtil/thread/RecMutexTest.cpp
@@ -16,7 +16,7 @@
 using namespace std;
 using namespace IceUtil;
 
-static const std::string recMutexTestName("recursive mutex");
+static const string recMutexTestName("recursive mutex");
 
 class RecMutexTestThread : public Thread
 {
diff --git a/cpp/test/IceUtil/thread/TestBase.h b/cpp/test/IceUtil/thread/TestBase.h
index 5141e6887da..27a8032a6f5 100644
--- a/cpp/test/IceUtil/thread/TestBase.h
+++ b/cpp/test/IceUtil/thread/TestBase.h
@@ -11,8 +11,6 @@
 #ifndef TEST_BASE_H
 #define TEST_BASE_H
 
-//#include <string>
-
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
 
diff --git a/cpp/test/IceUtil/thread/TestSuite.cpp b/cpp/test/IceUtil/thread/TestSuite.cpp
index 4bf0407db6c..8bcd8a8f029 100644
--- a/cpp/test/IceUtil/thread/TestSuite.cpp
+++ b/cpp/test/IceUtil/thread/TestSuite.cpp
@@ -21,7 +21,7 @@ std::list<TestBasePtr> allTests;
 void
 initializeTestSuite()
 {
-    //allTests.push_back(new CreateTest);
+    allTests.push_back(new CreateTest);
     allTests.push_back(new MutexTest);
     allTests.push_back(new RecMutexTest);
     allTests.push_back(new RWRecMutexTest);