diff options
| author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-04-04 05:27:12 +0000 |
|---|---|---|
| committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-04-04 05:27:12 +0000 |
| commit | d6a0f33e2924696eab8597fc64dc36e435894551 (patch) | |
| tree | b266003c04416b7804a5d8008523b4eabc951842 /TAO | |
| parent | abe2c41f42ddd9542410bf33d1f80899df0c9391 (diff) | |
| download | ATCD-d6a0f33e2924696eab8597fc64dc36e435894551.tar.gz | |
ChangeLogTag:Wed Apr 03 23:38:50 2002 Balachandran Natarajan <bala@cs.wustl.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/Condition.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/Condition.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Condition.inl | 3 |
4 files changed, 12 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index c3fda4b0d8d..3763000a09f 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Wed Apr 03 23:38:50 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/Condition.h: Added a comment + * tao/Condition.cpp: Added #ifdef's around the whole file. + * tao/Condition.inl: Fixed a compile error on Win32. + Wed Apr 3 22:18:38 2002 Balachandran Natarajan <bala@cs.wustl.edu> Changes to wide variety of stuff from my branch. The checkin diff --git a/TAO/tao/Condition.cpp b/TAO/tao/Condition.cpp index d754007a77d..862e9e5bab4 100644 --- a/TAO/tao/Condition.cpp +++ b/TAO/tao/Condition.cpp @@ -1,3 +1,5 @@ +#ifndef TAO_CONDITION_CPP +#define TAO_CONDITION_CPP #include "Condition.h" @@ -54,3 +56,5 @@ TAO_Condition<MUTEX>::~TAO_Condition (void) if (this->delete_lock_) delete this->mutex_; } + +#endif /* TAO_CONDITION_CPP*/ diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index b9b85a4c817..56adaf57084 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -6,7 +6,7 @@ * * $Id$ * - * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> + * @author From ACE to TAO by Balachandran Natarajan <bala@cs.wustl.edu> */ //============================================================================= diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl index 089bc0d54be..b514ce2ef60 100644 --- a/TAO/tao/Condition.inl +++ b/TAO/tao/Condition.inl @@ -27,13 +27,12 @@ TAO_Condition<MUTEX>::wait (const ACE_Time_Value *abstime) template<class MUTEX> ACE_INLINE int TAO_Condition<MUTEX>::remove (void) { - this->cond_->remove (); + return this->cond_->remove (); } template<class MUTEX> ACE_INLINE MUTEX * TAO_Condition<MUTEX>::mutex (void) { - // ACE_TRACE ("ACE_Condition<MUTEX>::mutex"); return this->mutex_; } |