Merge branch 'clang.TrkVKalVrtCore-20181108' into 'master'

TrkVKalVrtCore: Fix clang warnings.

See merge request atlas/athena!15769

Former-commit-id: 152a08f0

Tracking/TrkVertexFitter/TrkVKalVrtCore/TrkVKalVrtCore/VKalVrtBMag.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 /* General magnetic field in any point access              */
 /* If external magnetic field handler is provided as       */
@@ -10,8 +10,8 @@
 /* 							   */
 /*  Thread-safe implementation				   */
 /*---------------------------------------------------------*/
-#ifndef _TrkVKalVrtCore_VKalVrtBMag_H
-#define _TrkVKalVrtCore_VKalVrtBMag_H
+#ifndef TRKVKALVRTCORE_VKALVRTBMAG_H
+#define TRKVKALVRTCORE_VKALVRTBMAG_H
 
 
 namespace Trk {
@@ -47,7 +47,6 @@ namespace Trk {
    private:
      const double m_cnstBMAG;
      const double m_vkalCnvMagFld;
-     const double m_mm;
      double m_saveXpos;
      double m_saveYpos;
      double m_saveZpos;

Tracking/TrkVertexFitter/TrkVKalVrtCore/src/DummyMag.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 //  Create object vkalMagFld which containg magnetic field.
@@ -18,8 +18,7 @@ namespace Trk {
 
 vkalMagFld::vkalMagFld():
    m_cnstBMAG(1.997),                  /* Const mag. field in Tesla */
-   m_vkalCnvMagFld(vkalMagCnvCst),     /* Conversion constant is defined in CommonPars.h */
-   m_mm(1.)
+   m_vkalCnvMagFld(vkalMagCnvCst)      /* Conversion constant is defined in CommonPars.h */
 {
 
 //   vkalCnvMagFld = 0.0029979246;   /* For GeV and cm and Tesla*/

Tracking/TrkVertexFitter/TrkVKalVrtCore/src/cfTotCov.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 */
 
 // Calculates COVF(21) - symmetric 6x6 covariance matrix
@@ -28,7 +28,7 @@ int afterFit(VKVertex *vk, double *ader, double * dcv, double * ptot, double * V
 {
     int i,j;
     double px,py,pz,pt,invR,cth;
-    double verr[6][6]={0.};   //for (i=0; i<6*6; i++) verr[i]=0;
+    double verr[6][6]={{0.}};   //for (i=0; i<6*6; i++) verr[i]=0;
 
     int NTRK = vk->TrackList.size();
     int NVar = NTRK*3+3;
@@ -81,7 +81,7 @@ int afterFitWithIniPar(VKVertex *vk, double *ader, double * dcv, double * ptot,
 {
     int i,j;
     double px,py,pz,pt,invR,cth;
-    double verr[6][6]={0.};
+    double verr[6][6]={{0.}};
 
 
     int NTRK = vk->TrackList.size();