maint: merge stable to default

Rik · Rik · commit d76132f7936f · 2025-07-22T23:28:00.000+02:00
diff --git a/liboctave/numeric/mappers.h b/liboctave/numeric/mappers.h
@@ -273,17 +273,13 @@ x_nint (T x)
 template <>
 inline double x_nint (double x)
 {
-  double fl = std::floor (x);
-  double frac = x - fl;
-  return (! isfinite (x) ? x : (frac >= 0.5) ? fl+1 : fl);
+  return std::round (x);
 }
 
 template <>
 inline float x_nint (float x)
 {
-  float fl = std::floor (x);
-  float frac = x - fl;
-  return (! isfinite (x) ? x : (frac >= 0.5f) ? fl+1 : fl);
+  return std::round (x);
 }
 
 extern OCTAVE_API octave_idx_type nint_big (double x);

Original file line number	Diff line number	Diff line change
`@@ -273,17 +273,13 @@ x_nint (T x)`
`273`	`273`	`template <>`
`274`	`274`	`inline double x_nint (double x)`
`275`	`275`	`{`
`276`		`- double fl = std::floor (x);`
`277`		`- double frac = x - fl;`
`278`		`- return (! isfinite (x) ? x : (frac >= 0.5) ? fl+1 : fl);`
	`276`	`+ return std::round (x);`
`279`	`277`	`}`
`280`	`278`
`281`	`279`	`template <>`
`282`	`280`	`inline float x_nint (float x)`
`283`	`281`	`{`
`284`		`- float fl = std::floor (x);`
`285`		`- float frac = x - fl;`
`286`		`- return (! isfinite (x) ? x : (frac >= 0.5f) ? fl+1 : fl);`
	`282`	`+ return std::round (x);`
`287`	`283`	`}`
`288`	`284`
`289`	`285`	`extern OCTAVE_API octave_idx_type nint_big (double x);`