[jit] Fix the saving of the 'cfg->ret_var_set' flag when inlining, it was set to...

[mono.git] / mcs / class / Mono.Data.Sqlite / Mono.Data.Sqlite_2.0 / SQLite3.cs

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
index 6f757238cd4139809efe4ca4230369ff3344c0bc..6b2ee13e03a86fed9d1c387bf2dbb38b85bdd904 100644 (file)
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLite3.cs
@@ -125,9 +125,9 @@ namespace Mono.Data.Sqlite
        // Compatibility with versions < 3.5.0\r
         int n;\r
 \r
-       try {\r
+       if (UnsafeNativeMethods.use_sqlite3_open_v2) {\r
                n = UnsafeNativeMethods.sqlite3_open_v2(ToUTF8(strFilename), out db, (int)flags, IntPtr.Zero);\r
-       } catch (EntryPointNotFoundException) {\r
+       } else {\r
                Console.WriteLine ("Your sqlite3 version is old - please upgrade to at least v3.5.0!");\r
                n = UnsafeNativeMethods.sqlite3_open (ToUTF8 (strFilename), out db);\r
        }\r
@@ -706,7 +706,7 @@ namespace Mono.Data.Sqlite
     }\r
 \r
 #if MONOTOUCH\r
-    [MonoTouch.MonoPInvokeCallback(typeof(SQLiteCallback))]\r
+    [Mono.Util.MonoPInvokeCallback(typeof(SQLiteCallback))]\r
     internal static void scalar_callback(IntPtr context, int nArgs, IntPtr argsptr)\r
     {\r
       var handle = GCHandle.FromIntPtr (UnsafeNativeMethods.sqlite3_user_data(context));\r
@@ -714,7 +714,7 @@ namespace Mono.Data.Sqlite
       func.Func(context, nArgs, argsptr);\r
     }\r
 \r
-    [MonoTouch.MonoPInvokeCallback(typeof(SQLiteCallback))]\r
+    [Mono.Util.MonoPInvokeCallback(typeof(SQLiteCallback))]\r
     internal static void step_callback(IntPtr context, int nArgs, IntPtr argsptr)\r
     {\r
       var handle = GCHandle.FromIntPtr(UnsafeNativeMethods.sqlite3_user_data(context));\r
@@ -722,7 +722,7 @@ namespace Mono.Data.Sqlite
       func.FuncStep(context, nArgs, argsptr);\r
     }\r
 \r
-    [MonoTouch.MonoPInvokeCallback(typeof(SQLiteFinalCallback))]\r
+    [Mono.Util.MonoPInvokeCallback(typeof(SQLiteFinalCallback))]\r
     internal static void final_callback(IntPtr context)\r
     {\r
       var handle = GCHandle.FromIntPtr(UnsafeNativeMethods.sqlite3_user_data(context));\r
@@ -730,7 +730,7 @@ namespace Mono.Data.Sqlite
       func.FuncFinal(context);\r
     }\r
 \r
-    [MonoTouch.MonoPInvokeCallback(typeof(SQLiteFinalCallback))]\r
+    [Mono.Util.MonoPInvokeCallback(typeof(SQLiteFinalCallback))]\r
     internal static void destroy_callback(IntPtr context)\r
     {\r
       GCHandle.FromIntPtr(context).Free();\r
@@ -958,7 +958,7 @@ namespace Mono.Data.Sqlite
     SQLiteCommitCallback commit_callback;\r
     SQLiteRollbackCallback rollback_callback;\r
                \r
-    [MonoTouch.MonoPInvokeCallback (typeof (SQLiteUpdateCallback))]\r
+    [Mono.Util.MonoPInvokeCallback (typeof (SQLiteUpdateCallback))]\r
     static void update (IntPtr puser, int type, IntPtr database, IntPtr table, Int64 rowid)\r
     {\r
       SQLite3 instance = GCHandle.FromIntPtr (puser).Target as SQLite3;\r
@@ -974,7 +974,7 @@ namespace Mono.Data.Sqlite
         UnsafeNativeMethods.sqlite3_update_hook (_sql, update, GCHandle.ToIntPtr (gch));\r
     }\r
 \r
-    [MonoTouch.MonoPInvokeCallback (typeof (SQLiteCommitCallback))]\r
+    [Mono.Util.MonoPInvokeCallback (typeof (SQLiteCommitCallback))]\r
     static int commit (IntPtr puser)\r
     {\r
       SQLite3 instance = GCHandle.FromIntPtr (puser).Target as SQLite3;\r
@@ -990,7 +990,7 @@ namespace Mono.Data.Sqlite
         UnsafeNativeMethods.sqlite3_commit_hook (_sql, commit, GCHandle.ToIntPtr (gch));\r
     }\r
 \r
-    [MonoTouch.MonoPInvokeCallback (typeof (SQLiteRollbackCallback))]\r
+    [Mono.Util.MonoPInvokeCallback (typeof (SQLiteRollbackCallback))]\r
     static void rollback (IntPtr puser)\r
     {\r
       SQLite3 instance = GCHandle.FromIntPtr (puser).Target as SQLite3;\r