Merge pull request #24393 from Dr15Jones/clangWarningsDetectorDescrip…

…tionCore Fix clang warnings in DetectorDescription/Core
cms-sw · Aug 28, 2018 · 175f91a · 175f91a
2 parents 24feaea + 5ea9a97
commit 175f91a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/DetectorDescription/Core/plugins/DDAngular.cc b/DetectorDescription/Core/plugins/DDAngular.cc
@@ -76,7 +76,7 @@ DDAngular::initialize( const DDNumericArguments & nArgs,
 
   m_solidRot   = DDRotationMatrix();
 
-  if( fabs( m_rangeAngle - 360.0_deg ) < 0.001_deg )
+  if( std::abs( m_rangeAngle - 360.0_deg ) < 0.001_deg )
   { 
     m_delta = m_rangeAngle / double( m_n );
   }

diff --git a/DetectorDescription/Core/src/Cons.cc b/DetectorDescription/Core/src/Cons.cc
@@ -67,7 +67,7 @@ double DDI::Cons::volume() const
    double rInPlusZ=p_[3]; 
    double rOutPlusZ=p_[4];
    //double phiFrom=p_[5]/rad;
-   double deltaPhi=fabs( CONVERT_TO( p_[6], rad )); 
+   double deltaPhi=std::abs( CONVERT_TO( p_[6], rad )); 
    double z=2*zhalf;
 
   double volume1=1_pi*(rInPlusZ*rInPlusZ+rInMinusZ*rInMinusZ+rInMinusZ*rInPlusZ)*z/3;

diff --git a/DetectorDescription/Core/src/DDSolid.cc b/DetectorDescription/Core/src/DDSolid.cc
@@ -73,59 +73,59 @@ DDSolid::DDSolid( const DDName & name, DDSolidShape shape, const std::vector<dou
   std::vector<double> dummy;
   switch( shape ) {
   case DDSolidShape::ddbox:
-    solid = std::move( std::make_unique< DDI::Box >( 0, 0, 0 ));
+    solid = std::make_unique< DDI::Box >( 0, 0, 0 );
     break;
   case DDSolidShape::ddtubs:
-    solid = std::move( std::make_unique< DDI::Tubs >( 0, 0, 0, 0, 0 ));
+    solid = std::make_unique< DDI::Tubs >( 0, 0, 0, 0, 0 );
     break;
   case DDSolidShape::ddcons:
-    solid = std::move( std::make_unique< DDI::Cons >( 0, 0, 0, 0, 0, 0, 0 ));
+    solid = std::make_unique< DDI::Cons >( 0, 0, 0, 0, 0, 0, 0 );
     break;
   case DDSolidShape::ddpseudotrap:
-    solid = std::move( std::make_unique< DDI::PseudoTrap >( 0, 0, 0, 0, 0, 0, false ));
+    solid = std::make_unique< DDI::PseudoTrap >( 0, 0, 0, 0, 0, 0, false );
     break;
   case DDSolidShape::ddshapeless:
-    solid = std::move( std::make_unique< DDI::Shapeless >( ));
+    solid = std::make_unique< DDI::Shapeless >( );
     break;
   case DDSolidShape::ddtrap:
-    solid = std::move( std::make_unique< DDI::Trap >( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ));
+    solid = std::make_unique< DDI::Trap >( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );
     break;
   case DDSolidShape::ddpolyhedra_rz:
-    solid = std::move( std::make_unique< DDI::Polyhedra >( 0, 0, 0, dummy, dummy ));
+    solid = std::make_unique< DDI::Polyhedra >( 0, 0, 0, dummy, dummy );
     break;
   case DDSolidShape::ddpolyhedra_rrz:
-    solid = std::move( std::make_unique< DDI::Polyhedra >( 0, 0, 0, dummy, dummy, dummy ));
+    solid = std::make_unique< DDI::Polyhedra >( 0, 0, 0, dummy, dummy, dummy );
     break;
   case DDSolidShape::ddpolycone_rz:
-    solid = std::move( std::make_unique< DDI::Polycone >( 0, 0, dummy, dummy ));
+    solid = std::make_unique< DDI::Polycone >( 0, 0, dummy, dummy );
     break;
   case DDSolidShape::ddpolycone_rrz:
-    solid = std::move( std::make_unique< DDI::Polycone >( 0, 0, dummy, dummy, dummy ));
+    solid = std::make_unique< DDI::Polycone >( 0, 0, dummy, dummy, dummy );
     break;			
   case DDSolidShape::ddtrunctubs:
-    solid = std::move( std::make_unique< DDI::TruncTubs >( 0, 0, 0, 0, 0, 0, 0, false ));
+    solid = std::make_unique< DDI::TruncTubs >( 0, 0, 0, 0, 0, 0, 0, false );
     break;
   case DDSolidShape::ddtorus:
-    solid = std::move( std::make_unique< DDI::Torus >( 0, 0, 0, 0, 0 ));
+    solid = std::make_unique< DDI::Torus >( 0, 0, 0, 0, 0 );
     break;
   case DDSolidShape::ddsphere:
-    solid = std::move( std::make_unique< DDI::Sphere >( 0, 0, 0, 0, 0, 0 ));
+    solid = std::make_unique< DDI::Sphere >( 0, 0, 0, 0, 0, 0 );
     break;
   case DDSolidShape::ddellipticaltube:
-    solid = std::move( std::make_unique< DDI::EllipticalTube >( 0, 0, 0 ));
+    solid = std::make_unique< DDI::EllipticalTube >( 0, 0, 0 );
     break;
   case DDSolidShape::ddcuttubs:
-    solid = std::move( std::make_unique< DDI::CutTubs >( 0., 0., 0., 0., 0., 0., 0., 1., 0., 0., -1. ));
+    solid = std::make_unique< DDI::CutTubs >( 0., 0., 0., 0., 0., 0., 0., 1., 0., 0., -1. );
     break;
   case DDSolidShape::ddextrudedpolygon:
-    solid = std::move( std::make_unique< DDI::ExtrudedPolygon >( dummy, dummy, dummy, dummy, dummy, dummy ));
+    solid = std::make_unique< DDI::ExtrudedPolygon >( dummy, dummy, dummy, dummy, dummy, dummy );
     break;
   default:
     throw cms::Exception( "DDException" )
 		<< "DDSolid::DDSolid( DDName, DDSolidShape, std::vector<double> ): wrong shape.";   
   }
   solid->setParameters( pars );
-		create( name, std::move( solid ));
+  create( name, std::move( solid ));
 }
 
 double