diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 12:36:47 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-06 12:36:47 +0200 |
| commit | bb35b65bbfba82e0dd0ac306d3dab54436cdaff6 (patch) | |
| tree | 8174cb262a960ff7b2e4aa8f1aaf154db71d2636 /src/3rdparty/webkit/WebCore/platform/text/TextStream.h | |
| parent | 4b27d0d887269583a0f76e922948f8c25e96ab88 (diff) | |
| download | qt4-tools-bb35b65bbfba82e0dd0ac306d3dab54436cdaff6.tar.gz | |
Update src/3rdparty/webkit from trunk.
Imported from 839d8709327f925aacb3b6362c06152594def97e
in branch qtwebkit-2.0 of repository
git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git
Rubber-stamped-by: Simon Hausmann
Diffstat (limited to 'src/3rdparty/webkit/WebCore/platform/text/TextStream.h')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/text/TextStream.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/platform/text/TextStream.h b/src/3rdparty/webkit/WebCore/platform/text/TextStream.h index 71034f3b9d..dfaa0480ff 100644 --- a/src/3rdparty/webkit/WebCore/platform/text/TextStream.h +++ b/src/3rdparty/webkit/WebCore/platform/text/TextStream.h @@ -43,8 +43,9 @@ public: TextStream& operator<<(float); TextStream& operator<<(double); TextStream& operator<<(const char*); + TextStream& operator<<(void*); TextStream& operator<<(const String&); -#if PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC) +#if OS(WINDOWS) && PLATFORM(X86_64) && COMPILER(MSVC) TextStream& operator<<(unsigned __int64); TextStream& operator<<(__int64); #endif |