import one more tiny fix for v2.7.3

mctools · Sep 10, 2021 · e40c670 · e40c670
1 parent 9cfc2cd
commit e40c670
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,6 +5,9 @@ v2.7.3 2021-09-09
          commulIntegral utility functions
        * Add new internal IofQHelper utility class which can be used to
          implement elastic physics described via an I(Q) curve
+       * Fix some obscure -Wshadow warnings on some rare platforms when some
+         local variable named s or m clashes with global variables of the same
+         name from Geant4.
 
 v2.7.2 2021-07-08
        * Various compilation fixes, affecting only users of Geant4-hooks with

diff --git a/ncrystal_core/include/NCrystal/NCMatCfg.hh b/ncrystal_core/include/NCrystal/NCMatCfg.hh
@@ -609,8 +609,8 @@ namespace NCrystal {
   inline MatInfoCfg::MatInfoCfg(const MatCfg& cfg) : m_cfg(cfg) {}
   inline MatInfoCfg::MatInfoCfg(MatCfg&& cfg) : m_cfg(std::move(cfg)) {}
   inline bool MatInfoCfg::isThinned() const { return m_cfg.isThinned(); }
-  inline std::ostream& operator<< (std::ostream& s, const MatCfg& cfg) { cfg.dump(s,false); return s; }
-  inline std::ostream& operator<< (std::ostream& s, const MatInfoCfg& cfg) { cfg.dump(s,false); return s; }
+  inline std::ostream& operator<< (std::ostream& os, const MatCfg& cfg) { cfg.dump(os,false); return os; }
+  inline std::ostream& operator<< (std::ostream& os, const MatInfoCfg& cfg) { cfg.dump(os,false); return os; }
 }
 
 #endif
diff --git a/ncrystal_core/include/NCrystal/NCNCMATData.hh b/ncrystal_core/include/NCrystal/NCNCMATData.hh
@@ -124,7 +124,7 @@ namespace NCrystal {
     std::vector<std::pair<CustomSectionName,CustomSectionData>> customSections;
 
     //Helper for validating "element" names (throws BadInput in case of problems):
-    static void validateElementNameByVersion(const std::string& s, unsigned version );
+    static void validateElementNameByVersion(const std::string&, unsigned version );
 
     //Call this once after filling fields (and before calling validate()!) in
     //order to unalias all element names (D->H2, T->H3).
@@ -139,7 +139,7 @@ namespace NCrystal {
     NCMATData& operator=( NCMATData&& ) = default;
 
   private:
-    void validateElementName( const std::string& s ) const;
+    void validateElementName( const std::string& ) const;
   };
 
 }

diff --git a/ncrystal_core/include/NCrystal/NCTextData.hh b/ncrystal_core/include/NCrystal/NCTextData.hh
@@ -226,14 +226,14 @@ namespace NCrystal {
   {
   }
 
-  inline RawStrData::RawStrData( std::string&& s, const char * srcdescr )
-    : RawStrData( makeSO<std::string>(std::move(s)), srcdescr )
+  inline RawStrData::RawStrData( std::string&& ss, const char * srcdescr )
+    : RawStrData( makeSO<std::string>(std::move(ss)), srcdescr )
   {
   }
 
-  inline bool RawStrData::hasSameContent( const std::string& s ) const
+  inline bool RawStrData::hasSameContent( const std::string& ss ) const
   {
-    return hasSameContent( s.c_str(), std::next(s.c_str(),s.size()) );
+    return hasSameContent( ss.c_str(), std::next(ss.c_str(),ss.size()) );
   }
 
   inline bool RawStrData::hasSameContent( const RawStrData& o ) const

diff --git a/ncrystal_core/include/NCrystal/internal/NCAtomUtils.hh b/ncrystal_core/include/NCrystal/internal/NCAtomUtils.hh
@@ -45,7 +45,7 @@ namespace NCrystal {
     //   NB: special aliases: "D" for "H2" and "T" for "H3".
     //3) Custom markers: "X", "X1", "X2", ..., "X99" (and no others).
 
-    AtomSymbol(const std::string& s);
+    AtomSymbol(const std::string&);
     ~AtomSymbol() = default;
 
     bool isInvalid() const;
@@ -86,14 +86,14 @@ namespace NCrystal {
 // Inline implementations //
 ////////////////////////////
 
-inline NCrystal::AtomSymbol::AtomSymbol(const std::string& s)
-  : m_z(elementNameToZ(s)),
+inline NCrystal::AtomSymbol::AtomSymbol(const std::string& ss)
+  : m_z(elementNameToZ(ss)),
     m_a(0)
 {
   //Usual case of regular element names is inlined, other cases needs
   //longer init:
   if (m_z==0)
-    longInit(s);
+    longInit(ss);
 }
 
 inline bool NCrystal::AtomSymbol::isInvalid() const { return m_z == 0 && m_a ==0; }