Correction for Fedora 18 64 bit issue 24473

diff --git a/src/NCollection/NCollection_Vec2.hxx b/src/NCollection/NCollection_Vec2.hxx
index c7abfdecf54c0ff5bbfa4c28fe9ed71b5decd043..289a7eceed4bec385dd55a6c4a11c987fdf59db3 100644 (file)
--- a/src/NCollection/NCollection_Vec2.hxx
+++ b/src/NCollection/NCollection_Vec2.hxx
@@ -164,15 +164,15 @@ public:
   //! Compute component-wise minimum of two vectors.
   NCollection_Vec2 cwiseMin (const NCollection_Vec2& theVec) const
   {
-    return NCollection_Vec2 (Min (v[0], theVec.v[0]),
-                             Min (v[1], theVec.v[1]));
+    return NCollection_Vec2 (v[0] < theVec.v[0] ? v[0] : theVec.v[0],
+                             v[1] < theVec.v[1] ? v[1] : theVec.v[1]);
   }
 
   //! Compute component-wise maximum of two vectors.
   NCollection_Vec2 cwiseMax (const NCollection_Vec2& theVec) const
   {
-    return NCollection_Vec2 (Max (v[0], theVec.v[0]),
-                             Max (v[1], theVec.v[1]));
+    return NCollection_Vec2 (v[0] > theVec.v[0] ? v[0] : theVec.v[0],
+                             v[1] > theVec.v[1] ? v[1] : theVec.v[1]);
   }
 
   //! Compute per-component multiplication by scale factor.

diff --git a/src/NCollection/NCollection_Vec3.hxx b/src/NCollection/NCollection_Vec3.hxx
index fdc9bad4ffe88805d12b08129bcdffd5b418f47f..5f93b7cd864b410ba0eec80df9de7fada260c2a2 100644 (file)
--- a/src/NCollection/NCollection_Vec3.hxx
+++ b/src/NCollection/NCollection_Vec3.hxx
@@ -237,17 +237,17 @@ public:
   //! Compute component-wise minimum of two vectors.
   NCollection_Vec3 cwiseMin (const NCollection_Vec3& theVec) const
   {
-    return NCollection_Vec3 (Min (v[0], theVec.v[0]),
-                             Min (v[1], theVec.v[1]),
-                             Min (v[2], theVec.v[2]));
+    return NCollection_Vec3 (v[0] < theVec.v[0] ? v[0] : theVec.v[0],
+                             v[1] < theVec.v[1] ? v[1] : theVec.v[1],
+                             v[2] < theVec.v[2] ? v[2] : theVec.v[2]);
   }
 
   //! Compute component-wise maximum of two vectors.
   NCollection_Vec3 cwiseMax (const NCollection_Vec3& theVec) const
   {
-    return NCollection_Vec3 (Max (v[0], theVec.v[0]),
-                             Max (v[1], theVec.v[1]),
-                             Max (v[2], theVec.v[2]));
+    return NCollection_Vec3 (v[0] > theVec.v[0] ? v[0] : theVec.v[0],
+                             v[1] > theVec.v[1] ? v[1] : theVec.v[1],
+                             v[2] > theVec.v[2] ? v[2] : theVec.v[2]);
   }
 
   //! Compute per-component division by scale factor.

diff --git a/src/NCollection/NCollection_Vec4.hxx b/src/NCollection/NCollection_Vec4.hxx
index 234ec45cc4189897eac94edfcb5298dce84dff1e..c1d0054cb51cb11c1e787268751d18aaa1b0095e 100644 (file)
--- a/src/NCollection/NCollection_Vec4.hxx
+++ b/src/NCollection/NCollection_Vec4.hxx
@@ -287,19 +287,19 @@ public:
   //! Compute component-wise minimum of two vectors.
   NCollection_Vec4 cwiseMin (const NCollection_Vec4& theVec) const
   {
-    return NCollection_Vec4 (Min (v[0], theVec.v[0]),
-                             Min (v[1], theVec.v[1]),
-                             Min (v[2], theVec.v[2]),
-                             Min (v[3], theVec.v[3]));
+    return NCollection_Vec4 (v[0] < theVec.v[0] ? v[0] : theVec.v[0],
+                             v[1] < theVec.v[1] ? v[1] : theVec.v[1],
+                             v[2] < theVec.v[2] ? v[2] : theVec.v[2],
+                             v[3] < theVec.v[3] ? v[3] : theVec.v[3]);
   }
 
   //! Compute component-wise maximum of two vectors.
   NCollection_Vec4 cwiseMax (const NCollection_Vec4& theVec) const
   {
-    return NCollection_Vec4 (Max (v[0], theVec.v[0]),
-                             Max (v[1], theVec.v[1]),
-                             Max (v[2], theVec.v[2]),
-                             Max (v[3], theVec.v[3]));
+    return NCollection_Vec4 (v[0] > theVec.v[0] ? v[0] : theVec.v[0],
+                             v[1] > theVec.v[1] ? v[1] : theVec.v[1],
+                             v[2] > theVec.v[2] ? v[2] : theVec.v[2],
+                             v[3] > theVec.v[3] ? v[3] : theVec.v[3]);
   }
 
   //! Compute per-component division by scale factor.