Fix more warnings and allow debug builds

jmcarcell · Jul 1, 2024 · 60041d3 · 60041d3
1 parent 3b0eb21
commit 60041d3
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 25 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,12 +96,12 @@ INSTALL_DIRECTORY( ./include DESTINATION . FILES_MATCHING PATTERN "*.h" )
 
 # ------- symlinks in include directory for backwards compatibility ---------
 # FIXME: this symlinks are needed to build Mokka. Should fix this code in Mokka
-INSTALL( CODE "EXEC_PROGRAM( \"${CMAKE_COMMAND}\" \"${CMAKE_INSTALL_PREFIX}/include\" ARGS -E create_symlink gear/gearimpl gearimpl )" )
-INSTALL( CODE "EXEC_PROGRAM( \"${CMAKE_COMMAND}\" \"${CMAKE_INSTALL_PREFIX}/include\" ARGS -E create_symlink gear/gearxml gearxml )" )
-INSTALL( CODE "EXEC_PROGRAM( \"${CMAKE_COMMAND}\" \"${CMAKE_INSTALL_PREFIX}/include\" ARGS -E create_symlink gear/gearsurf gearsurf )" )
+INSTALL( CODE "EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_INSTALL_PREFIX}/include/gear/gearimpl ${CMAKE_INSTALL_PREFIX}/include/gearimpl )" )
+INSTALL( CODE "EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_INSTALL_PREFIX}/include/gear/gearxml ${CMAKE_INSTALL_PREFIX}/include/gearxml )" )
+INSTALL( CODE "EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_INSTALL_PREFIX}/include/gear/gearsurf ${CMAKE_INSTALL_PREFIX}/include/gearsurf )" )
 
 IF( GEAR_TGEO )
-    INSTALL( CODE "EXEC_PROGRAM( \"${CMAKE_COMMAND}\" \"${CMAKE_INSTALL_PREFIX}/include\" ARGS -E create_symlink gear/geartgeo geartgeo )" )
+    INSTALL( CODE "EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_INSTALL_PREFIX}/include/gear/geartgeo ${CMAKE_INSTALL_PREFIX}/include/geartgeo )" )
 ENDIF()
 
 

