During GCC build, series of warning messages regarding shadowed variables were

scottfurry · MKleusberg · commit 925eed3ef826 · 2019-05-01T22:13:55.000+02:00
produced. Messages would take the form:

[SQLB root]/src/sql/sqlitetypes.cpp:465:79: warning: declaration of ‘fields’ shadows a member of ‘sqlb::Table’ [-Wshadow]

and reference

[SQLB root]/src/sql/sqlitetypes.h:310:17: note: shadowed declaration is here
     FieldVector fields;

All incidents isolated to [SQLDB root]/src/sql/sqlitetypes.{h,cpp}.
Change renames local variables to silence warnings.

no errors after execution w/ gcc/clang builds on Linux.
diff --git a/src/sql/sqlitetypes.cpp b/src/sql/sqlitetypes.cpp
@@ -462,49 +462,49 @@ std::string Table::sql(const std::string& schema, bool ifNotExists) const
     return sql + ";";
 }
 
-void Table::addConstraint(const StringVector& fields, ConstraintPtr constraint)
+void Table::addConstraint(const StringVector& vStrFields, ConstraintPtr constraint)
 {
-    m_constraints.insert({fields, constraint});
+    m_constraints.insert({vStrFields, constraint});
 }
 
-void Table::setConstraint(const StringVector& fields, ConstraintPtr constraint)
+void Table::setConstraint(const StringVector& vStrFields, ConstraintPtr constraint)
 {
     // Delete any old constraints of this type for these fields
-    removeConstraints(fields, constraint->type());
+    removeConstraints(vStrFields, constraint->type());
 
     // Add the new constraint to the table, effectively overwriting all old constraints for that fields/type combination
-    addConstraint(fields, constraint);
+    addConstraint(vStrFields, constraint);
 }
 
-void Table::removeConstraints(const StringVector& fields, Constraint::ConstraintTypes type)
+void Table::removeConstraints(const StringVector& vStrFields, Constraint::ConstraintTypes type)
 {
     for(auto it = m_constraints.begin();it!=m_constraints.end();)
     {
-        if(it->first == fields && it->second->type() == type)
+        if(it->first == vStrFields && it->second->type() == type)
             m_constraints.erase(it++);
         else
             ++it;
     }
 }
 
-ConstraintPtr Table::constraint(const StringVector& fields, Constraint::ConstraintTypes type) const
+ConstraintPtr Table::constraint(const StringVector& vStrFields, Constraint::ConstraintTypes type) const
 {
-    auto list = constraints(fields, type);
+    auto list = constraints(vStrFields, type);
     if(list.size())
         return list.at(0);
     else
         return ConstraintPtr(nullptr);
 }
 
