Skip to content
Snippets Groups Projects
Commit b4de0b37 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix

parent af7495ad
No related branches found
No related tags found
No related merge requests found
...@@ -748,7 +748,7 @@ namespace onelab{ ...@@ -748,7 +748,7 @@ namespace onelab{
const std::string &client=""){ return _get(ps, name, client, _functions); } const std::string &client=""){ return _get(ps, name, client, _functions); }
unsigned int getNumParameters() unsigned int getNumParameters()
{ {
return _numbers.size() + _strings.size() + _regions.size() + _functions.size(); return (int)(_numbers.size() + _strings.size() + _regions.size() + _functions.size());
} }
// check if at least one parameter depends on the given client // check if at least one parameter depends on the given client
bool hasClient(const std::string &client) const bool hasClient(const std::string &client) const
...@@ -943,7 +943,7 @@ namespace onelab{ ...@@ -943,7 +943,7 @@ namespace onelab{
typedef std::map<std::string, client*>::iterator citer; typedef std::map<std::string, client*>::iterator citer;
citer firstClient(){ return _clients.begin(); } citer firstClient(){ return _clients.begin(); }
citer lastClient(){ return _clients.end(); } citer lastClient(){ return _clients.end(); }
int getNumClients() { return _clients.size(); }; int getNumClients() { return (int)_clients.size(); };
citer findClient(const std::string &name){ return _clients.find(name); } citer findClient(const std::string &name){ return _clients.find(name); }
void registerClient(client *c) void registerClient(client *c)
{ {
......
...@@ -39,7 +39,7 @@ class GEdgeLoop ...@@ -39,7 +39,7 @@ class GEdgeLoop
inline citer end() const { return loop.end(); } inline citer end() const { return loop.end(); }
inline void erase(iter it){ loop.erase(it); } inline void erase(iter it){ loop.erase(it); }
int count(GEdge*) const; int count(GEdge*) const;
int count() const { return loop.size(); } int count() const { return (int)loop.size(); }
}; };
#endif #endif
...@@ -310,7 +310,7 @@ class GEntity { ...@@ -310,7 +310,7 @@ class GEntity {
void setAllElementsVisible(bool val){ _allElementsVisible = val ? 1 : 0; } void setAllElementsVisible(bool val){ _allElementsVisible = val ? 1 : 0; }
// get the number of mesh vertices in the entity // get the number of mesh vertices in the entity
unsigned int getNumMeshVertices() { return mesh_vertices.size(); } unsigned int getNumMeshVertices() { return (int)mesh_vertices.size(); }
// get the mesh vertex at the given index // get the mesh vertex at the given index
MVertex *getMeshVertex(unsigned int index) { return mesh_vertices[index]; } MVertex *getMeshVertex(unsigned int index) { return mesh_vertices[index]; }
......
...@@ -23,7 +23,7 @@ class MFace { ...@@ -23,7 +23,7 @@ class MFace {
MFace() {} MFace() {}
MFace(MVertex *v0, MVertex *v1, MVertex *v2, MVertex *v3=0); MFace(MVertex *v0, MVertex *v1, MVertex *v2, MVertex *v3=0);
MFace(const std::vector<MVertex*> v); MFace(const std::vector<MVertex*> v);
inline int getNumVertices() const { return _v.size(); } inline int getNumVertices() const { return (int)_v.size(); }
inline MVertex *getVertex(const int i) const { return _v[i]; } inline MVertex *getVertex(const int i) const { return _v[i]; }
inline MVertex *getSortedVertex(const int i) const { return _v[int(_si[i])]; } inline MVertex *getSortedVertex(const int i) const { return _v[int(_si[i])]; }
inline MEdge getEdge(const int i) const inline MEdge getEdge(const int i) const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment