Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix some harmless compiler warnings. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
5b91e037405847eb319cf6c4daa3bb3d |
User & Date: | mistachkin 2015-08-15 23:06:59.692 |
Context
2015-08-15
| ||
23:10 | Enhance the batch build tool to be capable of only building the core managed assembly. check-in: d10722c84e user: mistachkin tags: trunk | |
23:07 | Merge trunk. check-in: deb2fdb0c9 user: mistachkin tags: delegateFunction | |
23:06 | Fix some harmless compiler warnings. check-in: 5b91e03740 user: mistachkin tags: trunk | |
22:00 | Enhance the 'isBuildAvailable' routine in the test suite infrastructure to support architecture names in addition to platform names. check-in: 66139faca2 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/LINQ/SQLiteFactory_Linq.cs.
︙ | ︙ | |||
56 57 58 59 60 61 62 | string version = #if NET_40 || NET_45 || NET_451 || NET_46 "4.0.0.0"; #else "3.5.0.0"; #endif | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | string version = #if NET_40 || NET_45 || NET_451 || NET_46 "4.0.0.0"; #else "3.5.0.0"; #endif _dbProviderServicesType = Type.GetType(UnsafeNativeMethods.StringFormat(CultureInfo.InvariantCulture, "System.Data.Common.DbProviderServices, System.Data.Entity, Version={0}, Culture=neutral, PublicKeyToken=b77a5c561934e089", version), false); } /// <summary> /// Will provide a <see cref="IServiceProvider" /> object in .NET 3.5. /// </summary> /// <param name="serviceType">The class or interface type to query for.</param> /// <returns></returns> |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteCommandBuilder.cs.
︙ | ︙ | |||
46 47 48 49 50 51 52 53 54 55 56 57 58 59 | if (disposed) throw new ObjectDisposedException(typeof(SQLiteCommandBuilder).Name); #endif } /////////////////////////////////////////////////////////////////////////////////////////////// protected override void Dispose(bool disposing) { try { if (!disposed) { //if (disposing) | > > > > > > | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | if (disposed) throw new ObjectDisposedException(typeof(SQLiteCommandBuilder).Name); #endif } /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Cleans up resources (native and managed) associated with the current instance. /// </summary> /// <param name="disposing"> /// Zero when being disposed via garbage collection; otherwise, non-zero. /// </param> protected override void Dispose(bool disposing) { try { if (!disposed) { //if (disposing) |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteConnection.cs.
︙ | ︙ | |||
1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 | if (disposed) throw new ObjectDisposedException(typeof(SQLiteConnection).Name); #endif } /////////////////////////////////////////////////////////////////////////////////////////////// protected override void Dispose(bool disposing) { #if !NET_COMPACT_20 && TRACE_WARNING if ((_flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning) { if (_noDispose) { | > > > > > > | 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 | if (disposed) throw new ObjectDisposedException(typeof(SQLiteConnection).Name); #endif } /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Cleans up resources (native and managed) associated with the current instance. /// </summary> /// <param name="disposing"> /// Zero when being disposed via garbage collection; otherwise, non-zero. /// </param> protected override void Dispose(bool disposing) { #if !NET_COMPACT_20 && TRACE_WARNING if ((_flags & SQLiteConnectionFlags.TraceWarning) == SQLiteConnectionFlags.TraceWarning) { if (_noDispose) { |
︙ | ︙ | |||
3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 | /// The size of the largest committed free block in the heap, in bytes. /// This value will be zero unless heap compaction is enabled. /// </param> /// <returns> /// A standard SQLite return code (i.e. zero for success and non-zero /// for failure). /// </returns> public static SQLiteErrorCode ReleaseMemory( int nBytes, bool reset, bool compact, ref int nFree, ref bool resetOk, ref uint nLargest ) { return SQLite3.StaticReleaseMemory( nBytes, reset, compact, ref nFree, ref resetOk, ref nLargest); } /// <summary> /// Sets the status of the memory usage tracking subsystem in the SQLite core library. By default, this is enabled. /// If this is disabled, memory usage tracking will not be performed. This is not really a per-connection value, it is /// global to the process. /// </summary> /// <param name="value">Non-zero to enable memory usage tracking, zero otherwise.</param> | > > | 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 | /// The size of the largest committed free block in the heap, in bytes. /// This value will be zero unless heap compaction is enabled. /// </param> /// <returns> /// A standard SQLite return code (i.e. zero for success and non-zero /// for failure). /// </returns> #pragma warning disable 3001 public static SQLiteErrorCode ReleaseMemory( int nBytes, bool reset, bool compact, ref int nFree, ref bool resetOk, ref uint nLargest ) { return SQLite3.StaticReleaseMemory( nBytes, reset, compact, ref nFree, ref resetOk, ref nLargest); } #pragma warning restore 3001 /// <summary> /// Sets the status of the memory usage tracking subsystem in the SQLite core library. By default, this is enabled. /// If this is disabled, memory usage tracking will not be performed. This is not really a per-connection value, it is /// global to the process. /// </summary> /// <param name="value">Non-zero to enable memory usage tracking, zero otherwise.</param> |
︙ | ︙ | |||
5495 5496 5497 5498 5499 5500 5501 5502 5503 5504 5505 5506 5507 5508 | int totalPages, bool retry ); #endregion /////////////////////////////////////////////////////////////////////////////////////////////// public class ProgressEventArgs : EventArgs { /// <summary> /// The user-defined native data associated with this event. Currently, /// this will always contain the value of <see cref="IntPtr.Zero" />. /// </summary> public readonly IntPtr UserData; | > > > | 5503 5504 5505 5506 5507 5508 5509 5510 5511 5512 5513 5514 5515 5516 5517 5518 5519 | int totalPages, bool retry ); #endregion /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// The event data associated with progress reporting events. /// </summary> public class ProgressEventArgs : EventArgs { /// <summary> /// The user-defined native data associated with this event. Currently, /// this will always contain the value of <see cref="IntPtr.Zero" />. /// </summary> public readonly IntPtr UserData; |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteDataAdapter.cs.
︙ | ︙ | |||
135 136 137 138 139 140 141 142 143 144 145 146 147 148 | if (disposed) throw new ObjectDisposedException(typeof(SQLiteDataAdapter).Name); #endif } /////////////////////////////////////////////////////////////////////////////////////////////// protected override void Dispose(bool disposing) { try { if (!disposed) { if (disposing) | > > > > > > | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | if (disposed) throw new ObjectDisposedException(typeof(SQLiteDataAdapter).Name); #endif } /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Cleans up resources (native and managed) associated with the current instance. /// </summary> /// <param name="disposing"> /// Zero when being disposed via garbage collection; otherwise, non-zero. /// </param> protected override void Dispose(bool disposing) { try { if (!disposed) { if (disposing) |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteFactory.cs.
︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 | // been moved to the new SQLiteLog static class. // } /////////////////////////////////////////////////////////////////////////////////////////////// #region IDisposable Members public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } #endregion | > > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | // been moved to the new SQLiteLog static class. // } /////////////////////////////////////////////////////////////////////////////////////////////// #region IDisposable Members /// <summary> /// Cleans up resources (native and managed) associated with the current instance. /// </summary> public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } #endregion |
︙ | ︙ | |||
70 71 72 73 74 75 76 77 78 79 80 81 82 83 | } } #endregion /////////////////////////////////////////////////////////////////////////////////////////////// #region Destructor ~SQLiteFactory() { Dispose(false); } #endregion /////////////////////////////////////////////////////////////////////////////////////////////// | > > > | 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | } } #endregion /////////////////////////////////////////////////////////////////////////////////////////////// #region Destructor /// <summary> /// Cleans up resources associated with the current instance. /// </summary> ~SQLiteFactory() { Dispose(false); } #endregion /////////////////////////////////////////////////////////////////////////////////////////////// |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteFunction.cs.
︙ | ︙ | |||
197 198 199 200 201 202 203 204 205 206 207 208 209 210 | } } #endregion /////////////////////////////////////////////////////////////////////////////////////////////// #region Destructor ~SQLiteFunction() { Dispose(false); } #endregion /////////////////////////////////////////////////////////////////////////////////////////////// | > > > | 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | } } #endregion /////////////////////////////////////////////////////////////////////////////////////////////// #region Destructor /// <summary> /// Cleans up resources associated with the current instance. /// </summary> ~SQLiteFunction() { Dispose(false); } #endregion /////////////////////////////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 | if (disposed) throw new ObjectDisposedException(typeof(SQLiteFunctionEx).Name); #endif } /////////////////////////////////////////////////////////////////////////////////////////////// protected override void Dispose(bool disposing) { try { if (!disposed) { //if (disposing) | > > > > > > | 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 | if (disposed) throw new ObjectDisposedException(typeof(SQLiteFunctionEx).Name); #endif } /////////////////////////////////////////////////////////////////////////////////////////////// /// <summary> /// Cleans up resources (native and managed) associated with the current instance. /// </summary> /// <param name="disposing"> /// Zero when being disposed via garbage collection; otherwise, non-zero. /// </param> protected override void Dispose(bool disposing) { try { if (!disposed) { //if (disposing) |
︙ | ︙ |