Removed Comments
This commit is contained in:
@ -16,12 +16,6 @@ public abstract class DisposableObject : IDisposable
|
||||
{
|
||||
get;
|
||||
private set;
|
||||
/* Unmerged change from project 'FaceRecognitionotNet(netstandard2.0)'
|
||||
Before:
|
||||
/// If this object is disposed, then <see cref="System.ObjectDisposedException"/> is thrown.
|
||||
After:
|
||||
/// If this object is disposed, then <see cref="ObjectDisposedException"/> is thrown.
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
@ -74,12 +68,6 @@ public abstract class DisposableObject : IDisposable
|
||||
public void Dispose()
|
||||
{
|
||||
GC.SuppressFinalize(this);
|
||||
/* Unmerged change from project 'FaceRecognitionotNet(netstandard2.0)'
|
||||
Before:
|
||||
Dispose(true);
|
||||
After:
|
||||
Dispose(true);
|
||||
*/
|
||||
|
||||
Dispose(true);
|
||||
}
|
||||
@ -93,32 +81,14 @@ public abstract class DisposableObject : IDisposable
|
||||
if (IsDisposed)
|
||||
{
|
||||
return;
|
||||
/* Unmerged change from project 'FaceRecognitionotNet(netstandard2.0)'
|
||||
Before:
|
||||
IsDisposed = true;
|
||||
After:
|
||||
IsDisposed = true;
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
IsDisposed = true;
|
||||
|
||||
if (disposing)
|
||||
/* Unmerged change from project 'FaceRecognitionotNet(netstandard2.0)'
|
||||
Before:
|
||||
DisposeManaged();
|
||||
After:
|
||||
DisposeManaged();
|
||||
*/
|
||||
|
||||
DisposeManaged();
|
||||
/* Unmerged change from project 'FaceRecognitionotNet(netstandard2.0)'
|
||||
Before:
|
||||
DisposeUnmanaged();
|
||||
After:
|
||||
DisposeUnmanaged();
|
||||
*/
|
||||
|
||||
DisposeUnmanaged();
|
||||
}
|
||||
|
@ -96,15 +96,6 @@ public struct Point : IEquatable<Point>
|
||||
/// <param name="point2">The second <see cref="Point"/> structure to compare.</param>
|
||||
/// <returns><code>true</code> if <paramref name="point1"/> and <paramref name="point2"/> have different <see cref="X"/> or <see cref="Y"/> coordinates; <code>false</code> if <paramref name="point1"/> and <paramref name="point2"/> have the same <see cref="X"/> and <see cref="Y"/> coordinates.</returns>
|
||||
|
||||
/* Unmerged change from project 'FaceRecognition(netstandard2.0)'
|
||||
Before:
|
||||
public static bool operator !=(Point point1, Point point2)
|
||||
{
|
||||
return !(point1 == point2);
|
||||
}
|
||||
After:
|
||||
public static bool operator !=(Point point1, Point point2) => !(point1 == point2);
|
||||
*/
|
||||
public static bool operator !=(Point point1, Point point2) => !(point1 == point2);
|
||||
|
||||
#endregion
|
||||
|
Reference in New Issue
Block a user