Import Geant4 11.3.0 source tree

source/visualization/modeling/include/G4AttValueFilterT.hh

@@ -36,6 +36,8 @@
 #include "G4ConversionFatalError.hh"
 #include "G4ConversionUtils.hh"
 
+#include <utility>
+
 namespace {
   
   // Helper classes
@@ -168,8 +170,7 @@ G4AttValueFilterT<T, ConversionErrorPolicy>::LoadIntervalElement(const G4String&
 
   if (!G4ConversionUtils::Convert(input, min, max)) ConversionErrorPolicy::ReportError(input, "Invalid format. Was the input data formatted correctly ?");
 
-  std::pair<T, T> myPair(min, max);
-  fIntervalMap[input] = myPair;
+  fIntervalMap[input] = std::pair<T, T> (min, max);
 }
 
 template <typename T, typename ConversionErrorPolicy>
@@ -180,7 +181,7 @@ G4AttValueFilterT<T, ConversionErrorPolicy>::LoadSingleValueElement(const G4Stri
   
   if (!G4ConversionUtils::Convert(input, output)) ConversionErrorPolicy::ReportError(input, "Invalid format. Was the input data formatted correctly ?");
 
-  fSingleValueMap[input] = output;
+  fSingleValueMap[input] = std::move(output);
 }
 
 template <typename T, typename ConversionErrorPolicy>

source/visualization/modeling/include/G4AttributeFilterT.hh

@@ -37,7 +37,9 @@
 #include "G4AttValue.hh"
 #include "G4SmartFilter.hh"
 #include "G4VAttValueFilter.hh"
+
 #include <vector>
+#include <utility>
 
 template <typename T>
 class G4AttributeFilterT : public G4SmartFilter<T> {
@@ -208,7 +210,7 @@ G4AttributeFilterT<T>::AddInterval(const G4String& interval)
     return;
   }
 
-  fConfigVect.push_back(myPair);
+  fConfigVect.push_back(std::move(myPair));
 }
 
 template <typename T>
@@ -226,7 +228,7 @@ G4AttributeFilterT<T>::AddValue(const G4String& value)
       ("G4AttributeFilterT::AddValue", "modeling0105", JustWarning, ed);
     return;
   }
-  fConfigVect.push_back(myPair);
+  fConfigVect.push_back(std::move(myPair));
 }
 
 #endif

source/visualization/modeling/include/G4ModelingParameters.hh

@@ -86,7 +86,7 @@ public: // With description
   class PVNameCopyNo {
   public:
     // Normal constructor
-    PVNameCopyNo(G4String name, G4int copyNo)
+    PVNameCopyNo(const G4String& name, G4int copyNo)
     : fName(name), fCopyNo(copyNo) {}
     const G4String& GetName() const {return fName;}
     G4int GetCopyNo() const {return fCopyNo;}

source/visualization/modeling/include/G4PhysicalVolumesSearchScene.hh

@@ -61,13 +61,11 @@ public:
      G4VPhysicalVolume* pFoundPV,
      G4int foundPVCopyNo = 0,
      G4int foundDepth = 0,
-     std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>
-     foundBasePVPath =
-     std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>(),
-     std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>
-     foundFullPVPath =
-     std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>(),
-     G4Transform3D foundObjectTransformation = G4Transform3D())
+     const std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>&
+       foundBasePVPath = std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>(),
+     const std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>&
+       foundFullPVPath = std::vector<G4PhysicalVolumeModel::G4PhysicalVolumeNodeID>(),
+     const G4Transform3D& foundObjectTransformation = G4Transform3D())
     : fpSearchPV(pSearchPV)
     , fpFoundPV(pFoundPV)
     , fFoundPVCopyNo(foundPVCopyNo)