Procházet zdrojové kódy

SqliteDataReader: Made 64bit clean. Patch from Joe Shaw.

svn path=/trunk/mcs/; revision=56755
Joshua Tauberer před 20 roky
rodič
revize
ca5649ea17

+ 5 - 0
mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/ChangeLog

@@ -1,3 +1,8 @@
+2006-02-10  Joshua Tauberer  <[email protected]>
+
+	* SqliteDataReader: Made 64bit clean.  Patch from
+	  Joe Shaw <[email protected]>.
+
 2006-01-22  Joshua Tauberer  <[email protected]>
 
 	Most of the below fixes (in previous changes too) are thanks

+ 2 - 2
mcs/class/Mono.Data.SqliteClient/Mono.Data.SqliteClient/SqliteDataReader.cs

@@ -140,7 +140,7 @@ namespace Mono.Data.SqliteClient
 					for (int i = 0; i < pN; i++) {
 						string colName;
 						if (version == 2) {
-							IntPtr fieldPtr = (IntPtr)Marshal.ReadInt32 (pazColName, i*IntPtr.Size);
+							IntPtr fieldPtr = Marshal.ReadIntPtr (pazColName, i*IntPtr.Size);
 							colName = Sqlite.HeapToString (fieldPtr, cmd.Connection.Encoding);
 						} else {
 							colName = Marshal.PtrToStringUni (Sqlite.sqlite3_column_name16 (pVm, i));
@@ -156,7 +156,7 @@ namespace Mono.Data.SqliteClient
 				object[] data_row = new object [pN];
 				for (int i = 0; i < pN; i++) {
 					if (version == 2) {
-						IntPtr fieldPtr = (IntPtr)Marshal.ReadInt32 (pazValue, i*IntPtr.Size);
+						IntPtr fieldPtr = Marshal.ReadIntPtr (pazValue, i*IntPtr.Size);
 						data_row[i] = Sqlite.HeapToString (fieldPtr, cmd.Connection.Encoding);
 					} else {
 						switch (Sqlite.sqlite3_column_type (pVm, i)) {