Skip to content
Snippets Groups Projects

Address clang 17 warnings

Closed Shaun Roe requested to merge sroe/GeoModel:clangWarnings into main
9 files
+ 46
27
Compare changes
  • Side-by-side
  • Inline
Files
9
@@ -3,6 +3,8 @@
@@ -3,6 +3,8 @@
*/
*/
#include "GeoModelHelpers/GeoDeDuplicator.h"
#include "GeoModelHelpers/GeoDeDuplicator.h"
 
#include <ios>
 
#include <type_traits>
GeoDeDuplicator::TrfSet GeoDeDuplicator::s_trfStore{};
GeoDeDuplicator::TrfSet GeoDeDuplicator::s_trfStore{};
GeoDeDuplicator::ShapeSet GeoDeDuplicator::s_shapeStore{};
GeoDeDuplicator::ShapeSet GeoDeDuplicator::s_shapeStore{};
@@ -12,6 +14,10 @@ GeoDeDuplicator::GeoIdMap GeoDeDuplicator::s_geoIds{};
@@ -12,6 +14,10 @@ GeoDeDuplicator::GeoIdMap GeoDeDuplicator::s_geoIds{};
namespace {
namespace {
std::mutex s_mutex{};
std::mutex s_mutex{};
 
template<class A, class B>
 
bool compare(B& b) {
 
return typeid(b) == typeid(A);
 
}
}
}
void GeoDeDuplicator::setShapeDeDuplication(bool enable){
void GeoDeDuplicator::setShapeDeDuplication(bool enable){
@@ -124,10 +130,10 @@ PVLink GeoDeDuplicator::clone(PVConstLink cloneMe) const {
@@ -124,10 +130,10 @@ PVLink GeoDeDuplicator::clone(PVConstLink cloneMe) const {
for(unsigned int chNode =0; chNode < cloneMe->getNChildNodes(); ++chNode) {
for(unsigned int chNode =0; chNode < cloneMe->getNChildNodes(); ++chNode) {
GeoIntrusivePtr<const GeoGraphNode>node{*cloneMe->getChildNode(chNode)};
GeoIntrusivePtr<const GeoGraphNode>node{*cloneMe->getChildNode(chNode)};
/** transform nodes */
/** transform nodes */
if (typeid(*node) == typeid(GeoAlignableTransform)) {
if (compare<GeoAlignableTransform>(*node)) {
const auto geoTrf = dynamic_pointer_cast<const GeoAlignableTransform>(node);
const auto geoTrf = dynamic_pointer_cast<const GeoAlignableTransform>(node);
newVol->add(make_intrusive<GeoAlignableTransform>(geoTrf->getDefTransform()));
newVol->add(make_intrusive<GeoAlignableTransform>(geoTrf->getDefTransform()));
} else if (typeid(*node) == typeid(GeoTransform)) {
} else if (compare<GeoTransform>(*node)) {
const auto geoTrf = dynamic_pointer_cast<const GeoTransform>(node);
const auto geoTrf = dynamic_pointer_cast<const GeoTransform>(node);
auto geoTrfNonConst = const_pointer_cast(geoTrf);
auto geoTrfNonConst = const_pointer_cast(geoTrf);
newVol->add(cacheTransform(geoTrfNonConst));
newVol->add(cacheTransform(geoTrfNonConst));
Loading