From: Jan Kotas Date: Fri, 24 Mar 2017 20:16:39 +0000 (-0700) Subject: Delete moved file X-Git-Tag: submit/tizen/20210909.063632~11030^2~7563^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a535969d4bed5fb337a53a916899d42f0b15566;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Delete moved file Commit migrated from https://github.com/dotnet/coreclr/commit/40c4c3c866fd08842710f38ddc3998e8d214aa1c --- diff --git a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj index 7101f5f..1dce811 100644 --- a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj @@ -354,7 +354,6 @@ - diff --git a/src/coreclr/src/mscorlib/src/System/DBNull.cs b/src/coreclr/src/mscorlib/src/System/DBNull.cs deleted file mode 100644 index 0b859e7..0000000 --- a/src/coreclr/src/mscorlib/src/System/DBNull.cs +++ /dev/null @@ -1,142 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -//////////////////////////////////////////////////////////////////////////////// -// Void -// This class represents a Missing Variant -//////////////////////////////////////////////////////////////////////////////// - -using System; -using System.Runtime.Remoting; -using System.Runtime.Serialization; - -namespace System -{ - [Serializable] - public sealed class DBNull : ISerializable, IConvertible - { - //Package private constructor - private DBNull() - { - } - - private DBNull(SerializationInfo info, StreamingContext context) - { - throw new NotSupportedException(SR.NotSupported_DBNullSerial); - } - - public static readonly DBNull Value = new DBNull(); - - public void GetObjectData(SerializationInfo info, StreamingContext context) - { - UnitySerializationHolder.GetUnitySerializationInfo(info, UnitySerializationHolder.NullUnity, null, null); - } - - public override String ToString() - { - return String.Empty; - } - - public String ToString(IFormatProvider provider) - { - return String.Empty; - } - - public TypeCode GetTypeCode() - { - return TypeCode.DBNull; - } - - /// - bool IConvertible.ToBoolean(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - char IConvertible.ToChar(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - sbyte IConvertible.ToSByte(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - byte IConvertible.ToByte(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - short IConvertible.ToInt16(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - ushort IConvertible.ToUInt16(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - int IConvertible.ToInt32(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - uint IConvertible.ToUInt32(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - long IConvertible.ToInt64(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - ulong IConvertible.ToUInt64(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - float IConvertible.ToSingle(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - double IConvertible.ToDouble(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - decimal IConvertible.ToDecimal(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - DateTime IConvertible.ToDateTime(IFormatProvider provider) - { - throw new InvalidCastException(SR.InvalidCast_FromDBNull); - } - - /// - Object IConvertible.ToType(Type type, IFormatProvider provider) - { - return Convert.DefaultToType((IConvertible)this, type, provider); - } - } -} - diff --git a/src/coreclr/src/mscorlib/src/System/Text/StringBuilder.CoreCLR.cs b/src/coreclr/src/mscorlib/src/System/Text/StringBuilder.CoreCLR.cs index 25a95f9..db3895f 100644 --- a/src/coreclr/src/mscorlib/src/System/Text/StringBuilder.CoreCLR.cs +++ b/src/coreclr/src/mscorlib/src/System/Text/StringBuilder.CoreCLR.cs @@ -13,5 +13,36 @@ namespace System.Text [MethodImplAttribute(MethodImplOptions.InternalCall)] internal unsafe extern void ReplaceBufferAnsiInternal(sbyte* newBuffer, int newLength); + + // Copies the source StringBuilder to the destination IntPtr memory allocated with len bytes. + internal unsafe void InternalCopy(IntPtr dest, int len) + { + if (len == 0) + return; + + bool isLastChunk = true; + byte* dstPtr = (byte*)dest.ToPointer(); + StringBuilder currentSrc = FindChunkForByte(len); + + do + { + int chunkOffsetInBytes = currentSrc.m_ChunkOffset * sizeof(char); + int chunkLengthInBytes = currentSrc.m_ChunkLength * sizeof(char); + fixed (char* charPtr = ¤tSrc.m_ChunkChars[0]) + { + byte* srcPtr = (byte*)charPtr; + if (isLastChunk) + { + isLastChunk = false; + Buffer.Memcpy(dstPtr + chunkOffsetInBytes, srcPtr, len - chunkOffsetInBytes); + } + else + { + Buffer.Memcpy(dstPtr + chunkOffsetInBytes, srcPtr, chunkLengthInBytes); + } + } + currentSrc = currentSrc.m_ChunkPrevious; + } while (currentSrc != null); + } } }