Merge pull request g-truc#1096 from gottfriedleibniz/fix/minmax

fix: associated min/max g-truc#1096
mingshi2333 · Apr 20, 2022 · 8b6e2ff · 8b6e2ff
2 parents 922f391 + 3062122
commit 8b6e2ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp
@@ -31,13 +31,13 @@ namespace glm
 
  /// Minimum comparison between 2 variables and returns 2 associated variable values
  /// @see gtx_associated_min_max
- template<typename T, typename U, qualifier Q>
+ template<typename T, typename U>
  GLM_FUNC_DECL U associatedMin(T x, U a, T y, U b);
 
  /// Minimum comparison between 2 variables and returns 2 associated variable values
  /// @see gtx_associated_min_max
  template<length_t L, typename T, typename U, qualifier Q>
- GLM_FUNC_DECL vec<2, U, Q> associatedMin(
+ GLM_FUNC_DECL vec<L, U, Q> associatedMin(
  vec<L, T, Q> const& x, vec<L, U, Q> const& a,
  vec<L, T, Q> const& y, vec<L, U, Q> const& b);
 
@@ -115,7 +115,7 @@ namespace glm
  /// Maximum comparison between 2 variables and returns 2 associated variable values
  /// @see gtx_associated_min_max
  template<length_t L, typename T, typename U, qualifier Q>
- GLM_FUNC_DECL vec<2, U, Q> associatedMax(
+ GLM_FUNC_DECL vec<L, U, Q> associatedMax(
  vec<L, T, Q> const& x, vec<L, U, Q> const& a,
  vec<L, T, Q> const& y, vec<L, U, Q> const& b);
 

diff --git a/glm/gtx/associated_min_max.inl b/glm/gtx/associated_min_max.inl
@@ -3,14 +3,14 @@
 namespace glm{
 
 // Min comparison between 2 variables
-template<typename T, typename U, qualifier Q>
+template<typename T, typename U>
 GLM_FUNC_QUALIFIER U associatedMin(T x, U a, T y, U b)
 {
  return x < y ? a : b;
 }
 
 template<length_t L, typename T, typename U, qualifier Q>
-GLM_FUNC_QUALIFIER vec<2, U, Q> associatedMin
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
 (
  vec<L, T, Q> const& x, vec<L, U, Q> const& a,
  vec<L, T, Q> const& y, vec<L, U, Q> const& b
@@ -169,7 +169,7 @@ GLM_FUNC_QUALIFIER U associatedMax(T x, U a, T y, U b)
 
 // Max comparison between 2 variables
 template<length_t L, typename T, typename U, qualifier Q>
-GLM_FUNC_QUALIFIER vec<2, U, Q> associatedMax
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
 (
  vec<L, T, Q> const& x, vec<L, U, Q> const& a,
  vec<L, T, Q> const& y, vec<L, U, Q> const& b