In System.Data:

2005-07-22  Sureshkumar T  <tsureshkumar@novell.com>

	* DataView.cs: changed protected members
	rowstate,rowcache,dataTable to protected internal.
	* Constraint.cs, ForeignKeyConstraint.cs, UniqueConstraint.cs:
	changed InConstraintViolated to protected internal.
	* ConflictOptions.cs, UpdateOptions.cs, FillOptions.cs: enclosed
	with NET_2_0 define.

In System.Data.Odbc:
2005-07-22  Sureshkumar T  <tsureshkumar@novell.com>

	* OdbcDataReader.cs: NextRow (): made private.

	Formatting corrections. Fixes bug #75574.

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

diff --git a/mcs/class/System.Data/System.Data.Odbc/ChangeLog b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
index d760a17ab4cef5387f1a76af607a4dc19069f1b3..ae98a672f1f45d2fc01bc2a99145305b168812ce 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/ChangeLog
+++ b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
@@ -1,7 +1,11 @@
+2005-07-22  Sureshkumar T  <tsureshkumar@novell.com>
+
+       * OdbcDataReader.cs: NextRow (): made private.
+
 2005-07-21  Sureshkumar T  <tsureshkumar@novell.com>
 
        * OdbcDataReader.cs: GetValue (): added case for OdbcType.Bit. and
-       Formatting corrections.
+       Formatting corrections. Fixes bug #75574.
 
 2005-07-07  Sureshkumar T  <tsureshkumar@novell.com>
 

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
index 611532414cdd491e6935b2255fb5bc6af80c7b86..23ed10423910e15e11a71001d7e91d381cea4a69 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
@@ -831,7 +831,7 @@ namespace System.Data.Odbc
                /// <remarks>
                ///     Load the next row in the current result set.
                /// </remarks>
