* SqlString.cs: changed accessibility of CompareOptions property

to private, commented out unreachable code

svn path=/trunk/mcs/; revision=26994

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
index 5ac0c6698533891ead57922ac42fb207f2a51e77..1014beff6b53a4c9943e7df867fd31d0aca427d8 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-09  Gert Driesen (drieseng@users.sourceforge.net)
+       * SqlString.cs: change accessibility of CompareOptions property
+       to private, commented out unreachable code
+
 2004-04-12  Atsushi Enomoto  <atsushi@ximian.com>
 
        * SqlBoolean.cs : Allow "0" and "1" on Parse(). Allow SqlString.Null

diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
index b933ef8128ed444cefc02f6954938c7758ad2eb2..3b58f149b0e6f674abbdf94c68612f500746ba6f 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
@@ -184,17 +184,6 @@ namespace System.Data.SqlTypes
                        }
                }
 
-               public CompareOptions CompareOptions {
-                       get {
-                               return 
-                                       (this.compareOptions & SqlCompareOptions.BinarySort) != 0 ? 
-                                       CompareOptions.Ordinal :
-                                       // 27 == all SqlCompareOptions - BinarySort 
-                                       // (1,2,8,24 are common to CompareOptions)
-                                       (CompareOptions) ((int) this.compareOptions & 27);
-                       }
-               }
-
                public bool IsNull {
                        get { return !notNull; }
                }
@@ -221,7 +210,22 @@ namespace System.Data.SqlTypes
                         }
                 }
 
-               #endregion // Public Properties
+               #endregion // Public Properties\r
+\r
+               #region Private Properties\r
+\r
+               private CompareOptions CompareOptions {\r
+                       get {\r
+                               return\r
+                                       (this.compareOptions & SqlCompareOptions.BinarySort) != 0 ?\r
+                                       CompareOptions.Ordinal :\r
+                                       // 27 == all SqlCompareOptions - BinarySort \r
+                                       // (1,2,8,24 are common to CompareOptions)\r
+                                       (CompareOptions)((int)this.compareOptions & 27);\r
+                       }\r
+               }\r
+\r
+               #endregion Private Properties
 
                #region Public Methods
 
@@ -513,7 +517,7 @@ namespace System.Data.SqlTypes
                                return Null;
                        else
                                return new SqlString (x.Value.ToString ());
-                               return new SqlString (x.Value.ToString ("N", DecimalFormat));
+                               // return new SqlString (x.Value.ToString ("N", DecimalFormat));
                }
 
                public static explicit operator SqlString (SqlDouble x) 
@@ -562,7 +566,7 @@ namespace System.Data.SqlTypes
                                return Null;
                        else
                                return new SqlString (x.Value.ToString ());
-                               return new SqlString (x.Value.ToString ("N", MoneyFormat));
+                               // return new SqlString (x.Value.ToString ("N", MoneyFormat));
                }
 
                public static explicit operator SqlString (SqlSingle x)