From: ivana Date: Fri, 7 Dec 2007 16:46:29 +0000 (+0000) Subject: Corrected assignment operator: X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=0c8556b93c6581bbaf043c134adb758cb3f6d7f2;ds=sidebyside Corrected assignment operator: - call Copy function only once - check for assignment to self (Laurent) --- diff --git a/MUON/AliMUONCluster.cxx b/MUON/AliMUONCluster.cxx index d8e22c74461..3fb8fe5504d 100644 --- a/MUON/AliMUONCluster.cxx +++ b/MUON/AliMUONCluster.cxx @@ -129,8 +129,10 @@ AliMUONCluster& AliMUONCluster::operator=(const AliMUONCluster& src) { /// assignement operator - AliMUONCluster c(src); - c.Copy(*this); + if ( this != &src ) + { + src.Copy(*this); + } return *this; } diff --git a/MUON/AliMUONDigit.cxx b/MUON/AliMUONDigit.cxx index 5d682aafb6a..61b4a8a4c1c 100644 --- a/MUON/AliMUONDigit.cxx +++ b/MUON/AliMUONDigit.cxx @@ -347,8 +347,10 @@ AliMUONDigit::operator=(const AliMUONDigit& digit) { /// Assignement operator. - AliMUONDigit a(digit); - a.Copy(*this); + if ( this != &digit ) + { + digit.Copy(*this); + } return *this; } diff --git a/MUON/AliMUONObjectPair.cxx b/MUON/AliMUONObjectPair.cxx index 6fc64a8051c..38b39ed8fba 100644 --- a/MUON/AliMUONObjectPair.cxx +++ b/MUON/AliMUONObjectPair.cxx @@ -88,9 +88,10 @@ AliMUONObjectPair& AliMUONObjectPair::operator=(const AliMUONObjectPair& other) { /// assignement operator - AliDebug(1,""); - AliMUONObjectPair pair(other); - pair.Copy(*this); + if ( this != &other) + { + other.Copy(*this); + } return *this; }