From dfcec9a3e210e17efd79359352653331c2a96d0a Mon Sep 17 00:00:00 2001 From: Scott Snyder <scott.snyder@cern.ch> Date: Thu, 11 Aug 2016 20:01:12 +0200 Subject: [PATCH] endreq -> endmsg. (VxMultiVertex-02-00-02) * Tagging VxMultiVertex-02-00-02. * endreq -> endmsg. * Tagging VxMultiVertex-02-00-01. * Fix gcc6 misleading indentation warning. Former-commit-id: 7d337f61151efc58dd1f5a47ce9ba2ac25ffca30 --- Tracking/TrkEvent/VxMultiVertex/src/MVFVxCandidate.cxx | 2 +- Tracking/TrkEvent/VxMultiVertex/src/MVFVxTrackAtVertex.cxx | 2 +- Tracking/TrkEvent/VxMultiVertex/src/MvfFitInfo.cxx | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tracking/TrkEvent/VxMultiVertex/src/MVFVxCandidate.cxx b/Tracking/TrkEvent/VxMultiVertex/src/MVFVxCandidate.cxx index e970ef4a7ee..7916365227e 100755 --- a/Tracking/TrkEvent/VxMultiVertex/src/MVFVxCandidate.cxx +++ b/Tracking/TrkEvent/VxMultiVertex/src/MVFVxCandidate.cxx @@ -67,7 +67,7 @@ namespace Trk { {} MsgStream& MVFVxCandidate::dump(MsgStream& sl) const { - sl << "Printing Trk::MVFVxCandidate:" << endreq; + sl << "Printing Trk::MVFVxCandidate:" << endmsg; // for now just print base class VxCandidate::dump(sl); return sl; diff --git a/Tracking/TrkEvent/VxMultiVertex/src/MVFVxTrackAtVertex.cxx b/Tracking/TrkEvent/VxMultiVertex/src/MVFVxTrackAtVertex.cxx index e5632f61f82..f97e63697bb 100755 --- a/Tracking/TrkEvent/VxMultiVertex/src/MVFVxTrackAtVertex.cxx +++ b/Tracking/TrkEvent/VxMultiVertex/src/MVFVxTrackAtVertex.cxx @@ -126,7 +126,7 @@ namespace Trk { } MsgStream& MVFVxTrackAtVertex::dump(MsgStream& sl) const { - sl << "Printing Trk::MVFVxTrackAtVertex:" << endreq; + sl << "Printing Trk::MVFVxTrackAtVertex:" << endmsg; // for now just print base class VxTrackAtVertex::dump(sl); return sl; diff --git a/Tracking/TrkEvent/VxMultiVertex/src/MvfFitInfo.cxx b/Tracking/TrkEvent/VxMultiVertex/src/MvfFitInfo.cxx index 379bb9b495c..1e1e8a01ce5 100755 --- a/Tracking/TrkEvent/VxMultiVertex/src/MvfFitInfo.cxx +++ b/Tracking/TrkEvent/VxMultiVertex/src/MvfFitInfo.cxx @@ -23,9 +23,9 @@ namespace Trk MvfFitInfo::~MvfFitInfo() { - if (m_constraintVertex!=0) delete m_constraintVertex; m_constraintVertex=0; - if (m_seedVertex!=0) delete m_seedVertex; m_seedVertex=0; - if (m_linearizationVertex!=0) delete m_linearizationVertex; m_linearizationVertex=0; + delete m_constraintVertex; + delete m_seedVertex; + delete m_linearizationVertex; }//end of destructor MvfFitInfo::MvfFitInfo(const MvfFitInfo& rhs): -- GitLab