diff --git a/include/gear/gearimpl/GearParametersImpl.h b/include/gear/gearimpl/GearParametersImpl.h
@@ -28,8 +28,13 @@ namespace gear {
     typedef std::map< std::string, StringVec > StringVecMap ;
 
 
+    GearParametersImpl() = default ;
+    GearParametersImpl(const GearParametersImpl&) = default ;
+    GearParametersImpl& operator = (const GearParametersImpl&) = default ;
+
     /// Destructor.
-    virtual ~GearParametersImpl() ;
+    virtual ~GearParametersImpl() = default ;
+
 
     /** Integer value for key.     
      *  @throws UnknownParameterException

diff --git a/include/gear/gearimpl/GlobalPadIndex.h b/include/gear/gearimpl/GlobalPadIndex.h
@@ -19,7 +19,9 @@ class GlobalPadIndex  {
 public:
 
 	GlobalPadIndex(int padIndex, int moduleID);
-	virtual ~GlobalPadIndex();
+	virtual ~GlobalPadIndex() = default;
+        GlobalPadIndex(const GlobalPadIndex&) = default;
+        GlobalPadIndex& operator=(const GlobalPadIndex&) = default;
 
 	bool operator < (const  GlobalPadIndex & cmp) const
 	{

diff --git a/include/gear/gearxml/GearParametersXML.h b/include/gear/gearxml/GearParametersXML.h
@@ -6,8 +6,6 @@
 
 #include "gearimpl/GearParametersImpl.h"
 
-#include <string>
-
 
 namespace gear {
 

diff --git a/src/gearimpl/GearParametersImpl.cc b/src/gearimpl/GearParametersImpl.cc
@@ -1,11 +1,7 @@
 #include "gearimpl/GearParametersImpl.h"
 
-#include <algorithm>
-
 namespace gear{
 
-  GearParametersImpl::~GearParametersImpl() { /* nop */; }
-
   int GearParametersImpl::getIntVal(const std::string & key) const {
 
     IntMap::const_iterator it = _intMap.find( key ) ;

diff --git a/src/gearimpl/GlobalPadIndex.cc b/src/gearimpl/GlobalPadIndex.cc
@@ -6,8 +6,6 @@ namespace gear {
 	_padIndex( padIndex) ,
 	_moduleID (moduleID) {
     }
-    GlobalPadIndex::~GlobalPadIndex(){
-    }
     int GlobalPadIndex::getPadIndex() const {
 	return _padIndex;
     }

diff --git a/src/gearimpl/TPCParametersImpl.cc b/src/gearimpl/TPCParametersImpl.cc
@@ -78,7 +78,7 @@ namespace gear {
 
 	// call the assignment operator of the GearParametersImpl mother class:
 	// *dynamic_cast<GearParametersImpl*>(this) = *dynamic_cast<GearParametersImpl const *>(&right);
-	GearParametersImpl::operator = (right);
+        this->operator = (right);
     }
 
     /// Destructor.

diff --git a/src/gearxml/GearParametersXML.cc b/src/gearxml/GearParametersXML.cc
@@ -50,9 +50,6 @@ namespace gear {
 
     } 
 
-    ~Tokenizer(){
-    }
-
     std::vector<std::string> & result()  { 
 
       return _tokens ; 

diff --git a/src/gearxml/RectangularPadRowLayoutXML.cc b/src/gearxml/RectangularPadRowLayoutXML.cc
@@ -85,8 +85,6 @@ namespace gear {
     RectangularPadRowLayout* padRowLayout = new RectangularPadRowLayout( xMin, xMax, yMin ) ;
 
     // ----- rows ------------
-    int rowId = 0 ;
-
     const TiXmlNode* row = 0 ;
     while( ( row = xmlElement->IterateChildren( "row", row ) )  != 0  ){
 
@@ -103,7 +101,6 @@ namespace gear {
 
       padRowLayout->addRow( nRow, nPad, padWidth, padHeight, rowHeight, leftOffset, rightOffset ) ;
 
-      rowId+= nRow ;
     }
 
     padRowLayout->repeatRows( repeatRowCount ) ;

diff --git a/src/test/testgear.cc b/src/test/testgear.cc
@@ -239,12 +239,14 @@ void testFixedPadSizeDiskLayout( const  FixedPadSizeDiskLayout& pl ) {
       // in the other implementations, because there are pads at the edge of the pad plane
       // which have no neighbour.
       if( j == 0 ) {
-	pl.getRightNeighbour(  pl.getPadIndex( iRow , iPad ) ) ; 
+	int ln = pl.getRightNeighbour(  pl.getPadIndex( iRow , iPad ) ) ; 
+        (void) ln ;
 	assert(  pl.getPadNumber( ln ) ==  nPad-1 ) ;
       }
 
       if( j == nPad-1 ) {
-	pl.getLeftNeighbour(  pl.getPadIndex( iRow , iPad ) ) ; 
+	int rn = pl.getLeftNeighbour(  pl.getPadIndex( iRow , iPad ) ) ; 
+        (void) rn ;
 	assert(  pl.getPadNumber( rn ) ==  0 ) ;
       }
 

diff --git a/src/test/testtpcproto.cc b/src/test/testtpcproto.cc
@@ -156,14 +156,16 @@ void testRectangularPadRowLayout( const  RectangularPadRowLayout& pl ) {
 
       if( j != 0 ) {
 
- 	pl.getLeftNeighbour(  pl.getPadIndex( iRow , iPad ) ) ; 
+ 	int ln = pl.getLeftNeighbour(  pl.getPadIndex( iRow , iPad ) ) ; 
+        (void) ln ;
 
  	assert(  pl.getPadNumber( ln ) ==  iPad - 1 ) ;
       }
 
       if( j != nPad-1 ) {
 
-	pl.getRightNeighbour(  pl.getPadIndex( iRow , iPad ) ) ; 
+	int rn = pl.getRightNeighbour(  pl.getPadIndex( iRow , iPad ) ) ; 
+        (void) rn ;
 
  	assert(  pl.getPadNumber( rn )  ==  iPad + 1 ) ;
       }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,8 +6,6 @@

		#include "gearimpl/GearParametersImpl.h"

		#include <string>


		namespace gear {

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,9 +50,6 @@ namespace gear { @@
         }
-        ~Tokenizer(){
-        }
         std::vector<std::string> & result()  {
           return _tokens ;
@@ Expand Down @@