-std::vector<ConstraintPtr> Table::constraints(const StringVector& fields, Constraint::ConstraintTypes type) const
+std::vector<ConstraintPtr> Table::constraints(const StringVector& vStrFields, Constraint::ConstraintTypes type) const
 {
     ConstraintMap::const_iterator begin, end;
-    if(fields.empty())
+    if(vStrFields.empty())
     {
         begin = m_constraints.begin();
         end = m_constraints.end();
     } else {
-        std::tie(begin, end) = m_constraints.equal_range(fields);
+        std::tie(begin, end) = m_constraints.equal_range(vStrFields);
     }
 
     std::vector<ConstraintPtr> clist;
diff --git a/src/sql/sqlitetypes.h b/src/sql/sqlitetypes.h
@@ -329,11 +329,11 @@ class Table : public Object
 
     FieldInfoList fieldInformation() const override;
 
-    void addConstraint(const StringVector& fields, ConstraintPtr constraint);
-    void setConstraint(const StringVector& fields, ConstraintPtr constraint);
-    void removeConstraints(const StringVector& fields = StringVector(), Constraint::ConstraintTypes type = Constraint::NoType); //! Only removes the first constraint, if any
-    ConstraintPtr constraint(const StringVector& fields = StringVector(), Constraint::ConstraintTypes type = Constraint::NoType) const;   //! Only returns the first constraint, if any
-    std::vector<ConstraintPtr> constraints(const StringVector& fields = StringVector(), Constraint::ConstraintTypes type = Constraint::NoType) const;
+    void addConstraint(const StringVector& vStrFields, ConstraintPtr constraint);
+    void setConstraint(const StringVector& vStrFields, ConstraintPtr constraint);
+    void removeConstraints(const StringVector& vStrFields = StringVector(), Constraint::ConstraintTypes type = Constraint::NoType); //! Only removes the first constraint, if any
+    ConstraintPtr constraint(const StringVector& vStrFields = StringVector(), Constraint::ConstraintTypes type = Constraint::NoType) const;   //! Only returns the first constraint, if any
+    std::vector<ConstraintPtr> constraints(const StringVector& vStrFields = StringVector(), Constraint::ConstraintTypes type = Constraint::NoType) const;
     ConstraintMap allConstraints() const { return m_constraints; }
     void setConstraints(const ConstraintMap& constraints);
     StringVector& primaryKeyRef();

Original file line number	Diff line number	Diff line change
`@@ -462,49 +462,49 @@ std::string Table::sql(const std::string& schema, bool ifNotExists) const`
`462`	`462`	`return sql + ";";`
`463`	`463`	`}`
`464`	`464`
`465`		`-void Table::addConstraint(const StringVector& fields, ConstraintPtr constraint)`
	`465`	`+void Table::addConstraint(const StringVector& vStrFields, ConstraintPtr constraint)`
`466`	`466`	`{`
`467`		`- m_constraints.insert({fields, constraint});`
	`467`	`+ m_constraints.insert({vStrFields, constraint});`
`468`	`468`	`}`
`469`	`469`
`470`		`-void Table::setConstraint(const StringVector& fields, ConstraintPtr constraint)`
	`470`	`+void Table::setConstraint(const StringVector& vStrFields, ConstraintPtr constraint)`
`471`	`471`	`{`
`472`	`472`	`// Delete any old constraints of this type for these fields`
`473`		`- removeConstraints(fields, constraint->type());`
	`473`	`+ removeConstraints(vStrFields, constraint->type());`
`474`	`474`
`475`	`475`	`// Add the new constraint to the table, effectively overwriting all old constraints for that fields/type combination`
`476`		`- addConstraint(fields, constraint);`
	`476`	`+ addConstraint(vStrFields, constraint);`
`477`	`477`	`}`
`478`	`478`
`479`		`-void Table::removeConstraints(const StringVector& fields, Constraint::ConstraintTypes type)`
	`479`	`+void Table::removeConstraints(const StringVector& vStrFields, Constraint::ConstraintTypes type)`
`480`	`480`	`{`
`481`	`481`	`for(auto it = m_constraints.begin();it!=m_constraints.end();)`
`482`	`482`	`{`
`483`		`- if(it->first == fields && it->second->type() == type)`
	`483`	`+ if(it->first == vStrFields && it->second->type() == type)`
`484`	`484`	`m_constraints.erase(it++);`
`485`	`485`	`else`
`486`	`486`	`++it;`
`487`	`487`	`}`
`488`	`488`	`}`
`489`	`489`
`490`		`-ConstraintPtr Table::constraint(const StringVector& fields, Constraint::ConstraintTypes type) const`
	`490`	`+ConstraintPtr Table::constraint(const StringVector& vStrFields, Constraint::ConstraintTypes type) const`
`491`	`491`	`{`
`492`		`- auto list = constraints(fields, type);`
	`492`	`+ auto list = constraints(vStrFields, type);`
`493`	`493`	`if(list.size())`
`494`	`494`	`return list.at(0);`
`495`	`495`	`else`
`496`	`496`	`return ConstraintPtr(nullptr);`
`497`	`497`	`}`
`498`	`498`
`499`		`-std::vector<ConstraintPtr> Table::constraints(const StringVector& fields, Constraint::ConstraintTypes type) const`
	`499`	`+std::vector<ConstraintPtr> Table::constraints(const StringVector& vStrFields, Constraint::ConstraintTypes type) const`
`500`	`500`	`{`
`501`	`501`	`ConstraintMap::const_iterator begin, end;`
`502`		`- if(fields.empty())`
	`502`	`+ if(vStrFields.empty())`
`503`	`503`	`{`
`504`	`504`	`begin = m_constraints.begin();`
`505`	`505`	`end = m_constraints.end();`
`506`	`506`	`} else {`
`507`		`- std::tie(begin, end) = m_constraints.equal_range(fields);`
	`507`	`+ std::tie(begin, end) = m_constraints.equal_range(vStrFields);`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`std::vector<ConstraintPtr> clist;`