small fixed for new warnings in e19

Mu2e · Nov 11, 2019 · 82ada23 · 82ada23
1 parent ef2d4fd
commit 82ada23
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/ExtinctionMonitorFNAL/Digitization/inc/ProtonPulseShape.hh b/ExtinctionMonitorFNAL/Digitization/inc/ProtonPulseShape.hh
@@ -47,7 +47,7 @@ namespace mu2e {
       };
 
       struct ProtonPathSort {
-        bool operator()(const ProtonPathMARSId& a, const ProtonPathMARSId& b) {
+        bool operator()(const ProtonPathMARSId& a, const ProtonPathMARSId& b) const {
           CmpProtonIdAndSimPath cm;
           IO::CmpG4JobInfo cg;
           return cm(a.minfo,b.minfo) || (!cm(b.minfo, a.minfo) &&

diff --git a/GeneralUtilities/inc/csv.hh b/GeneralUtilities/inc/csv.hh
@@ -75,7 +75,7 @@ namespace io {
             with_file_name() { std::memset(file_name, 0, max_file_name_length + 1); }
 
             void set_file_name(const char* file_name) {
-                std::strncpy(this->file_name, file_name, max_file_name_length);
+                std::strncpy(this->file_name, file_name, max_file_name_length+1);
                 this->file_name[max_file_name_length] = '\0';
             }
 
@@ -1050,7 +1050,7 @@ namespace io {
        private:
         LineReader in;
 
-        char*(row[column_count]);
+        char* row[column_count];
         std::string column_names[column_count];
 
         std::vector<int> col_order;

diff --git a/Mu2eG4/src/PrimaryGeneratorAction.cc b/Mu2eG4/src/PrimaryGeneratorAction.cc
@@ -88,7 +88,7 @@ namespace mu2e {
   }
 
   PrimaryGeneratorAction::PrimaryGeneratorAction()
-    : PrimaryGeneratorAction(true, 0, nullptr, perEvtObjManager)
+    : PrimaryGeneratorAction(true, 0, nullptr, nullptr)
   {}
 
   PrimaryGeneratorAction::PrimaryGeneratorAction(const fhicl::ParameterSet& pset,

diff --git a/Mu2eUtilities/src/BuildLinearFitMatrixSums.cc b/Mu2eUtilities/src/BuildLinearFitMatrixSums.cc
@@ -105,7 +105,7 @@ TMatrixD BuildLinearFitMatrixSums::GetCovX(){
 	double* det = NULL;                  
 	try {
     	        GammaINV.Invert(det);
-        } catch (std::exception exc) {
+        } catch (std::exception& exc) {
 
 	        std::stringstream message;
 		message << "Error in Cov Mat : Cannot fit due to singular matrix error on inversion!" << std::endl;
@@ -133,7 +133,7 @@ TMatrixD BuildLinearFitMatrixSums::GetAlphaX(){
 	try {
     	        Gamma.Invert(det);
 
-  	   } catch (std::exception exc) {
+  	   } catch (std::exception& exc) {
 
 		    std::stringstream message;
 		    message << "Error in Alpha : Cannot fit due to singular matrix error on inversion!" << std::endl;
@@ -156,7 +156,7 @@ TMatrixD BuildLinearFitMatrixSums::GetCovY(){
 	double* det = NULL;                  
 	try {
     	        GammaINV.Invert(det);
-        } catch (std::exception exc) {
+        } catch (std::exception& exc) {
 
 	        std::stringstream message;
 		message << "Error in Cov Mat : Cannot fit due to singular matrix error on inversion!" << std::endl;
@@ -184,7 +184,7 @@ TMatrixD BuildLinearFitMatrixSums::GetAlphaY(){
 	try {
     	        Gamma.Invert(det);
 
-  	   } catch (std::exception exc) {
+  	   } catch (std::exception& exc) {
 
 		    std::stringstream message;
 		    message << "Error in Alpha : Cannot fit due to singular matrix error on inversion!" << std::endl;
@@ -200,7 +200,7 @@ double BuildLinearFitMatrixSums::GetChi2X(){
         double* det = NULL;                  
 	try {
     	        GammaX.Invert(det);
-  	   } catch (std::exception exc) {
+  	   } catch (std::exception& exc) {
 		    std::stringstream message;
 		    message << "Error in Chi2X : Cannot fit due to singular matrix error on inversion!" << std::endl;
           } 
@@ -223,7 +223,7 @@ double BuildLinearFitMatrixSums::GetChi2Y(){
 	try {
     	        GammaY.Invert(det);
 
-  	   } catch (std::exception exc) {
+  	   } catch (std::exception& exc) {
 
 		    std::stringstream message;
 		    message << "Error in Chi2Y : Cannot fit due to singular matrix error on inversion!" << std::endl;

diff --git a/TrkReco/src/KalFit.cc b/TrkReco/src/KalFit.cc
@@ -85,7 +85,7 @@ namespace mu2e
   struct StrawFlightComp : public binary_function<StrawFlight, StrawFlight, bool> {
     double _maxdiff; // maximum flight difference; below this, consider 2 intersections 'the same'
     StrawFlightComp(double maxdiff) : _maxdiff(maxdiff) {}
-    bool operator () (StrawFlight const& a, StrawFlight const& b) { return a._id < b._id ||
+    bool operator () (StrawFlight const& a, StrawFlight const& b) const { return a._id < b._id ||
     ( a._id == b._id && a._flt < b._flt && fabs(a._flt-b._flt)>=_maxdiff);}
   };