diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2008-02-12 11:38:54 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2008-02-12 11:38:54 +0300 |
| commit | 6f49cb91723259461a23f224d231874ca4c06426 (patch) | |
| tree | 7c9d38dbc442aa9d6113340da39f470c5390902a /mcs/class/System.XML/System.Xml.XPath | |
| parent | 10471fd6bde7eef2918ea708c26475748194586a (diff) | |
2008-02-12 Atsushi Enomoto <atsushi@ximian.com>
* DefaultContext.cs : now number formatting for "R" works fine, so
just use it (and remove conditional compilation for TARGET_JVM).
svn path=/trunk/mcs/; revision=95479
Diffstat (limited to 'mcs/class/System.XML/System.Xml.XPath')
| -rw-r--r-- | mcs/class/System.XML/System.Xml.XPath/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/mcs/class/System.XML/System.Xml.XPath/ChangeLog b/mcs/class/System.XML/System.Xml.XPath/ChangeLog index c24cc8e1139..44328cfd1f8 100644 --- a/mcs/class/System.XML/System.Xml.XPath/ChangeLog +++ b/mcs/class/System.XML/System.Xml.XPath/ChangeLog @@ -1,3 +1,8 @@ +2008-02-12 Atsushi Enomoto <atsushi@ximian.com> + + * DefaultContext.cs : now number formatting for "R" works fine, so + just use it (and remove conditional compilation for TARGET_JVM). + 2008-01-10 Konstantin Triger <kostat@mainsoft.com> * Iterator.cs: prevent endless recursion in AncestorIterator diff --git a/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs b/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs index 986706292c3..0685c9cf737 100644 --- a/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs +++ b/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs @@ -115,15 +115,7 @@ namespace System.Xml.XPath return "-Infinity"; if (d == Double.PositiveInfinity) return "Infinity"; - // FIXME: - // Return string in roundtrip format (currently it - // rather breaks things, so we don't use it until - // System.Double gets fixed.) -#if TARGET_JVM - return d.ToString ("R", System.Globalization.NumberFormatInfo.InvariantInfo); -#else - return ((double) d).ToString (System.Globalization.NumberFormatInfo.InvariantInfo); -#endif + return d.ToString ("R", NumberFormatInfo.InvariantInfo); } public static double ToNumber (object arg) |