In System.Data:

2005-07-22  Sureshkumar T  <[email protected]>

	* 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  <[email protected]>

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

	Formatting corrections. Fixes bug #75574.

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

mcs/class/System.Data/System.Data.Odbc/ChangeLog

@@ -1,7 +1,11 @@
+2005-07-22  Sureshkumar T  <[email protected]>
+
+	* OdbcDataReader.cs: NextRow (): made private.
+
 2005-07-21  Sureshkumar T  <[email protected]>
 
 	* OdbcDataReader.cs: GetValue (): added case for OdbcType.Bit. and
-	Formatting corrections.
+	Formatting corrections. Fixes bug #75574.
 
 2005-07-07  Sureshkumar T  <[email protected]>
 

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)

mcs/class/System.Data/System.Data/ChangeLog

@@ -1,3 +1,12 @@
+2005-07-22  Sureshkumar T  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* ForeignKeyConstraint.cs: 

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

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.");

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")]
 	public class DataView : MarshalByValueComponent, IBindingList, IList, ICollection, IEnumerable, ITypedList, ISupportInitialize
 	{
-		protected DataTable dataTable = null;
+		protected internal DataTable dataTable = null;
 		string rowFilter = String.Empty;
 		IExpression rowFilterExpr;
 		string sort = String.Empty;
-		protected DataViewRowState rowState;
-		protected DataRowView[] rowCache = new DataRowView [0];
+		protected internal DataViewRowState rowState;
+		protected internal DataRowView[] rowCache = new DataRowView [0];
 
 		// BeginInit() support
 		bool isInitPhase = false;

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
 

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;

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);

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