diff options
| author | Senganal T <senga@mono-cvs.ximian.com> | 2006-01-10 16:21:44 +0300 |
|---|---|---|
| committer | Senganal T <senga@mono-cvs.ximian.com> | 2006-01-10 16:21:44 +0300 |
| commit | 852bcf82136bdc1f0f35581b736c6e436651e9af (patch) | |
| tree | db26c82be610ef56625bda51d2c776393f6c9a9d /mcs/class/System.Data/Mono.Data.SqlExpressions | |
| parent | 0738b1b7fafa85b5cddcdf29aa8fa9b7ef8fded0 (diff) | |
2006-01-10 Senganal T <tsenganal@novell.com>
* Mono.Data.SqlExpressions/Aggregation.cs
* Mono.Data.SqlExpressions/Expression.cs
* System.Data/RelatedDataView.cs
* System.Data/DataColumn.cs
- Resolbes a method name clash in IExpression
svn path=/branches/mono-1-1-13/mcs/; revision=55293
Diffstat (limited to 'mcs/class/System.Data/Mono.Data.SqlExpressions')
3 files changed, 11 insertions, 6 deletions
diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs b/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs index 8a58a73bb5d..ffb3e1e44db 100644 --- a/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs +++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/Aggregation.cs @@ -196,7 +196,7 @@ namespace Mono.Data.SqlExpressions { return res; } - public override Void Reset () + public override Void ResetExpression () { if (table != null) InvalidateCache (table, null); diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog b/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog index 69b5008662d..237f607562c 100644 --- a/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog +++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog @@ -1,3 +1,8 @@ +2006-01-09 Senganal T <tsenganal@novell.com> + * Aggregation.cs + * Expression.cs + - resolving a name clash in IExpression + 2006-01-06 Senganal T <tsenganal@novell.com> * Aggregation.cs diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/Expressions.cs b/mcs/class/System.Data/Mono.Data.SqlExpressions/Expressions.cs index 09e3f75aaf4..6e5bdf0c486 100644 --- a/mcs/class/System.Data/Mono.Data.SqlExpressions/Expressions.cs +++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/Expressions.cs @@ -40,7 +40,7 @@ namespace Mono.Data.SqlExpressions { bool DependsOn(DataColumn other); bool EvalBoolean (DataRow row); - void Reset(); + void ResetExpression (); } internal abstract class BaseExpression : IExpression { @@ -65,7 +65,7 @@ namespace Mono.Data.SqlExpressions { return 0; } - public virtual void Reset() + public virtual void ResetExpression () { } } @@ -140,10 +140,10 @@ namespace Mono.Data.SqlExpressions { return expr1.DependsOn(other) || expr2.DependsOn(other); } - override public void Reset () + override public void ResetExpression () { - expr1.Reset (); - expr2.Reset (); + expr1.ResetExpression (); + expr2.ResetExpression (); } } |