kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

use explicit prefix std:: for vectors

Browse Source 
- also add potentially missing include
- this commit is an attempt to fix #7585
This commit is contained in:
Uwe
2022-10-11 01:44:24 +02:00
parent 767ff373ee
commit a96a3a505f
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CartesianParameters3D.cpp vendored
View File

@@ -191,7 +191,7 @@ void StdMeshers_CartesianParameters3D::SetGrid(std::vector<double>& coords, int
//purpose : Set grid spacing along the three axes
//=======================================================================
void StdMeshers_CartesianParameters3D::SetGridSpacing(std::vector<string>& xSpaceFuns,
void StdMeshers_CartesianParameters3D::SetGridSpacing(std::vector<std::string>& xSpaceFuns,
std::vector<double>& xInternalPoints,
const int axis)
{

4
src/App/PropertyLinks.cpp
View File

@@ -1743,7 +1743,7 @@ void PropertyLinkSubList::setValues(std::vector<DocumentObject*>&& lValue,
hasSetValue();
}
void PropertyLinkSubList::setValue(DocumentObject* lValue, const std::vector<string> &SubList)
void PropertyLinkSubList::setValue(DocumentObject* lValue, const std::vector<std::string> &SubList)
{
auto parent = dynamic_cast<App::DocumentObject*>(getContainer());
verifyObject(lValue, parent);
@@ -3919,7 +3919,7 @@ void PropertyXLinkSubList::addValue(App::DocumentObject *obj,
guard.tryInvoke();
}
void PropertyXLinkSubList::setValue(DocumentObject* lValue, const std::vector<string> &SubList)
void PropertyXLinkSubList::setValue(DocumentObject *lValue, const std::vector<std::string> &SubList)
{
std::map<DocumentObject *, std::vector<std::string> > values;
if(lValue)

6
src/Mod/Fem/App/FemMesh.cpp
View File

@@ -1171,7 +1171,7 @@ class GRIDFreeFieldElement : public GRIDElement {
void read(const std::string& str, const std::string&) override {
char_separator<char> sep(",");
tokenizer<char_separator<char> > tokens(str, sep);
std::vector<string> token_results;
std::vector<std::string> token_results;
token_results.assign(tokens.begin(),tokens.end());
if (token_results.size() < 6)
return;//Line does not include Nodal coordinates
@@ -1225,7 +1225,7 @@ public:
void read(const std::string& str, const std::string&) override {
char_separator<char> sep(",");
tokenizer<char_separator<char> > tokens(str, sep);
std::vector<string> token_results;
std::vector<std::string> token_results;
token_results.assign(tokens.begin(),tokens.end());
if (token_results.size() < 6)
return;//Line does not include enough nodal IDs
@@ -1295,7 +1295,7 @@ public:
void read(const std::string& str, const std::string&) override {
char_separator<char> sep(",");
tokenizer<char_separator<char> > tokens(str, sep);
std::vector<string> token_results;
std::vector<std::string> token_results;
token_results.assign(tokens.begin(),tokens.end());
if (token_results.size() < 14)
return;//Line does not include enough nodal IDs

5
src/Mod/Fem/App/FemMeshShapeObject.cpp
View File

@@ -28,6 +28,7 @@
# include <BRepBuilderAPI_Copy.hxx>
# include <BRepTools.hxx>
# include <SMESH_Gen.hxx>
# include <SMESH_Mesh.hxx>
# include <StdMeshers_MaxLength.hxx>
# include <StdMeshers_LocalLength.hxx>
# include <StdMeshers_MaxElementArea.hxx>
@@ -60,7 +61,9 @@ PROPERTY_SOURCE(Fem::FemMeshShapeObject, Fem::FemMeshObject)
FemMeshShapeObject::FemMeshShapeObject()
{
ADD_PROPERTY_TYPE(Shape,(nullptr), "FEM Mesh",Prop_None,"Geometry object, the mesh is made from. The geometry object has to have a Shape.");
ADD_PROPERTY_TYPE(
Shape, (nullptr), "FEM Mesh", Prop_None,
"Geometry object, the mesh is made from. The geometry object has to have a Shape.");
}
FemMeshShapeObject::~FemMeshShapeObject()

2
src/Mod/PartDesign/Gui/Command.cpp
View File

@@ -981,7 +981,7 @@ unsigned validateSketches(std::vector<App::DocumentObject*>& sketches,
void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, const std::string& which,
std::function<void (Part::Feature*, App::DocumentObject*)> func)
{
auto base_worker = [=](App::DocumentObject* feature, const std::vector<string> &subs) {
auto base_worker = [=](App::DocumentObject *feature, const std::vector<std::string> &subs) {
if (!feature || !feature->isDerivedFrom(Part::Feature::getClassTypeId()))
return;