diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2010-04-19 15:45:41 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-21 11:32:00 (GMT) |
| commit | 79941a29f9f756b6e2617d35b82fe27e15e442bc (patch) | |
| tree | 2d25279212f40f9a7535e2817672745fcae3f2a3 | |
| parent | f5c69bbf9be4ae1d1e594aafa39c18f85025c141 (diff) | |
| download | Qt-79941a29f9f756b6e2617d35b82fe27e15e442bc.zip Qt-79941a29f9f756b6e2617d35b82fe27e15e442bc.tar.gz Qt-79941a29f9f756b6e2617d35b82fe27e15e442bc.tar.bz2 | |
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
(cherry picked from commit cc26a3ec5c6bfde206c7354f87bebd36b70e1205)
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/UStringImpl.h | 1 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/text/StringImpl.h | 1 |
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); |