diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-26 15:44:18 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-26 15:44:18 +0000 |
| commit | aa1ccb0c512b6a451b8a0661979868675c36bb98 (patch) | |
| tree | a9b962635d75fb158cd4b98ae4a6906633266146 | |
| parent | e32e19b2d6e31532ab0304e23337629cb74fa674 (diff) | |
| download | ATCD-aa1ccb0c512b6a451b8a0661979868675c36bb98.tar.gz | |
ChangeLogTag:Fri Nov 26 09:30:19 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 2596c474068..a889b19971f 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,9 @@ +Fri Nov 26 09:30:19 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp: + Fixed warning due to mismatched return types under g++ 2.7.2.3, + thanks to David for pointing this out. + Wed Nov 24 20:17:01 1999 David L. Levine <levine@cs.wustl.edu> * rules.tao.GNU: re-enabled IDL_EXT and IDL_EXT2 on WIN32 diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index da01cff5899..073ebbba692 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -23,13 +23,13 @@ TAO_EC_Negation_Filter::~TAO_EC_Negation_Filter (void) TAO_EC_Filter::ChildrenIterator TAO_EC_Negation_Filter::begin (void) const { - return &this->child_; + return ACE_const_cast(TAO_EC_Filter**,&this->child_); } TAO_EC_Filter::ChildrenIterator TAO_EC_Negation_Filter::end (void) const { - return &this->child_ + 1; + return ACE_const_cast(TAO_EC_Filter**,&this->child_) + 1; } ACE_INLINE int |