From 13eab42217c50a4ad77eb7a5ad51ed0a4437680e Mon Sep 17 00:00:00 2001 From: jfa Date: Fri, 25 Nov 2005 14:04:38 +0000 Subject: [PATCH] Another way to fix bug 10505, avoiding regressions of popups --- src/LightApp/LightApp_DataOwner.cxx | 6 ------ src/SUIT/SUIT_DataOwner.cxx | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/LightApp/LightApp_DataOwner.cxx b/src/LightApp/LightApp_DataOwner.cxx index 6d01eb5fe..9873e2d0b 100644 --- a/src/LightApp/LightApp_DataOwner.cxx +++ b/src/LightApp/LightApp_DataOwner.cxx @@ -38,12 +38,6 @@ bool LightApp_DataOwner ::isEqual( const SUIT_DataOwner& obj ) const { - const _typeinfo& ti1 = typeid( obj ); - const _typeinfo& ti2 = typeid( *(this) ); - - if (ti1 != ti2) - return false; - const LightApp_DataOwner* other = dynamic_cast( &obj ); return other && entry() == other->entry(); diff --git a/src/SUIT/SUIT_DataOwner.cxx b/src/SUIT/SUIT_DataOwner.cxx index ebac9dc7f..bf3191b3e 100755 --- a/src/SUIT/SUIT_DataOwner.cxx +++ b/src/SUIT/SUIT_DataOwner.cxx @@ -27,7 +27,7 @@ SUIT_DataOwner::~SUIT_DataOwner() bool operator==( const SUIT_DataOwnerPtr& p1, const SUIT_DataOwnerPtr& p2 ) { if ( !p1.isNull() && !p2.isNull() ) - return p1->isEqual( *p2 ); + return (p1->isEqual( *p2 ) && p2->isEqual( *p1 )); return p1.isNull() && p2.isNull(); } -- 2.39.2