summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--THANKS1
-rw-r--r--ace/Synch.h2
-rw-r--r--ace/Synch.i1
6 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f027e98d4b2..d625c057782 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 26 06:50:58 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * ace/Synch.h (ACE_Null_Mutex): Added a dummy "lock_" variable
+ to make ACE_Condition<ACE_Null_Mutex> work properly. Thanks to
+ Ido Yellin <Ido.Yellin@Focusengine.com> for reporting this.
+
Wed Mar 21 08:11:15 2002 Boris Kolpackov <bosk@ipmce.ru>
* THANKS: Added Frank Rybak <rybak@ll.mit.edu> to the Hall of fame.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index f027e98d4b2..d625c057782 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Tue Mar 26 06:50:58 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * ace/Synch.h (ACE_Null_Mutex): Added a dummy "lock_" variable
+ to make ACE_Condition<ACE_Null_Mutex> work properly. Thanks to
+ Ido Yellin <Ido.Yellin@Focusengine.com> for reporting this.
+
Wed Mar 21 08:11:15 2002 Boris Kolpackov <bosk@ipmce.ru>
* THANKS: Added Frank Rybak <rybak@ll.mit.edu> to the Hall of fame.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index f027e98d4b2..d625c057782 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Tue Mar 26 06:50:58 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+
+ * ace/Synch.h (ACE_Null_Mutex): Added a dummy "lock_" variable
+ to make ACE_Condition<ACE_Null_Mutex> work properly. Thanks to
+ Ido Yellin <Ido.Yellin@Focusengine.com> for reporting this.
+
Wed Mar 21 08:11:15 2002 Boris Kolpackov <bosk@ipmce.ru>
* THANKS: Added Frank Rybak <rybak@ll.mit.edu> to the Hall of fame.
diff --git a/THANKS b/THANKS
index 6300fb8b810..abf7c2820c2 100644
--- a/THANKS
+++ b/THANKS
@@ -1490,6 +1490,7 @@ Laurent Sabourin <lsabourin@interstarinc.com>
Frank Rybak <rybak@ll.mit.edu>
Tim Iskander <timothy.j.iskander@lmco.com>
Michele Amoretti <amoretti@CE.UniPR.IT>
+Ido Yellin <Ido.Yellin@Focusengine.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ace/Synch.h b/ace/Synch.h
index faf185a9e78..8863e066551 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -682,6 +682,8 @@ public:
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
+
+ int lock_; // A dummy lock.
};
class ACE_Export ACE_Noop_Token : public ACE_Null_Mutex
diff --git a/ace/Synch.i b/ace/Synch.i
index e62abfbce0d..c845cc97855 100644
--- a/ace/Synch.i
+++ b/ace/Synch.i
@@ -735,6 +735,7 @@ ACE_Null_Barrier::dump (void) const
ACE_INLINE
ACE_Null_Mutex::ACE_Null_Mutex (const ACE_TCHAR *)
+ : lock_ (0)
{
}