From 45f58793321b9a387f596881dc70aeed7fc976da Mon Sep 17 00:00:00 2001
From: Andrea Dell'Acqua <andrea.dellacqua@cern.ch>
Date: Wed, 3 Nov 2021 09:04:04 +0100
Subject: [PATCH] set a default value to ProcessorList in Gmx2Geo so that
client code will not in the least affected. Merging this branch after this
correction
---
GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx | 3 +--
GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h | 2 +-
GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx b/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx
index c0f95daf6..664f7dab3 100644
--- a/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx
+++ b/GeoModelTools/GeoModelXML/GMXPlugin/src/GMXPlugin.cxx
@@ -106,9 +106,8 @@ void GMXPlugin::create(GeoPhysVol *world, bool publish)
" does not exist. quitting and returning nicely! "<<std::endl;
return;
}
- processorList proc;
GmxInterface gmxInterface;
- Gmx2Geo gmx2Geo(f, world, gmxInterface,proc, 0 , matman);
+ Gmx2Geo gmx2Geo(f, world, gmxInterface, 0 , matman);
}
if (matman) MaterialManager::getManager()->printAll();
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h
index d21e26d8e..b2f671511 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/GeoModelXml/Gmx2Geo.h
@@ -58,7 +58,7 @@ class Evaluator;
class Gmx2Geo {
public:
- Gmx2Geo(const std::string gmxFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, processorList& procs ,unsigned int flags = 0, bool useMatManager = 0);
+ Gmx2Geo(const std::string gmxFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags = 0, bool useMatManager = 0,const processorList& procs=processorList());
private:
// Disallow copying
Gmx2Geo(const Gmx2Geo &right);
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
index 355ba2548..d9683891e 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/src/Gmx2Geo.cxx
@@ -30,7 +30,7 @@
using namespace std;
using namespace xercesc;
-Gmx2Geo::Gmx2Geo(const string xmlFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, processorList& procs, unsigned int flags, bool useMatManager) {
+Gmx2Geo::Gmx2Geo(const string xmlFile, GeoPhysVol *addHere, GmxInterface &gmxInterface, unsigned int flags, bool useMatManager, const processorList& procs) {
//
// Create the xml tree (DOMDocument)
//
--
GitLab