Permalink
Browse files

backport r68492.

svn path=/branches/mono-1-2-1/mcs/; revision=68495
  • Loading branch information...
1 parent 8578364 commit 3bb68f1bddf41c5c387e28bbd0dba65df0cca0d3 @atsushieno atsushieno committed Nov 27, 2006
@@ -1,3 +1,8 @@
+2006-11-27 Atsushi Enomoto <atsushi@ximian.com>
+
+ * CompareInfo.cs : fixed wrong || with && for OrdinalIgnoreCase.
+ Fixed bug #80056.
+
2006-11-10 Marek Safar <marek.safar@gmail.com>
* CultureInfo.cs (TextInfo): Construct a culture when is
@@ -467,7 +467,7 @@ public virtual int IndexOf (string source, string value)
{
return UseManagedCollation &&
#if NET_2_0
- ((CompareOptions.Ordinal & opt) == 0 ||
+ ((CompareOptions.Ordinal & opt) == 0 &&
(CompareOptions.OrdinalIgnoreCase & opt) == 0) ?
#else
(CompareOptions.Ordinal & opt) == 0 ?
@@ -535,7 +535,7 @@ public virtual int IndexOf (string source, string value)
{
return UseManagedCollation &&
#if NET_2_0
- ((CompareOptions.Ordinal & opt) == 0 ||
+ ((CompareOptions.Ordinal & opt) == 0 &&
(CompareOptions.OrdinalIgnoreCase & opt) == 0) ?
#else
(CompareOptions.Ordinal & opt) == 0 ?

0 comments on commit 3bb68f1

Please sign in to comment.