Mercurial > projects > dwt2
diff java/src/java/lang/Math.d @ 16:dbfb303e8fb0
first complete successful compile (win-only)
author | Frank Benoit <benoit@tionex.de> |
---|---|
date | Wed, 18 Mar 2009 08:56:47 +0100 |
parents | c4b1a29263fc |
children | 9b96950f2c3c |
line wrap: on
line diff
--- a/java/src/java/lang/Math.d Sun Mar 15 19:51:07 2009 +0100 +++ b/java/src/java/lang/Math.d Wed Mar 18 08:56:47 2009 +0100 @@ -13,6 +13,8 @@ static double min(double a, double b){ return a < b ? a : b; } static float min(float a, float b){ return a < b ? a : b; } + static float min(float a, int b){ return a < b ? a : b; } + static float min(int a, float b){ return a < b ? a : b; } static int min(byte a, byte b){ return a < b ? a : b; } static int min(int a, int b){ return a < b ? a : b; } static int min(uint a, int b){ return a < b ? a : b; } @@ -24,6 +26,8 @@ static double max(double a, double b){ return a > b ? a : b; } static float max(float a, float b){ return a > b ? a : b; } + static float max(float a, int b){ return a > b ? a : b; } + static float max(int a, float b){ return a > b ? a : b; } static int max(byte a, byte b){ return a > b ? a : b; } static int max(int a, int b){ return a > b ? a : b; } static int max(uint a, int b){ return a > b ? a : b; } @@ -39,10 +43,12 @@ static long round(double a) { return cast(long)tango.math.Math.round(a); } static int round(float a) { return cast(int)tango.math.Math.round(a); } + static int round(int a) { return a; } static double rint(double a) { return tango.math.Math.rndint(a); } static double ceil(double a) { return tango.math.Math.ceil(a); } static double floor(double a) { return tango.math.Math.floor(a); } static double sqrt(double a) { return tango.math.Math.sqrt(a); } + static double atan2(double a, double b) { return tango.math.Math.atan2(a,b); } static double pow(double a, double b) { return tango.math.Math.pow(a, b); } }