summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2002-09-18 17:28:15 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2002-09-18 17:28:15 +0000
commit350a0a2fd8f6f971483c88c4688e001ce0371cba (patch)
treeb82718ef31322d261721208df4dcd48c5838c8f5
parentd3a76febe82f281b04a529a3caffda09d83600e3 (diff)
downloadATCD-350a0a2fd8f6f971483c88c4688e001ce0371cba.tar.gz
ChangeLogTag:Wed Sep 18 12:26:22 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--THANKS1
-rw-r--r--ace/Process_Manager.h1
-rw-r--r--examples/Misc/test_trace.cpp2
5 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 339695380c1..40c7e3de811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 18 12:26:22 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
+
+ * examples/Misc/test_trace.cpp: The call to activate() was
+ being invoked with the parameters in the wrong order. Thanks to
+ Jeff W <jeffw_1234@yahoo.com> for reporting this.
+
Tue Sep 17 17:26:40 2002 Ossama Othman <ossama@uci.edu>
* ace/Basic_Types.cpp:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 339695380c1..40c7e3de811 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Wed Sep 18 12:26:22 2002 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
+
+ * examples/Misc/test_trace.cpp: The call to activate() was
+ being invoked with the parameters in the wrong order. Thanks to
+ Jeff W <jeffw_1234@yahoo.com> for reporting this.
+
Tue Sep 17 17:26:40 2002 Ossama Othman <ossama@uci.edu>
* ace/Basic_Types.cpp:
diff --git a/THANKS b/THANKS
index 50808039e2c..f7bd6d69c97 100644
--- a/THANKS
+++ b/THANKS
@@ -1577,6 +1577,7 @@ Frederic Motte <frederic.motte@fr.thalesgroup.com>
Roger Weeks <rogerw@firstlogic.com>
Gautam Thaker <gthaker@atl.lmco.com>
Christophe Juniet <cjuniet@entreview.com>
+Jeff W <jeffw_1234@yahoo.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h
index dade19e1001..d94948ffdb0 100644
--- a/ace/Process_Manager.h
+++ b/ace/Process_Manager.h
@@ -10,7 +10,6 @@
*/
//=============================================================================
-
#ifndef ACE_PROCESS_MANAGER_H
#define ACE_PROCESS_MANAGER_H
#include "ace/pre.h"
diff --git a/examples/Misc/test_trace.cpp b/examples/Misc/test_trace.cpp
index 8491e6a4bc5..4a1d80dad67 100644
--- a/examples/Misc/test_trace.cpp
+++ b/examples/Misc/test_trace.cpp
@@ -96,7 +96,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
int n_threads = argc > 3 ? ACE_OS::atoi (argv[3]) : 4;
- if (task.activate (n_threads, THR_BOUND | THR_DETACHED) == -1)
+ if (task.activate (THR_BOUND | THR_DETACHED, n_threads) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"%p\n",
"activate"),