Commit 4368575b authored by Martin Heistermann's avatar Martin Heistermann
Browse files

Rename accidentally overloaded internal function

parent b8e6f3d7
Pipeline #10456 passed with stage
in 4 minutes and 4 seconds
...@@ -309,7 +309,7 @@ private: ...@@ -309,7 +309,7 @@ private:
void remove_property(StdVecT& _vec, size_t _idx); void remove_property(StdVecT& _vec, size_t _idx);
template<class StdVecT, class PropT, class HandleT, class T> template<class StdVecT, class PropT, class HandleT, class T>
PropT request_property(StdVecT& _vec, const std::string& _name, size_t _size, const T _def = T()); PropT internal_request_property(StdVecT& _vec, const std::string& _name, size_t _size, const T _def = T());
template<class StdVecT> template<class StdVecT>
void clearVec(StdVecT& _vec); void clearVec(StdVecT& _vec);
......
...@@ -50,47 +50,47 @@ namespace OpenVolumeMesh { ...@@ -50,47 +50,47 @@ namespace OpenVolumeMesh {
template<class T> template<class T>
VertexPropertyT<T> ResourceManager::request_vertex_property(const std::string& _name, const T _def) { VertexPropertyT<T> ResourceManager::request_vertex_property(const std::string& _name, const T _def) {
return request_property<std::vector<BaseProperty*>,VertexPropertyT<T>,VertexPropHandle,T>(vertex_props_, _name, n_vertices(), _def); return internal_request_property<std::vector<BaseProperty*>,VertexPropertyT<T>,VertexPropHandle,T>(vertex_props_, _name, n_vertices(), _def);
} }
template<class T> template<class T>
EdgePropertyT<T> ResourceManager::request_edge_property(const std::string& _name, const T _def) { EdgePropertyT<T> ResourceManager::request_edge_property(const std::string& _name, const T _def) {
return request_property<std::vector<BaseProperty*>,EdgePropertyT<T>,EdgePropHandle,T>(edge_props_, _name, n_edges(), _def); return internal_request_property<std::vector<BaseProperty*>,EdgePropertyT<T>,EdgePropHandle,T>(edge_props_, _name, n_edges(), _def);
} }
template<class T> template<class T>
HalfEdgePropertyT<T> ResourceManager::request_halfedge_property(const std::string& _name, const T _def) { HalfEdgePropertyT<T> ResourceManager::request_halfedge_property(const std::string& _name, const T _def) {
return request_property<std::vector<BaseProperty*>,HalfEdgePropertyT<T>,HalfEdgePropHandle,T>(halfedge_props_, _name, n_edges()*2u, _def); return internal_request_property<std::vector<BaseProperty*>,HalfEdgePropertyT<T>,HalfEdgePropHandle,T>(halfedge_props_, _name, n_edges()*2u, _def);
} }
template<class T> template<class T>
FacePropertyT<T> ResourceManager::request_face_property(const std::string& _name, const T _def) { FacePropertyT<T> ResourceManager::request_face_property(const std::string& _name, const T _def) {
return request_property<std::vector<BaseProperty*>,FacePropertyT<T>,FacePropHandle,T>(face_props_, _name, n_faces(), _def); return internal_request_property<std::vector<BaseProperty*>,FacePropertyT<T>,FacePropHandle,T>(face_props_, _name, n_faces(), _def);
} }
template<class T> template<class T>
HalfFacePropertyT<T> ResourceManager::request_halfface_property(const std::string& _name, const T _def) { HalfFacePropertyT<T> ResourceManager::request_halfface_property(const std::string& _name, const T _def) {
return request_property<std::vector<BaseProperty*>,HalfFacePropertyT<T>,HalfFacePropHandle,T>(halfface_props_, _name, n_faces()*2u, _def); return internal_request_property<std::vector<BaseProperty*>,HalfFacePropertyT<T>,HalfFacePropHandle,T>(halfface_props_, _name, n_faces()*2u, _def);
} }
template<class T> template<class T>
CellPropertyT<T> ResourceManager::request_cell_property(const std::string& _name, const T _def) { CellPropertyT<T> ResourceManager::request_cell_property(const std::string& _name, const T _def) {
return request_property<std::vector<BaseProperty*>,CellPropertyT<T>,CellPropHandle,T>(cell_props_, _name, n_cells(), _def); return internal_request_property<std::vector<BaseProperty*>,CellPropertyT<T>,CellPropHandle,T>(cell_props_, _name, n_cells(), _def);
} }
template<class T> template<class T>
MeshPropertyT<T> ResourceManager::request_mesh_property(const std::string& _name, const T _def) { MeshPropertyT<T> ResourceManager::request_mesh_property(const std::string& _name, const T _def) {
return request_property<std::vector<BaseProperty*>,MeshPropertyT<T>,MeshPropHandle,T>(mesh_props_, _name, 1, _def); return internal_request_property<std::vector<BaseProperty*>,MeshPropertyT<T>,MeshPropHandle,T>(mesh_props_, _name, 1, _def);
} }
template<class StdVecT, class PropT, class HandleT, class T> template<class StdVecT, class PropT, class HandleT, class T>
PropT ResourceManager::request_property(StdVecT& _vec, const std::string& _name, size_t _size, const T _def) { PropT ResourceManager::internal_request_property(StdVecT& _vec, const std::string& _name, size_t _size, const T _def) {
if(!_name.empty()) { if(!_name.empty()) {
for(typename StdVecT::iterator it = _vec.begin(); for(typename StdVecT::iterator it = _vec.begin();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment