Merge branch 'legacy-vector-min-max-const-args' into 'master'
legacy vector min max should take const args See merge request OpenMesh/OpenMesh!335
This commit is contained in:
@@ -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(const VectorT<Scalar, DIM>& _v1, const 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> min(VectorT<Scalar, DIM>& _v1, VectorT<Scalar, DIM>& _v2) {
|
VectorT<Scalar, DIM> min(const VectorT<Scalar, DIM>& _v1, const VectorT<Scalar, DIM>& _v2) {
|
||||||
return VectorT<Scalar, DIM>(_v1).minimize(_v2);
|
return VectorT<Scalar, DIM>(_v1).minimize(_v2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user