Skip to content

Commit

Permalink
Edits to fix conflicts in generated Vector.cs file (dotnet/coreclr#16666
Browse files Browse the repository at this point in the history
)

Fixed minor space changes and one syntax error that causes conflict between checked in Vector.cs file and the freshly auto-generated Vector.cs file.

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
  • Loading branch information
WinCPP authored and Konstantin Baladurin committed Mar 15, 2018
1 parent 865542c commit f84bc0c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/System.Private.CoreLib/shared/System/Numerics/Vector.tt
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ namespace System.Numerics
/// Returns a vector containing all zeroes.
/// </summary>
public static Vector<T> Zero
{
{
[Intrinsic]
get
{
return s_zero;
}
}
}
private static readonly Vector<T> s_zero = new Vector<T>();

Expand All @@ -84,7 +84,7 @@ namespace System.Numerics
{
[Intrinsic]
get
{
{
return s_one;
}
}
Expand Down Expand Up @@ -999,7 +999,7 @@ namespace System.Numerics
[MethodImplAttribute(MethodImplOptions.AggressiveInlining)]
public static Vector<T> operator ~(Vector<T> value)
{
return allOnes ^ value;
return s_allOnes ^ value;
}
#endregion Bitwise Operators

Expand Down

0 comments on commit f84bc0c

Please sign in to comment.