Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
--- a/mcs/class/corlib/System/Decimal.cs
+++ b/mcs/class/corlib/System/Decimal.cs
@@ -574,6 +574,14 @@ namespace System
 			dec_part = Decimal.Floor(dec_part);
 			dec_part /= (10000000000000000000000000000M / p);
 			dec_part = Math.Round (dec_part, mode);
+
+			// ignore trailing zeros
+			while (decimals > 0 && (dec_part % 10) == 0) {
+				decimals--;
+				dec_part /= 10;
+				p /= 10;
+			}
+
 			dec_part /= p;
 			decimal result = int_part + dec_part;