diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-14 08:53:40 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-15 13:36:26 (GMT) |
| commit | 02252587013b691081bca0c4197e170960fe3355 (patch) | |
| tree | ffdd95e7637f5356c5f30cc25636a64823242786 /src/3rdparty/webkit | |
| parent | 808b2adba63177e8a15f4d6e555dfce1c160c6e9 (diff) | |
| download | Qt-02252587013b691081bca0c4197e170960fe3355.zip Qt-02252587013b691081bca0c4197e170960fe3355.tar.gz Qt-02252587013b691081bca0c4197e170960fe3355.tar.bz2 | |
Fix compilation: StringImpl has no public, default constructor
Error was:
platform/text/AtomicStringImpl.h:29: error: base `WebCore::StringImpl' with only non-default constructor in class without a constructor
Reviewed-by: Janne Koskinen
(cherry picked from commit 42bbbfb3cd36a935d30e7f49f87ab8d7f1d2b53e)
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/text/StringImpl.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h b/src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h index ba1c72c..6ba4d7b 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h +++ b/src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h @@ -27,6 +27,8 @@ namespace WebCore { class AtomicStringImpl : public StringImpl { +public: + AtomicStringImpl() : StringImpl(0) {} }; } diff --git a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h index af9d650..81cd149 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h +++ b/src/3rdparty/webkit/WebCore/platform/text/StringImpl.h @@ -64,6 +64,7 @@ class StringImpl : public Noncopyable { friend struct CStringTranslator; friend struct HashAndCharactersTranslator; friend struct UCharBufferTranslator; + friend class AtomicStringImpl; private: enum BufferOwnership { BufferInternal, |