Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix return type of non-member min and max functions

Browse Source
This commit is contained in:
Max Lyon
2019-10-07 14:57:24 +02:00
parent e6fca39d15
commit da233b391e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenMesh/Core/Geometry/Vector11T.hh
View File

@@ -762,14 +762,14 @@ VectorT<Scalar, DIM>& minimize(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>&
/// \relates OpenMesh::VectorT /// \relates OpenMesh::VectorT
/// non-member max /// non-member max
template<typename Scalar, int DIM> template<typename Scalar, int DIM>
VectorT<Scalar, DIM>& max(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2) { VectorT<Scalar, DIM> max(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2) {
return VectorT<Scalar, DIM>(_v1).maximize(_v2); return VectorT<Scalar, DIM>(_v1).maximize(_v2);
} }
/// \relates OpenMesh::VectorT /// \relates OpenMesh::VectorT
/// non-member min /// non-member min
template<typename Scalar, int DIM> template<typename Scalar, int DIM>
VectorT<Scalar, DIM>& min(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2) { VectorT<Scalar, DIM> min(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2) {
return VectorT<Scalar, DIM>(_v1).minimize(_v2); return VectorT<Scalar, DIM>(_v1).minimize(_v2);
} }

4
src/OpenMesh/Core/Geometry/VectorT.hh
View File

@@ -320,7 +320,7 @@ VectorT<Scalar, DIM>& minimize(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>&
/// \relates OpenMesh::VectorT /// \relates OpenMesh::VectorT
/// non-member max /// non-member max
template<typename Scalar, int DIM> template<typename Scalar, int DIM>
VectorT<Scalar, DIM>& max(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2) { VectorT<Scalar, DIM> max(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2) {
return VectorT<Scalar, DIM>(_v1).maximize(_v2); return VectorT<Scalar, DIM>(_v1).maximize(_v2);
} }
@@ -328,7 +328,7 @@ VectorT<Scalar, DIM>& max(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2)
/// \relates OpenMesh::VectorT /// \relates OpenMesh::VectorT
/// non-member min /// non-member min
template<typename Scalar, int DIM> template<typename Scalar, int DIM>
VectorT<Scalar, DIM>& max(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2) { VectorT<Scalar, DIM> min(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2) {
return VectorT<Scalar, DIM>(_v1).minimize(_v2); return VectorT<Scalar, DIM>(_v1).minimize(_v2);
} }