Merge pull request #19978 from ianna/dd-clang-modernize-use-equals-de…

…lete DetectorDescription Clang Check modernize-use-equals-delete
cms-sw · Aug 13, 2017 · 5dacd27 · 5dacd27
2 parents 1202a5a + 53d2e18
commit 5dacd27
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/DataFormats/Math/interface/GraphWalker.h b/DataFormats/Math/interface/GraphWalker.h
@@ -62,7 +62,7 @@ class GraphWalker
   const Graph<N,E> & graph_;
 
  private:
-  GraphWalker();
+  GraphWalker() = delete;
 };
 
 template<class N, class E>

diff --git a/DetectorDescription/Core/interface/DDComparator.h b/DetectorDescription/Core/interface/DDComparator.h
@@ -42,7 +42,7 @@ class DDCompareEqual // : public binary_function<DDGeoHistory,DDPartSelection,bo
   inline bool nextChildposp();
 
 private:
-  DDCompareEqual();  
+  DDCompareEqual() = delete;  
   const DDGeoHistory & hist_;
   const DDPartSelection & partsel_;
   DDGeoHistory::size_type const hMax_;

diff --git a/DetectorDescription/Core/interface/DDPosData.h b/DetectorDescription/Core/interface/DDPosData.h
@@ -39,8 +39,8 @@ struct DDPosData
   const DDDivision * div_; /**< provides original division that created this pos */
 
 private:
-  DDPosData();  
-  DDPosData & operator=(const DDPosData &);
+  DDPosData() = delete;  
+  DDPosData & operator=(const DDPosData &) = delete;
 };
 
 #endif
diff --git a/DetectorDescription/Core/interface/DDSolid.h b/DetectorDescription/Core/interface/DDSolid.h
@@ -104,7 +104,7 @@ class DDTrap : public DDSolid
   double alpha2( void ) const;
 
 private:
-  DDTrap( void );
+  DDTrap( void ) = delete;
 };
 
 class DDPseudoTrap : public DDSolid
@@ -127,7 +127,7 @@ class DDPseudoTrap : public DDSolid
   bool atMinusZ( void ) const;
 
 private:
-  DDPseudoTrap( void );
+  DDPseudoTrap( void ) = delete;
 };
 
 /// A truncated tube section    
@@ -153,7 +153,7 @@ class DDTruncTubs : public DDSolid
   bool cutInside( void ) const;
 
 private:
-  DDTruncTubs( void );
+  DDTruncTubs( void ) = delete;
 };
 
 //! Interface to a Box
@@ -170,7 +170,7 @@ class DDBox : public DDSolid
   double halfZ( void ) const; 
 
 private:
-  DDBox( void );
+  DDBox( void ) = delete;
 };
 
 /// This is simply a handle on the solid.
@@ -180,7 +180,7 @@ class DDShapelessSolid : public DDSolid
   DDShapelessSolid( const DDSolid & s );
 
 private:
-  DDShapelessSolid( void );
+  DDShapelessSolid( void ) = delete;
 };
 
 class DDReflectionSolid : public DDSolid
@@ -190,7 +190,7 @@ class DDReflectionSolid : public DDSolid
   DDSolid unreflected( void ) const;
 
 private:
-  DDReflectionSolid( void ); 
+  DDReflectionSolid( void ) = delete; 
   DDI::Reflection * reflected_; 
 }; 
 
@@ -204,7 +204,7 @@ class DDBooleanSolid : public DDSolid
   DDRotation rotation( void ) const;
 
 private:
-  DDBooleanSolid( void );
+  DDBooleanSolid( void ) = delete;
   DDI::BooleanSolid * boolean_;  
 };
 
@@ -217,7 +217,7 @@ class DDMultiUnionSolid : public DDSolid
   const std::vector<DDRotation>& rotations( void ) const;
 
 private:
-  DDMultiUnionSolid( void );
+  DDMultiUnionSolid( void ) = delete;
   DDI::MultiUnion * union_;  
 };
 
@@ -245,7 +245,7 @@ class DDPolycone : public DDPolySolid
   std::vector<double> rMaxVec( void ) const;
 
 private:
-  DDPolycone( void );
+  DDPolycone( void ) = delete;
 };
 
 class DDPolyhedra : public DDPolySolid
@@ -261,7 +261,7 @@ class DDPolyhedra : public DDPolySolid
   std::vector<double> rMaxVec( void ) const;
 
 private:
-  DDPolyhedra( void );
+  DDPolyhedra( void ) = delete;
 };
 
 class DDExtrudedPolygon : public DDPolySolid
@@ -276,7 +276,7 @@ class DDExtrudedPolygon : public DDPolySolid
   std::vector<double> zscaleVec( void ) const;
 
 private:
-  DDExtrudedPolygon( void );
+  DDExtrudedPolygon( void ) = delete;
   auto xyPointsSize( void ) const -> std::size_t;
   auto zSectionsSize( void ) const -> std::size_t;
 };
@@ -292,7 +292,7 @@ class DDTubs : public DDSolid
   double deltaPhi( void ) const;
 
 private:
-  DDTubs( void );
+  DDTubs( void ) = delete;
 };
 
 class DDCutTubs : public DDSolid
@@ -308,7 +308,7 @@ class DDCutTubs : public DDSolid
   std::array<double, 3> highNorm( void ) const;
 
 private:
-  DDCutTubs( void );
+  DDCutTubs( void ) = delete;
 };
 
 class DDCons : public DDSolid
@@ -324,7 +324,7 @@ class DDCons : public DDSolid
   double deltaPhi( void ) const;
 
 private:
-  DDCons( void );
+  DDCons( void ) = delete;
 };
 
 class DDTorus : public DDSolid
@@ -338,7 +338,7 @@ class DDTorus : public DDSolid
   double deltaPhi( void ) const;
 
 private:
-  DDTorus( void );
+  DDTorus( void ) = delete;
 };
 
 class DDUnion : public DDBooleanSolid
@@ -347,7 +347,7 @@ class DDUnion : public DDBooleanSolid
   DDUnion( const DDSolid & s );
 
 private:
-  DDUnion( void );
+  DDUnion( void ) = delete;
 };
 
 class DDMultiUnion : public DDMultiUnionSolid
@@ -356,7 +356,7 @@ class DDMultiUnion : public DDMultiUnionSolid
   DDMultiUnion( const DDSolid & s );
 
 private:
-  DDMultiUnion( void );
+  DDMultiUnion( void ) = delete;
 };
 
 class DDIntersection : public DDBooleanSolid
@@ -365,7 +365,7 @@ class DDIntersection : public DDBooleanSolid
   DDIntersection( const DDSolid & s );
 
 private:
-  DDIntersection( void );
+  DDIntersection( void ) = delete;
 };
 
 class DDSubtraction : public DDBooleanSolid
@@ -374,7 +374,7 @@ class DDSubtraction : public DDBooleanSolid
   DDSubtraction( const DDSolid & s );
 
 private:
-  DDSubtraction( void );
+  DDSubtraction( void ) = delete;
 };
 
 class DDSphere : public DDSolid
@@ -389,7 +389,7 @@ class DDSphere : public DDSolid
   double deltaTheta( void ) const;
 
 private:
-  DDSphere( void );
+  DDSphere( void ) = delete;
 };
 
 class DDOrb : public DDSolid
@@ -399,7 +399,7 @@ class DDOrb : public DDSolid
   double radius( void ) const;
 
 private:
-  DDOrb( void );
+  DDOrb( void ) = delete;
 };
 
 class DDEllipticalTube : public DDSolid
@@ -411,7 +411,7 @@ class DDEllipticalTube : public DDSolid
   double zHeight( void ) const;
 
 private:
-  DDEllipticalTube( void );
+  DDEllipticalTube( void ) = delete;
 };
 
 class DDEllipsoid : public DDSolid
@@ -425,7 +425,7 @@ class DDEllipsoid : public DDSolid
   double zTopCut( void ) const;
 
 private:
-  DDEllipsoid( void );
+  DDEllipsoid( void ) = delete;
 };
 
 class DDParallelepiped : public DDSolid
@@ -440,7 +440,7 @@ class DDParallelepiped : public DDSolid
   double phi( void ) const;
 
 private:
-  DDParallelepiped( void );
+  DDParallelepiped( void ) = delete;
 };
 
 // Solid generation functions

diff --git a/DetectorDescription/RegressionTest/bin/DOMCount.hpp b/DetectorDescription/RegressionTest/bin/DOMCount.hpp
@@ -62,8 +62,8 @@ private :
     // -----------------------------------------------------------------------
     //  Unimplemented constructors and operators
     // -----------------------------------------------------------------------
-    DOMCountErrorHandler(const DOMCountErrorHandler&);
-    void operator=(const DOMCountErrorHandler&);
+    DOMCountErrorHandler(const DOMCountErrorHandler&) = delete;
+    void operator=(const DOMCountErrorHandler&) = delete;
 
 
     // -----------------------------------------------------------------------

diff --git a/DetectorDescription/RegressionTest/interface/DDHtmlFormatter.h b/DetectorDescription/RegressionTest/interface/DDHtmlFormatter.h
@@ -55,7 +55,7 @@ class DDHtmlFormatter
 
 private:
 
-  DDHtmlFormatter& operator= ( const DDHtmlFormatter& );
+  DDHtmlFormatter& operator= ( const DDHtmlFormatter& ) = delete;
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ class DDHtmlFormatter @@
     private:
-      DDHtmlFormatter& operator= ( const DDHtmlFormatter& );
+      DDHtmlFormatter& operator= ( const DDHtmlFormatter& ) = delete;
     };
@@ Expand Down @@