summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2004-03-20 23:04:12 +0000
committerbala <balanatarajan@users.noreply.github.com>2004-03-20 23:04:12 +0000
commit258ba6ba4df4fa2c9c86440dba0a0899a0659f74 (patch)
tree803e90ba50b581415dc3141e23dff524a22d7bc5
parent47208f4feaabe957d51398410bbd0a502187967b (diff)
downloadATCD-258ba6ba4df4fa2c9c86440dba0a0899a0659f74.tar.gz
ChangeLogTag:
-rw-r--r--ChangeLog8
-rw-r--r--ace/Timer_Queue_Adapters.h3
-rw-r--r--ace/Timer_Queue_Adapters.i3
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a9fa15a1b1..23da57e8344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Mar 20 17:01:55 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * ace/Timer_Queue_Adapters.h:
+ * ace/Timer_Queue_Adapters.i:
+
+ Changes from the effect of the following change "Thu Mar 18
+ 22:47:05 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>"
+
Sat Mar 20 18:45:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/templates/bor.mpd:
diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h
index 248e61ddaf8..39899a5c096 100644
--- a/ace/Timer_Queue_Adapters.h
+++ b/ace/Timer_Queue_Adapters.h
@@ -173,8 +173,7 @@ public:
ACE_hthread_t thread_handles[] = 0,
void *stack[] = 0,
size_t stack_size[] = 0,
- ACE_thread_t thread_names[] = 0,
- bool inherit_priority = true);
+ ACE_thread_t thread_names[] = 0);
# if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS)
diff --git a/ace/Timer_Queue_Adapters.i b/ace/Timer_Queue_Adapters.i
index 3736aa30349..e2aa5c562cf 100644
--- a/ace/Timer_Queue_Adapters.i
+++ b/ace/Timer_Queue_Adapters.i
@@ -39,8 +39,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::activate (long flags,
ACE_hthread_t thread_handles[],
void *stack[],
size_t stack_size[],
- ACE_thread_t thread_names[],
- bool )
+ ACE_thread_t thread_names[])
{
// Macros to avoid "warning: unused parameter" type warning.
ACE_UNUSED_ARG (thread_handles);