2
0
Эх сурвалжийг харах

* 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

Gert Driesen 20 жил өмнө
parent
commit
b594633a1b

+ 5 - 0
mcs/class/System.Data/ChangeLog

@@ -1,3 +1,8 @@
+2005-08-20 Gert Driesen <[email protected]>
+
+	* Makefile: Allow unsafe code. This fixes the build on Windows (using
+	csc).
+
 2005-07-27 Boris Kirzner <[email protected]>
 	* System.Data.vmwcsproj: changed location of rt.dll in TARGET_JVM project file.
 	

+ 1 - 0
mcs/class/System.Data/Makefile

@@ -17,6 +17,7 @@ endif
 LIBRARY = System.Data.dll
 LIB_MCS_FLAGS = \
 	-nowarn:649 -nowarn:169 -nowarn:219 -nowarn:168 -nowarn:1595 \
+	-unsafe \
 	-r:$(corlib)				\
 	-r:$(system)			 	\
 	-r:System.Xml.dll 			\

+ 5 - 0
mcs/class/System.Data/System.Data.Odbc/ChangeLog

@@ -1,3 +1,8 @@
+2005-08-20  Gert Driesen  <[email protected]>
+
+	* OdbcDataReader.cs: Marked GetPrimaryKeysBySQLStatistics unsafe.
+	This fixes the build on Windows (using csc).
+
 2005-08-09  Sureshkumar T  <[email protected]>
 
 	* OdbcDataReader.cs: GetSchemaTable (): set values for the column

+ 1 - 1
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;