-               public bool NextRow ()
+               private bool NextRow ()
                {
                        OdbcReturn ret=libodbc.SQLFetch (hstmt);
                        if (ret != OdbcReturn.Success)

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 3f855022fd5d44704c076fe2098bd9fae85a3fbb..19743eea08b670edd12f48ae8e5a10dbdafdfe9d 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-22  Sureshkumar T  <tsureshkumar@novell.com>
+
+       * DataView.cs: changed protected members
+       rowstate,rowcache,dataTable to protected internal.
+       * Constraint.cs, ForeignKeyConstraint.cs, UniqueConstraint.cs:
+       changed InConstraintViolated to protected internal.
+       * ConflictOptions.cs, UpdateOptions.cs, FillOptions.cs: enclosed
+       with NET_2_0 define.
+
 2005-07-21  Sureshkumar T  <tsureshkumar@novell.com>
 
        * ForeignKeyConstraint.cs: 

diff --git a/mcs/class/System.Data/System.Data/ConflictOptions.cs b/mcs/class/System.Data/System.Data/ConflictOptions.cs
index 2b09cacd4b8742d3dbd205acfb7ea3172ae5abe9..93cfbce35c8c1f5101c521e6750899164dec225b 100644 (file)
--- a/mcs/class/System.Data/System.Data/ConflictOptions.cs
+++ b/mcs/class/System.Data/System.Data/ConflictOptions.cs
@@ -30,7 +30,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-
+#if NET_2_0
 
 namespace System.Data {
        public enum ConflictOptions 
@@ -52,4 +52,4 @@ namespace System.Data {
        }
 }
 
-
+#endif // NET_2_0

diff --git a/mcs/class/System.Data/System.Data/Constraint.cs b/mcs/class/System.Data/System.Data/Constraint.cs
index 0cb69c7fada68a8f1efd9cc5e1fde3cabbc0145a..5c2aecee548aa46174726c45fd9363c84b03f6b3 100644 (file)
--- a/mcs/class/System.Data/System.Data/Constraint.cs
+++ b/mcs/class/System.Data/System.Data/Constraint.cs
@@ -122,7 +122,7 @@ namespace System.Data {
                //will throw an exception to prevent the add if a rule is broken
                internal abstract void AddToConstraintCollectionSetup (ConstraintCollection collection);
                                        
-               protected abstract bool IsConstraintViolated ();
+               protected internal abstract bool IsConstraintViolated ();
                
                internal static void ThrowConstraintException(){
                        throw new ConstraintException("Failed to enable constraints. One or more rows contain values violating non-null, unique, or foreign-key constraints.");

diff --git a/mcs/class/System.Data/System.Data/DataView.cs b/mcs/class/System.Data/System.Data/DataView.cs
index 70bc4eb8ec32b5487b9a9046a82887ce41d13394..4a4c36be16f0770642a1530663954f064e70c6e2 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataView.cs
+++ b/mcs/class/System.Data/System.Data/DataView.cs
@@ -36,12 +36,12 @@ namespace System.Data
        [DesignerAttribute ("Microsoft.VSDesigner.Data.VS.DataViewDesigner, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.ComponentModel.Design.IDesigner")]\r
        public class DataView : MarshalByValueComponent, IBindingList, IList, ICollection, IEnumerable, ITypedList, ISupportInitialize\r
        {\r
-               protected DataTable dataTable = null;\r
+               protected internal DataTable dataTable = null;\r
                string rowFilter = String.Empty;\r
                IExpression rowFilterExpr;\r
                string sort = String.Empty;\r
-               protected DataViewRowState rowState;\r
-               protected DataRowView[] rowCache = new DataRowView [0];\r
+               protected internal DataViewRowState rowState;\r
+               protected internal DataRowView[] rowCache = new DataRowView [0];\r
 \r
                // BeginInit() support\r
                bool isInitPhase = false;\r

diff --git a/mcs/class/System.Data/System.Data/FillOptions.cs b/mcs/class/System.Data/System.Data/FillOptions.cs
index 268b82721876eaf38980b1ee18d6ef72a6037cff..5cce950a4df2e4860f729338a475c7eaad56f576 100644 (file)
--- a/mcs/class/System.Data/System.Data/FillOptions.cs
+++ b/mcs/class/System.Data/System.Data/FillOptions.cs
@@ -31,7 +31,7 @@
 //
 
 
-
+#if NET_2_0
 namespace System.Data {
        public enum FillOptions 
        {
@@ -42,4 +42,5 @@ namespace System.Data {
        }
 }
 
+#endif // NET_2_0
 

diff --git a/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs
index e359ee8500b69e7a8b4a7731489f0ea9e95d76f4..0c727e50f545922aebabe7d7acd3bb7ab7c43622 100644 (file)
--- a/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs
+++ b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs
@@ -476,7 +476,7 @@ namespace System.Data {
                        Index = null;
                }
                
-               protected override bool IsConstraintViolated()
+               protected internal override bool IsConstraintViolated()
                {
                        if (Table.DataSet == null || RelatedTable.DataSet == null) 
                                return false;

diff --git a/mcs/class/System.Data/System.Data/UniqueConstraint.cs b/mcs/class/System.Data/System.Data/UniqueConstraint.cs
index d1cbd99b283c9812e9afdd922db3506efae95aee..1ec32f626ad319b144bbb978e7d2d467f406a0fb 100644 (file)
--- a/mcs/class/System.Data/System.Data/UniqueConstraint.cs
+++ b/mcs/class/System.Data/System.Data/UniqueConstraint.cs
@@ -403,7 +403,7 @@ namespace System.Data {
                        Index = null;
                }
 
-               protected override bool IsConstraintViolated()
+               protected internal override bool IsConstraintViolated()
                {       
                        if (Index == null) {
                                Index = Table.GetIndex(Columns,null,DataViewRowState.None,null,false);

diff --git a/mcs/class/System.Data/System.Data/UpdateOptions.cs b/mcs/class/System.Data/System.Data/UpdateOptions.cs
index f6f1d1616f7933f14af52a0e63ef2b013f68d688..3ae20904d96b56837b7a1e97502f3e90848f6344 100644 (file)
--- a/mcs/class/System.Data/System.Data/UpdateOptions.cs
+++ b/mcs/class/System.Data/System.Data/UpdateOptions.cs
@@ -31,7 +31,7 @@
 //
 
 
-
+#if NET_2_0
 namespace System.Data {
        public enum UpdateOptions 
        {
@@ -41,5 +41,5 @@ namespace System.Data {
                UpdateChildren
        }
 }
-
+#endif // NET_2_0