Skip to content

Commit a09ff54

Browse files
authored
Switching MathInternal.Min/Max to managed implementations (#208)
***NO_CI***
1 parent 5b18373 commit a09ff54

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

nanoFramework.CoreLibrary/System/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
[assembly: AssemblyProduct(".NET nanoFramework mscorlib")]
1414
[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]
1515

16-
[assembly: AssemblyNativeVersion("100.5.0.18")]
16+
[assembly: AssemblyNativeVersion("100.5.0.19")]

nanoFramework.CoreLibrary/System/Math.cs

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,26 @@ internal static class MathInternal
1313
[MethodImpl(MethodImplOptions.InternalCall)]
1414
internal static extern int Abs(int val);
1515

16-
[MethodImpl(MethodImplOptions.InternalCall)]
17-
internal static extern int Min(int val1, int val2);
16+
/// <summary>
17+
/// Returns the larger of two 32-bit signed integers.
18+
/// </summary>
19+
/// <param name="val1">The first of two 32-bit signed integers to compare. </param>
20+
/// <param name="val2">The second of two 32-bit signed integers to compare. </param>
21+
/// <returns>Parameter <paramref name="val1"/> or <paramref name="val2"/>, whichever is larger.</returns>
22+
internal static int Max(int val1, int val2)
23+
{
24+
return (val1 >= val2) ? val1 : val2;
25+
}
1826

19-
[MethodImpl(MethodImplOptions.InternalCall)]
20-
internal static extern int Max(int val1, int val2);
27+
/// <summary>
28+
/// Returns the smaller of two 32-bit signed integers.
29+
/// </summary>
30+
/// <param name="val1">The first of two 32-bit signed integers to compare. </param>
31+
/// <param name="val2">The second of two 32-bit signed integers to compare. </param>
32+
/// <returns>Parameter <paramref name="val1"/> or <paramref name="val2"/>, whichever is smaller.</returns>
33+
internal static int Min(int val1, int val2)
34+
{
35+
return (val2 >= val1) ? val1 : val2;
36+
}
2137
}
2238
}

0 commit comments

Comments
 (0)