diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-04-28 13:40:38 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-04-28 13:40:38 +0000 |
| commit | b20c1601ebeb7d37c2580bd2b9949381a2e391b6 (patch) | |
| tree | b24685640a16bdbae34719540ac0ad721979bccb /TAO | |
| parent | ecb4b4884e81ccf8f214d7a4688465b851b439ab (diff) | |
| download | ATCD-b20c1601ebeb7d37c2580bd2b9949381a2e391b6.tar.gz | |
ChangeLogTag:Sun Apr 28 08:54:07 2002 Balachandran Natarajan <bala@cs.wustl.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 8c7a118109b..a5f86e1f336 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Sun Apr 28 08:54:07 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/ORB_Core.cpp (shutdown): Added a #if (TAO_HAS_INTERCEPTORS + ==1) around the place where pi_current_ is set to null. This + should fix build errors in the minimum corba builds. + Sun Apr 28 08:50:18 2002 Balachandran Natarajan <bala@cs.wustl.edu> * tao/LF_Connect_Strategy.cpp: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index ec8412b8202..3c6703144fc 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1824,7 +1824,10 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion // contains references to objects, which themselves may contain // reference to this ORB. this->object_ref_table_.destroy (); + +#if (TAO_HAS_INTERCEPTORS == 1) this->pi_current_ = 0; // For the sake of consistency. +#endif /* TAO_HAS_INTERCEPTORS == 1 */ } } |