Fix compiler warnings (implicit signed/unsigned cast / irrelevant const specifier)

davidrohr · davidrohr · commit 1424a2802884 · 2020-10-28T09:38:53.000+01:00
diff --git a/DataFormats/simulation/include/SimulationDataFormat/ConstMCTruthContainer.h b/DataFormats/simulation/include/SimulationDataFormat/ConstMCTruthContainer.h
@@ -86,7 +86,7 @@ class ConstMCTruthContainer : public std::vector<char>
     source += sizeof(FlatHeader);
     const size_t headerSize = flatheader.sizeofHeaderElement * flatheader.nofHeaderElements;
     source += headerSize;
-    return (TruthElement const* const)source;
+    return (TruthElement const*)source;
   }
 
   FlatHeader const& getHeader() const
@@ -100,7 +100,7 @@ class ConstMCTruthContainer : public std::vector<char>
   {
     auto* source = &(*this)[0];
     source += sizeof(FlatHeader);
-    return (MCTruthHeaderElement const* const)source;
+    return (MCTruthHeaderElement const*)source;
   }
 };
 } // namespace dataformats
@@ -185,7 +185,7 @@ class ConstMCTruthContainerView
     source += sizeof(FlatHeader);
     const size_t headerSize = flatheader.sizeofHeaderElement * flatheader.nofHeaderElements;
     source += headerSize;
-    return (TruthElement const* const)source;
+    return (TruthElement const*)source;
   }
 
   FlatHeader const& getHeader() const
@@ -199,7 +199,7 @@ class ConstMCTruthContainerView
   {
     auto* source = &(mStorage)[0];
     source += sizeof(FlatHeader);
-    return (MCTruthHeaderElement const* const)source;
+    return (MCTruthHeaderElement const*)source;
   }
 };
 
diff --git a/DataFormats/simulation/include/SimulationDataFormat/MCTruthContainer.h b/DataFormats/simulation/include/SimulationDataFormat/MCTruthContainer.h
@@ -267,7 +267,7 @@ class MCTruthContainer
       // fix headers
       for (uint32_t i = dataindex + 1; i < mHeaderArray.size(); ++i) {
         auto oldindex = mHeaderArray[i].index;
-        mHeaderArray[i].index = (oldindex != -1) ? oldindex + 1 : oldindex;
+        mHeaderArray[i].index = (oldindex != (uint32_t)-1) ? oldindex + 1 : oldindex;
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class ConstMCTruthContainer : public std::vector<char>`
`86`	`86`	`source += sizeof(FlatHeader);`
`87`	`87`	`const size_t headerSize = flatheader.sizeofHeaderElement * flatheader.nofHeaderElements;`
`88`	`88`	`source += headerSize;`
`89`		`- return (TruthElement const* const)source;`
	`89`	`+ return (TruthElement const*)source;`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`FlatHeader const& getHeader() const`
`@@ -100,7 +100,7 @@ class ConstMCTruthContainer : public std::vector<char>`
`100`	`100`	`{`
`101`	`101`	`auto* source = &(*this)[0];`
`102`	`102`	`source += sizeof(FlatHeader);`
`103`		`- return (MCTruthHeaderElement const* const)source;`
	`103`	`+ return (MCTruthHeaderElement const*)source;`
`104`	`104`	`}`
`105`	`105`	`};`
`106`	`106`	`} // namespace dataformats`
`@@ -185,7 +185,7 @@ class ConstMCTruthContainerView`
`185`	`185`	`source += sizeof(FlatHeader);`
`186`	`186`	`const size_t headerSize = flatheader.sizeofHeaderElement * flatheader.nofHeaderElements;`
`187`	`187`	`source += headerSize;`
`188`		`- return (TruthElement const* const)source;`
	`188`	`+ return (TruthElement const*)source;`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`FlatHeader const& getHeader() const`
`@@ -199,7 +199,7 @@ class ConstMCTruthContainerView`
`199`	`199`	`{`
`200`	`200`	`auto* source = &(mStorage)[0];`
`201`	`201`	`source += sizeof(FlatHeader);`
`202`		`- return (MCTruthHeaderElement const* const)source;`
	`202`	`+ return (MCTruthHeaderElement const*)source;`
`203`	`203`	`}`
`204`	`204`	`};`
`205`	`205`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ class MCTruthContainer`
`267`	`267`	`// fix headers`
`268`	`268`	`for (uint32_t i = dataindex + 1; i < mHeaderArray.size(); ++i) {`
`269`	`269`	`auto oldindex = mHeaderArray[i].index;`
`270`		`- mHeaderArray[i].index = (oldindex != -1) ? oldindex + 1 : oldindex;`
	`270`	`+ mHeaderArray[i].index = (oldindex != (uint32_t)-1) ? oldindex + 1 : oldindex;`
`271`	`271`	`}`
`272`	`272`	`}`
`273`	`273`	`}`