summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-04-14 08:53:40 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-04-14 09:32:38 (GMT)
commit42bbbfb3cd36a935d30e7f49f87ab8d7f1d2b53e (patch)
tree7d379f96e5f40c45bd24b8a8b4665fe5852ac2ac /src/3rdparty
parent35a013dd30254af582f85e252a4081a999a2d8a4 (diff)
downloadQt-42bbbfb3cd36a935d30e7f49f87ab8d7f1d2b53e.zip
Qt-42bbbfb3cd36a935d30e7f49f87ab8d7f1d2b53e.tar.gz
Qt-42bbbfb3cd36a935d30e7f49f87ab8d7f1d2b53e.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
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/webkit/WebCore/platform/text/AtomicStringImpl.h2
-rw-r--r--src/3rdparty/webkit/WebCore/platform/text/StringImpl.h1
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,