diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2005-01-20 11:40:13 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2005-01-20 11:40:13 +0300 |
| commit | 8cf87a32420ca34b7f05fd5689c958e328ff0b3c (patch) | |
| tree | 6522453b0d4df32f5816ff0dffc90f223e45340e /mcs/class/System.Data/Mono.Data.SqlExpressions | |
| parent | d75832922d07e06f69db8740f2cd6df816a33c91 (diff) | |
2005-01-20 Atsushi Enomoto <atsushi@ximian.com>
* Numeric.cs : Fixed ToSameType(). It should let conversion result to
reference values.
svn path=/trunk/mcs/; revision=39239
Diffstat (limited to 'mcs/class/System.Data/Mono.Data.SqlExpressions')
| -rw-r--r-- | mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.Data/Mono.Data.SqlExpressions/Numeric.cs | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog b/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog index 2451c9a8dd9..ea89615b22a 100644 --- a/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog +++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog @@ -1,5 +1,10 @@ 2005-01-20 Atsushi Enomoto <atsushi@ximian.com> + * Numeric.cs : Fixed ToSameType(). It should let conversion result to + reference values. + +2005-01-20 Atsushi Enomoto <atsushi@ximian.com> + * Parser.jay : let's use debug flag when MONO_DEBUG_SQLEXPRESSIONS environment variable is set. Fixed substring() function. C# cast does not allow implicit diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/Numeric.cs b/mcs/class/System.Data/Mono.Data.SqlExpressions/Numeric.cs index d8e347c9586..0f8fd67469a 100644 --- a/mcs/class/System.Data/Mono.Data.SqlExpressions/Numeric.cs +++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/Numeric.cs @@ -71,9 +71,9 @@ namespace Mono.Data.SqlExpressions { // is it ok to make such assumptions about the order of an enum? if (tc1 < tc2) - Convert.ChangeType (o1, tc2); + o1 = (IConvertible) Convert.ChangeType (o1, tc2); else - Convert.ChangeType (o2, tc1); + o2 = (IConvertible) Convert.ChangeType (o2, tc1); } internal static IConvertible Add (IConvertible o1, IConvertible o2) |