Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2018-04-01 15:50:09 +0300
committerMarek Safar <marek.safar@gmail.com>2018-04-12 12:39:27 +0300
commitbd1a63e4f4334120d86cb588c39af5f6934a04a7 (patch)
tree7c39448899b135df1260e5808343b7d5e1ff5325 /mcs/class/System.Numerics.Vectors
parentb3881a418f1391a33c1b709f1113574b74ae85ae (diff)
Moves vector to mscorlib
Diffstat (limited to 'mcs/class/System.Numerics.Vectors')
-rw-r--r--mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs2
-rw-r--r--mcs/class/System.Numerics.Vectors/Makefile4
-rw-r--r--mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources11
-rw-r--r--mcs/class/System.Numerics.Vectors/corefx/SR.cs12
4 files changed, 3 insertions, 26 deletions
diff --git a/mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs b/mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs
index b2929d84ecf..a3949103721 100644
--- a/mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs
+++ b/mcs/class/System.Numerics.Vectors/Assembly/TypeForwarders.cs
@@ -34,3 +34,5 @@ using System.Runtime.CompilerServices;
[assembly: TypeForwardedTo(typeof(Vector2))]
[assembly: TypeForwardedTo(typeof(Vector3))]
[assembly: TypeForwardedTo(typeof(Vector4))]
+[assembly: TypeForwardedTo(typeof(Vector<>))]
+[assembly: TypeForwardedTo(typeof(Vector))]
diff --git a/mcs/class/System.Numerics.Vectors/Makefile b/mcs/class/System.Numerics.Vectors/Makefile
index 6e89b99e9b3..5e66c3955ba 100644
--- a/mcs/class/System.Numerics.Vectors/Makefile
+++ b/mcs/class/System.Numerics.Vectors/Makefile
@@ -6,9 +6,7 @@ LIBRARY = System.Numerics.Vectors.dll
LIB_REFS = System System.Numerics
KEYFILE = ../msfinal.pub
LIB_MCS_FLAGS = -unsafe
-#LIBRARY_WARN_AS_ERROR = yes
-
-RESX_RESOURCE_STRING = ../../../external/corefx/src/System.Numerics.Vectors/src/Resources/Strings.resx
+LIBRARY_WARN_AS_ERROR = yes
EXTRA_DISTFILES =
diff --git a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources
index 8e029a0c6d6..2a702eff0e2 100644
--- a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources
+++ b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.dll.sources
@@ -1,14 +1,3 @@
../../build/common/Consts.cs
-../../build/common/SR.cs
Assembly/AssemblyInfo.cs
Assembly/TypeForwarders.cs
-corefx/SR.cs
-
-../../../external/corefx/src/Common/src/CoreLib/System/Numerics/ConstantHelper.cs
-../../../external/corefx/src/Common/src/CoreLib/System/Numerics/Register.cs
-../../../external/corefx/src/Common/src/CoreLib/System/Numerics/Vector.cs
-../../../external/corefx/src/Common/src/CoreLib/System/Numerics/Vector_Operations.cs
-
-../../../external/corefx/src/Common/src/CoreLib/System/Runtime/CompilerServices/IntrinsicAttribute.cs
-
-../../../external/corefx/src/Common/src/System/Numerics/Hashing/HashHelpers.cs
diff --git a/mcs/class/System.Numerics.Vectors/corefx/SR.cs b/mcs/class/System.Numerics.Vectors/corefx/SR.cs
deleted file mode 100644
index b08c3f6cb69..00000000000
--- a/mcs/class/System.Numerics.Vectors/corefx/SR.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// This file was generated by resx2sr tool
-//
-
-partial class SR
-{
- public const string Arg_ArgumentOutOfRangeException = "Index was out of bounds:";
- public const string Arg_ElementsInSourceIsGreaterThanDestination = "Number of elements in source vector is greater than the destination array";
- public const string Arg_NullArgumentNullRef = "The method was called with a null array argument.";
- public const string Arg_TypeNotSupported = "Specified type is not supported";
- public const string Arg_InsufficientNumberOfElements = "At least {0} element(s) are expected in the parameter \"{1}\".";
-}