diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-08 17:05:23 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-08 17:05:23 +0000 |
| commit | 4c88b77612a3e2a26c2df79e0c18e23e21916e0e (patch) | |
| tree | becd611b2d35c19503af00d8d08e55e255839804 /examples/Timer_Queue | |
| parent | 4d844b1f5b5d4c2ea5fcf469d0f76b1ad7119ee1 (diff) | |
| download | ATCD-4c88b77612a3e2a26c2df79e0c18e23e21916e0e.tar.gz | |
ChangeLogTag:Wed Nov 8 09:02:10 2000 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'examples/Timer_Queue')
| -rw-r--r-- | examples/Timer_Queue/Makefile | 6 | ||||
| -rw-r--r-- | examples/Timer_Queue/Thread_Timer_Queue_Test.cpp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/examples/Timer_Queue/Makefile b/examples/Timer_Queue/Makefile index c0f48c6e25f..49b34955450 100644 --- a/examples/Timer_Queue/Makefile +++ b/examples/Timer_Queue/Makefile @@ -44,6 +44,12 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # Local targets #---------------------------------------------------------------------------- +ifeq ($(static_libs_only),1) +$(VBIN): $(VLIB) +else +$(VBIN): $(VSHLIB) +endif + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp index 93aef7b8b87..0525f865d6d 100644 --- a/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp +++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.cpp @@ -90,8 +90,8 @@ Handler::handle_timeout (const ACE_Time_Value ¤t_time, // No need to protect this printf is always called from a Async safe // point. - ACE_OS::printf ("\nexpiring timer %d at %u.%07.7u secs\n" - "\tthere was a %u.%07.7u secs delay\n", + ACE_OS::printf ("\nexpiring timer %d at %lu.%7.7lu secs\n" + "\tthere was a %lu.%7.7lu secs delay\n", this->id_, current_time.sec (), current_time.usec (), @@ -178,7 +178,7 @@ Input_Task::add_timer (void *argument) int Input_Task::cancel_timer (void *argument) { - return this->queue_->cancel (*ACE_reinterpret_cast (int *, + return this->queue_->cancel (*ACE_reinterpret_cast (int *, argument)); } @@ -214,7 +214,7 @@ Input_Task::shutdown_timer (void *argument) // Cancel the thread timer queue task "preemptively." if (ACE_Thread::cancel (this->queue_->thr_id ()) == -1) ACE_ERROR ((LM_ERROR, - "%p\n", + "%p\n", "cancel")); #endif /* ACE_LACKS_PTHREAD_CANCEL */ |