From cc26a3ec5c6bfde206c7354f87bebd36b70e1205 Mon Sep 17 00:00:00 2001 From: Janne Koskinen Date: Mon, 19 Apr 2010 18:45:41 +0300 Subject: Remove overloaded placement new operators WINSCW and Sun OS build fix. placement new is already defined in NonCopyable, no need for overloading. Reviewed-by: Simon Hausmann --- src/3rdparty/webkit/JavaScriptCore/runtime/UStringImpl.h | 1 - src/3rdparty/webkit/WebCore/platform/text/StringImpl.h | 1 - 2 files changed, 2 deletions(-) diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/UStringImpl.h b/src/3rdparty/webkit/JavaScriptCore/runtime/UStringImpl.h index 4dccb25..065443a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/UStringImpl.h +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/UStringImpl.h @@ -58,7 +58,6 @@ protected: }; using Noncopyable::operator new; - void* operator new(size_t, void* inPlace) { return inPlace; } // For SmallStringStorage, which allocates an array and uses an in-place new. UStringOrRopeImpl() { } diff --git a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h index 81cd149..9a62cba 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h +++ b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h @@ -249,7 +249,6 @@ public: private: using Noncopyable::operator new; - void* operator new(size_t, void* inPlace) { ASSERT(inPlace); return inPlace; } static PassRefPtr createStrippingNullCharactersSlowCase(const UChar*, unsigned length); -- cgit v0.12