diff options
| author | Dan Moseley <danmose@microsoft.com> | 2017-01-30 10:41:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-30 10:41:30 -0700 |
| commit | cd207519445bf6ba66bcf21af653b43f68bd3976 (patch) | |
| tree | 525fc825cb03f0d20f26a8de1ed4247116870d31 | |
| parent | dafad808aba25d940a64568d24d83ee04beebaf2 (diff) | |
| parent | a8a42c87d526d64b8efa047bb4a24fd2cb81de25 (diff) | |
| download | coreclr-cd207519445bf6ba66bcf21af653b43f68bd3976.tar.gz coreclr-cd207519445bf6ba66bcf21af653b43f68bd3976.tar.bz2 coreclr-cd207519445bf6ba66bcf21af653b43f68bd3976.zip | |
Merge pull request #9117 from jamesqo/copy.names
Fix parameter names for Array.Copy
| -rw-r--r-- | src/classlibnative/bcltype/arraynative.cpp | 10 | ||||
| -rw-r--r-- | src/mscorlib/src/System.Private.CoreLib.txt | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/classlibnative/bcltype/arraynative.cpp b/src/classlibnative/bcltype/arraynative.cpp index 9baba44c1e..0eae8b2d07 100644 --- a/src/classlibnative/bcltype/arraynative.cpp +++ b/src/classlibnative/bcltype/arraynative.cpp @@ -1021,7 +1021,7 @@ FCIMPL6(void, ArrayNative::ArrayCopy, ArrayBase* m_pSrc, INT32 m_iSrcIndex, Arra // cannot pass null for source or destination if (gc.pSrc == NULL || gc.pDst == NULL) { - FCThrowArgumentNullVoid(gc.pSrc==NULL ? W("source") : W("dest")); + FCThrowArgumentNullVoid(gc.pSrc==NULL ? W("sourceArray") : W("destinationArray")); } // source and destination must be arrays @@ -1048,16 +1048,16 @@ FCIMPL6(void, ArrayNative::ArrayCopy, ArrayBase* m_pSrc, INT32 m_iSrcIndex, Arra FCThrowArgumentOutOfRangeVoid(W("length"), W("ArgumentOutOfRange_NeedNonNegNum")); if (m_iSrcIndex < srcLB || (m_iSrcIndex - srcLB < 0)) - FCThrowArgumentOutOfRangeVoid(W("srcIndex"), W("ArgumentOutOfRange_ArrayLB")); + FCThrowArgumentOutOfRangeVoid(W("sourceIndex"), W("ArgumentOutOfRange_ArrayLB")); if (m_iDstIndex < destLB || (m_iDstIndex - destLB < 0)) - FCThrowArgumentOutOfRangeVoid(W("dstIndex"), W("ArgumentOutOfRange_ArrayLB")); + FCThrowArgumentOutOfRangeVoid(W("destinationIndex"), W("ArgumentOutOfRange_ArrayLB")); if ((DWORD)(m_iSrcIndex - srcLB + m_iLength) > srcLen) - FCThrowResVoid(kArgumentException, W("Arg_LongerThanSrcArray")); + FCThrowArgumentVoid(W("sourceArray"), W("Arg_LongerThanSrcArray")); if ((DWORD)(m_iDstIndex - destLB + m_iLength) > destLen) - FCThrowResVoid(kArgumentException, W("Arg_LongerThanDestArray")); + FCThrowArgumentVoid(W("destinationArray"), W("Arg_LongerThanDestArray")); int r = 0; diff --git a/src/mscorlib/src/System.Private.CoreLib.txt b/src/mscorlib/src/System.Private.CoreLib.txt index a8b7cbfffe..43d9a741b9 100644 --- a/src/mscorlib/src/System.Private.CoreLib.txt +++ b/src/mscorlib/src/System.Private.CoreLib.txt @@ -330,8 +330,8 @@ Arg_MemberInfoNullModule = The Module object containing the member cannot be nul Arg_ParameterInfoNullMember = The MemberInfo object defining the parameter cannot be null. Arg_ParameterInfoNullModule = The Module object containing the parameter cannot be null. Arg_AssemblyNullModule = The manifest module of the assembly cannot be null. -Arg_LongerThanSrcArray = Source array was not long enough. Check srcIndex and length, and the array's lower bounds. -Arg_LongerThanDestArray = Destination array was not long enough. Check destIndex and length, and the array's lower bounds. +Arg_LongerThanSrcArray = Source array was not long enough. Check the source index, length, and the array's lower bounds. +Arg_LongerThanDestArray = Destination array was not long enough. Check the destination index, length, and the array's lower bounds. Arg_LowerBoundsMustMatch = The arrays' lower bounds must be identical. Arg_MustBeBoolean = Object must be of type Boolean. Arg_MustBeByte = Object must be of type Byte. |