Merge pull request #6422 from davidlt/fix-implicit-nullptr-to-false

Resolve implicit conversion from nullptr to false
cms-sw · Nov 15, 2014 · 8931032 · 8931032
2 parents 4656107 + 0337550
commit 8931032
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Geometry/EcalAlgo/src/EcalBarrelGeometry.cc b/Geometry/EcalAlgo/src/EcalBarrelGeometry.cc
@@ -24,7 +24,7 @@ EcalBarrelGeometry::EcalBarrelGeometry() :
    m_borderMgr    ( nullptr ),
    m_borderPtrVec ( nullptr ) ,
    m_radius       ( -1. ),
-   m_check        ( nullptr ),
+   m_check        ( false ),
    m_cellVec      ( k_NumberOfCellsForCorners )
 {
    const int neba[] = {25,45,65,85} ;

diff --git a/Geometry/EcalAlgo/src/EcalEndcapGeometry.cc b/Geometry/EcalAlgo/src/EcalEndcapGeometry.cc
@@ -22,7 +22,7 @@ EcalEndcapGeometry::EcalEndcapGeometry( void )
     m_borderMgr( nullptr ),
     m_borderPtrVec( nullptr ),
     m_avgZ( -1 ),
-    m_check( nullptr ),
+    m_check( false ),
     m_cellVec( k_NumberOfCellsForCorners )
 {
   m_xlo[0] = 999.;