From: Mandar Sahasrabuddhe Date: Thu, 1 Mar 2018 06:30:07 +0000 (+0530) Subject: Edits to fix conflicts in generated Vector.cs file (#16666) X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1746cb79d7208ffab3c27cd46e7d1a2db39d8749;p=platform%2Fupstream%2Fcoreclr.git Edits to fix conflicts in generated Vector.cs file (#16666) 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. --- diff --git a/src/mscorlib/shared/System/Numerics/Vector.tt b/src/mscorlib/shared/System/Numerics/Vector.tt index 82aa73d22c..275f47350d 100644 --- a/src/mscorlib/shared/System/Numerics/Vector.tt +++ b/src/mscorlib/shared/System/Numerics/Vector.tt @@ -68,12 +68,12 @@ namespace System.Numerics /// Returns a vector containing all zeroes. /// public static Vector Zero - { + { [Intrinsic] get { return s_zero; - } + } } private static readonly Vector s_zero = new Vector(); @@ -84,7 +84,7 @@ namespace System.Numerics { [Intrinsic] get - { + { return s_one; } } @@ -999,7 +999,7 @@ namespace System.Numerics [MethodImplAttribute(MethodImplOptions.AggressiveInlining)] public static Vector operator ~(Vector value) { - return allOnes ^ value; + return s_allOnes ^ value; } #endregion Bitwise Operators