summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2002-07-11 14:50:15 +0000
committerSteve Huston <shuston@riverace.com>2002-07-11 14:50:15 +0000
commit748e1946ceadf7bfb05f0552141673d357bb5195 (patch)
treedeb876f0a4408ac28b9385aaba68ab4603e85034
parent79ee5ef94c017832940dca0bd3eda988adbe235f (diff)
downloadATCD-748e1946ceadf7bfb05f0552141673d357bb5195.tar.gz
ChangeLogTag:Thu Jul 11 10:47:41 2002 Steve Huston <shuston@riverace.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp6
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 420bd87c813..e673f637521 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jul 11 10:47:41 2002 Steve Huston <shuston@riverace.com>
+
+ * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp (svc):
+ In calls the ACE_Thread_Manager::exit() and ACE_OS::thr_exit(),
+ correct argument to be ACE_THR_FUNC_RETURN, not a pointer.
+ Thanks to Johnny Willemsen for pointing this out.
+
Thu Jul 11 09:23:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/RTCORBA/Profile_And_Endpoint_Selection/client.bor:
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index da15b9ad9b3..e2506fc31fa 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -733,12 +733,12 @@ Client::svc (void)
ACE_ENDTRY;
// To avoid a memPartFree on VxWorks. It will leak memory, though.
- int status = 0;
+ ACE_THR_FUNC_RETURN status = 0;
if (thr_mgr ())
- thr_mgr ()->exit (&status, 1);
+ thr_mgr ()->exit (status, 1);
else
- ACE_OS::thr_exit (&status);
+ ACE_OS::thr_exit (status);
return 0;
}