Merge branch 'thread.GeoModelXml-20211015' into 'master'

GeoModelXml: Enable thread-safety checking.

See merge request atlas/athena!47262

DetectorDescription/GeoModelXml/CMakeLists.txt

@@ -18,6 +18,6 @@ atlas_add_library( GeoModelXml
    PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}
    LINK_LIBRARIES ${XERCESC_LIBRARIES} ${EIGEN_LIBRARIES} ${GEOMODEL_LIBRARIES}
    PRIVATE_LINK_LIBRARIES ${ZLIB_LIBRARIES} GaudiKernel GeoModelInterfaces
-                          StoreGateLib )
+                          StoreGateLib CxxUtils )
 
 atlas_install_runtime( data/*.dtd )

DetectorDescription/GeoModelXml/GeoModelXml/ATLAS_CHECK_THREAD_SAFETY

+DetectorDescription/GeoModelXml

DetectorDescription/GeoModelXml/GeoModelXml/Element2GeoItem.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -28,9 +28,9 @@ class Element2GeoItem {
 public:
     Element2GeoItem();
     virtual ~Element2GeoItem();
-    const RCBase * process(const xercesc::DOMElement *element, GmxUtil &gmxUtil);
-    virtual const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    RCBase * process(const xercesc::DOMElement *element, GmxUtil &gmxUtil);
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
 protected:
-    std::map<std::string, const RCBase *> m_map;  
+    std::map<std::string, RCBase *> m_map;  
 };
 #endif // ELEMENT2GEO_ITEM_H

DetectorDescription/GeoModelXml/GeoModelXml/GeoNodeList.h

@@ -6,3 +6,4 @@
 #include "GeoModelKernel/GeoGraphNode.h"
 
 typedef std::vector<GeoGraphNode *> GeoNodeList;
+typedef std::vector<const GeoGraphNode *> GeoConstNodeList;

DetectorDescription/GeoModelXml/GeoModelXml/MakeElement.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -14,7 +14,7 @@
 class MakeElement: public Element2GeoItem {
 public:
     MakeElement();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // MAKE_ELEMENT_H

DetectorDescription/GeoModelXml/GeoModelXml/MakeMaterial.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -14,7 +14,7 @@
 class MakeMaterial: public Element2GeoItem {
 public:
     MakeMaterial();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // MAKE_MATERIAL_H

DetectorDescription/GeoModelXml/GeoModelXml/MakeTransformation.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -14,7 +14,7 @@
 class MakeTransformation: public Element2GeoItem {
 public:
     MakeTransformation();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // MAKE_TRANSFORMATION_H

DetectorDescription/GeoModelXml/GeoModelXml/MakeTransformationref.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -13,7 +13,7 @@
 
 class MakeTransformationref: public Element2GeoItem {
 public:
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // MAKE_TRANSFORMATIONREF_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakeBox.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakeBox: public Element2GeoItem {
 public:
     MakeBox();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_BOX_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakeCons.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakeCons: public Element2GeoItem {
 public:
     MakeCons();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_CONS_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakeGenericTrap.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakeGenericTrap: public Element2GeoItem {
 public:
     MakeGenericTrap();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_GENERICTRAP_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakeIntersection.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakeIntersection: public Element2GeoItem {
 public:
     MakeIntersection();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_INTERSECTION_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakePara.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakePara: public Element2GeoItem {
 public:
     MakePara();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_PARA_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakePcon.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakePcon: public Element2GeoItem {
 public:
     MakePcon();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_PCON_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakePgon.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakePgon: public Element2GeoItem {
 public:
     MakePgon();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_PGON_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakeShaperef.h

@@ -15,7 +15,7 @@
 class MakeShaperef: public Element2GeoItem {
 public:
 //    MakeShaperef() {};
-    const RCBase * process(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    RCBase * process(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
 };
 
 #endif // GEO_MODEL_XML_MAKE_SHAPEREF_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakeSimplePolygonBrep.h

 /*
-  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 #include <xercesc/util/XercesDefs.hpp>
 //
@@ -14,7 +14,7 @@
 class MakeSimplePolygonBrep: public Element2GeoItem {
 public:
     MakeSimplePolygonBrep();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_SIMPLEPOLYGONBREP_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakeSubtraction.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakeSubtraction: public Element2GeoItem {
 public:
     MakeSubtraction();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_SUBTRACTION_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakeTrap.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakeTrap: public Element2GeoItem {
 public:
     MakeTrap();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_TRAP_H

DetectorDescription/GeoModelXml/GeoModelXml/shape/MakeTrd.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
 */
 
 //
@@ -15,7 +15,7 @@
 class MakeTrd: public Element2GeoItem {
 public:
     MakeTrd();
-    const RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const;
+    virtual RCBase * make(const xercesc::DOMElement *element, GmxUtil &gmxUtil) const override;
 };
 
 #endif // GEO_MODEL_XML_MAKE_TRD_H