Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2863
Modified Files:
PgErrorCollection.cs PgParameterCollection.cs
Log Message:
Removed spcific mono hack
Index: PgErrorCollection.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgErrorCollection.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PgErrorCollection.cs 9 Feb 2004 14:19:22 -0000 1.4
--- PgErrorCollection.cs 6 Mar 2004 14:51:23 -0000 1.5
***************
*** 102,113 ****
private bool cultureAwareCompare(string strA, string strB)
{
! try
! {
! return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, strB, CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase) == 0 ? true : false;
! }
! catch (Exception)
! {
! return strA.ToUpper() == strB.ToUpper() ? true : false;
! }
}
--- 102,110 ----
private bool cultureAwareCompare(string strA, string strB)
{
! return CultureInfo.CurrentCulture.CompareInfo.Compare(
! strA,
! strB,
! CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth |
! CompareOptions.IgnoreCase) == 0 ? true : false;
}
Index: PgParameterCollection.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgParameterCollection.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PgParameterCollection.cs 9 Feb 2004 14:19:22 -0000 1.6
--- PgParameterCollection.cs 6 Mar 2004 14:51:23 -0000 1.7
***************
*** 254,265 ****
private bool cultureAwareCompare(string strA, string strB)
{
! try
! {
! return CultureInfo.CurrentCulture.CompareInfo.Compare(strA, strB, CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth | CompareOptions.IgnoreCase) == 0 ? true : false;
! }
! catch (Exception)
! {
! return strA.ToUpper() == strB.ToUpper() ? true : false;
! }
}
--- 254,262 ----
private bool cultureAwareCompare(string strA, string strB)
{
! return CultureInfo.CurrentCulture.CompareInfo.Compare(
! strA,
! strB,
! CompareOptions.IgnoreKanaType | CompareOptions.IgnoreWidth |
! CompareOptions.IgnoreCase) == 0 ? true : false;
}
|
