diff options
Diffstat (limited to 'Source/WTF/wtf/text/CString.cpp')
| -rw-r--r-- | Source/WTF/wtf/text/CString.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/WTF/wtf/text/CString.cpp b/Source/WTF/wtf/text/CString.cpp index e44a96e80..21b37eba8 100644 --- a/Source/WTF/wtf/text/CString.cpp +++ b/Source/WTF/wtf/text/CString.cpp @@ -10,10 +10,10 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR @@ -28,18 +28,18 @@ #include "CString.h" #include <string.h> -#include <wtf/StringHasher.h> +#include <wtf/Hasher.h> namespace WTF { -PassRefPtr<CStringBuffer> CStringBuffer::createUninitialized(size_t length) +Ref<CStringBuffer> CStringBuffer::createUninitialized(size_t length) { RELEASE_ASSERT(length < (std::numeric_limits<unsigned>::max() - sizeof(CStringBuffer))); // The +1 is for the terminating null character. size_t size = sizeof(CStringBuffer) + length + 1; CStringBuffer* stringBuffer = static_cast<CStringBuffer*>(fastMalloc(size)); - return adoptRef(new (NotNull, stringBuffer) CStringBuffer(length)); + return adoptRef(*new (NotNull, stringBuffer) CStringBuffer(length)); } CString::CString(const char* str) @@ -76,7 +76,7 @@ char* CString::mutableData() return 0; return m_buffer->mutableData(); } - + CString CString::newUninitialized(size_t length, char*& characterBuffer) { CString result; @@ -92,7 +92,7 @@ void CString::copyBufferIfNeeded() if (!m_buffer || m_buffer->hasOneRef()) return; - RefPtr<CStringBuffer> buffer = m_buffer.release(); + RefPtr<CStringBuffer> buffer = WTFMove(m_buffer); size_t length = buffer->length(); m_buffer = CStringBuffer::createUninitialized(length); memcpy(m_buffer->mutableData(), buffer->data(), length + 1); |