Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -290,7 +290,7 @@ internal static partial class Bid
}
}
#if !NO_ODBC
//
// Manually edited wrappers
//
@@ -311,7 +311,9 @@ internal static partial class Bid
if (((System.Data.Odbc.ODBC32.RetCode.SUCCESS != a1) || (modFlags & ApiGroup.StatusOk) != 0) && (modFlags & ApiGroup.Trace) != 0 && modID != NoData)
NativeMethods.Trace (modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, (int)(short)a1, a2);
}
#endif
#if !NO_OLEDB
[BidMethod]
[ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
internal static void Trace(string fmtPrintfW, System.Data.OleDb.OleDbHResult a1) { //
@@ -336,7 +338,7 @@ internal static partial class Bid
if ((modFlags & ApiGroup.Trace) != 0 && modID != NoData)
NativeMethods.Trace (modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, (int)a1,a2);
}
#endif
[BidMethod]
internal static void Trace(string fmtPrintfW, System.String a1, System.String a2) {