diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-01-05 15:04:18 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2002-01-05 15:04:18 +0000 |
| commit | ab373435a7690a0bafef4ddf54fdb0fea728cfdb (patch) | |
| tree | f2e72e514daaac0dfc91decdbff43840f301260e | |
| parent | 4f9a3e4b96d14d71353ef33e467f86156a15c62a (diff) | |
| download | ATCD-ab373435a7690a0bafef4ddf54fdb0fea728cfdb.tar.gz | |
ChangeLogTag:Sat Jan 5 08:59:41 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
| -rw-r--r-- | ace/Future.cpp | 5 | ||||
| -rw-r--r-- | ace/Memory_Pool.h | 2 |
5 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 29e79569313..c1cc12340b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Jan 5 08:59:41 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Future.cpp (get): Added an ACE_const_cast() to silence certain + C++ compilers. Thanks to Venkita for reporting this. + Fri Jan 5 15:17:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS.{h,cpp}: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 29e79569313..c1cc12340b9 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Sat Jan 5 08:59:41 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Future.cpp (get): Added an ACE_const_cast() to silence certain + C++ compilers. Thanks to Venkita for reporting this. + Fri Jan 5 15:17:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS.{h,cpp}: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 29e79569313..c1cc12340b9 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Sat Jan 5 08:59:41 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Future.cpp (get): Added an ACE_const_cast() to silence certain + C++ compilers. Thanks to Venkita for reporting this. + Fri Jan 5 15:17:12 2002 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS.{h,cpp}: diff --git a/ace/Future.cpp b/ace/Future.cpp index c633b91dd2b..4d4c807de4a 100644 --- a/ace/Future.cpp +++ b/ace/Future.cpp @@ -205,8 +205,9 @@ ACE_Future_Rep<T>::get (T &value, // If the value is already produced, return it. if (this->value_ == 0) { - ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1)); - + ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, + ACE_const_cast (ACE_Thread_Mutex &, this->value_ready_mutex_), + -1)); // If the value is not yet defined we must block until the // producer writes to it. diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h index a97e166e486..896887bc886 100644 --- a/ace/Memory_Pool.h +++ b/ace/Memory_Pool.h @@ -5,7 +5,7 @@ * * $Id$ * - * @author Doug Schmidt and Prashant Jain + * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> and Prashant Jain <pjain@cs.wustl.edu> */ //============================================================================= |