diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-14 23:04:31 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-14 23:04:31 +0000 |
| commit | a7d8f8a60a945a91b5e37e717d203de802faa456 (patch) | |
| tree | 06b4ed48183ea4dfe13dc8b25419ade4a5af2d1e /ace | |
| parent | f960bc7e9fd199d37f184e063b89d87d68781b25 (diff) | |
| download | ATCD-a7d8f8a60a945a91b5e37e717d203de802faa456.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/OS.h | 7 | ||||
| -rw-r--r-- | ace/Timer_Queue_Adapters.i | 4 |
2 files changed, 6 insertions, 5 deletions
@@ -1542,6 +1542,10 @@ typedef rwlock_t ACE_rwlock_t; #endif /* ACE_LACKS_RWLOCK_T */ #else /* !ACE_HAS_THREADS, i.e., the OS/platform doesn't support threading. */ + +#include /**/ <sys/types.h> +#include /**/ <sys/stat.h> + // Give these things some reasonable value... #define ACE_SCOPE_PROCESS 0 #define ACE_SCOPE_LWP 1 @@ -1577,9 +1581,6 @@ typedef int ACE_hthread_t; typedef u_int ACE_thread_key_t; #endif /* ACE_HAS_THREADS */ -#include /**/ <sys/types.h> -#include /**/ <sys/stat.h> - #include "ace/stdcpp.h" #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION) diff --git a/ace/Timer_Queue_Adapters.i b/ace/Timer_Queue_Adapters.i index 6ff933b5836..94de3ad3c8d 100644 --- a/ace/Timer_Queue_Adapters.i +++ b/ace/Timer_Queue_Adapters.i @@ -8,13 +8,13 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::ACE_Thread_Timer_Queue_Adapter (void) condition_ (lock_) { // Assume that we start in active mode. - active_ = 1; + this->active_ = 1; } template<class TQ> ACE_INLINE ACE_SYNCH_MUTEX & ACE_Thread_Timer_Queue_Adapter<TQ>::lock (void) { - return lock_; + return this->lock_; } template<class TQ> ACE_INLINE TQ & |