summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/webkit/JavaScriptCore/runtime/UStringImpl.h1
-rw-r--r--src/3rdparty/webkit/WebCore/platform/text/StringImpl.h1
2 files changed, 0 insertions, 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<StringImpl> createStrippingNullCharactersSlowCase(const UChar*, unsigned length);