Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGert Driesen <drieseng@users.sourceforge.net>2005-08-20 17:12:56 +0400
committerGert Driesen <drieseng@users.sourceforge.net>2005-08-20 17:12:56 +0400
commitb594633a1b2b6c665e33d920d3a37986a525c19f (patch)
treee1f91b70c26dfce9c7424b9f3ddc03717f6d2546 /mcs/class/System.Data/System.Data.Odbc
parent186b140d06c8e0640544d4356f35d71d1ce8d3c2 (diff)
* OdbcDataReader.cs: Marked GetPrimaryKeysBySQLStatistics unsafe.
This fixes the build on Windows (using csc). * Makefile: Allow unsafe code. This fixes the build on Windows (using csc). svn path=/trunk/mcs/; revision=48595
Diffstat (limited to 'mcs/class/System.Data/System.Data.Odbc')
-rw-r--r--mcs/class/System.Data/System.Data.Odbc/ChangeLog5
-rw-r--r--mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs2
2 files changed, 6 insertions, 1 deletions
diff --git a/mcs/class/System.Data/System.Data.Odbc/ChangeLog b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
index 8c88994938c..f1e7fc318eb 100644
--- a/mcs/class/System.Data/System.Data.Odbc/ChangeLog
+++ b/mcs/class/System.Data/System.Data.Odbc/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-20 Gert Driesen <drieseng@users.sourceforge.net>
+
+ * OdbcDataReader.cs: Marked GetPrimaryKeysBySQLStatistics unsafe.
+ This fixes the build on Windows (using csc).
+
2005-08-09 Sureshkumar T <tsureshkumar@novell.com>
* OdbcDataReader.cs: GetSchemaTable (): set values for the column
diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
index 11f1e4ced43..5b891deb58f 100644
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
@@ -993,7 +993,7 @@ namespace System.Data.Odbc
return keys;
}
- private ArrayList GetPrimaryKeysBySQLStatistics (string catalog, string schema, string table)
+ private unsafe ArrayList GetPrimaryKeysBySQLStatistics (string catalog, string schema, string table)
{
ArrayList keys = new ArrayList ();
IntPtr handle = IntPtr.Zero;