diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-11-18 13:37:16 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-11-18 13:37:16 +0000 |
| commit | ccc18e2afa990df6b295c08dd88adc596c1f1f19 (patch) | |
| tree | afe0289f4e9c24f4d52bea0762b73192b3f2d694 | |
| parent | 66562e1d470e504692300ee14d358dd408fb06c2 (diff) | |
| download | ATCD-ccc18e2afa990df6b295c08dd88adc596c1f1f19.tar.gz | |
ChangeLogTag: Mon Nov 18 07:32:10 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Event.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 192361f6b76..a89dff46086 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 18 07:32:10 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * orbsvcs/orbsvcs/Notify/Event.h: Work around for a weird BCB6 + compiler bug. Thanks to Chris Kohlhoff for helping me with this. + Mon Nov 18 07:28:16 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tests/Portable_Interceptors/AMI/Makefile: Prevent the contents diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event.h b/TAO/orbsvcs/orbsvcs/Notify/Event.h index 2e7b5a9301e..bbe45c870e3 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h @@ -91,7 +91,7 @@ protected: TAO_NS_Property_Time timeout_; }; -template <class EVENT, class SYNCH> class ACE_Refcounted_Auto_Ptr; +template <class X, class ACE_LOCK> class ACE_Refcounted_Auto_Ptr; template <class T> class ACE_Unbounded_Queue; typedef ACE_Refcounted_Auto_Ptr<TAO_NS_Event, TAO_SYNCH_MUTEX> TAO_NS_Event_var; typedef ACE_Unbounded_Queue<TAO_NS_Event_var> TAO_NS_Event_Collection; |