diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-12-17 13:25:22 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@theqtcompany.com> | 2015-01-12 10:56:42 +0100 |
| commit | b935023384120f8a9a38600847324b3810d7bee1 (patch) | |
| tree | db2c6e7f8e8e0028af9adfd7ee1b701675c64386 /src | |
| parent | 661172a7cd9e93563e534fad5218b8ab85611223 (diff) | |
QML 3rdparty: revert unnecessary change.
It is the change to DataLog.h, which in turn forces the other changes in
order to match types.
Change-Id: Ie17e7efbd6a4d380a3b7383b0fd0243c6f68d0d5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/masm/stubs/WTFStubs.cpp | 6 | ||||
| -rw-r--r-- | src/3rdparty/masm/stubs/WTFStubs.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/DataLog.h | 2 | ||||
| -rw-r--r-- | src/qml/jit/qv4isel_masm.cpp | 5 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/3rdparty/masm/stubs/WTFStubs.cpp b/src/3rdparty/masm/stubs/WTFStubs.cpp index 7e6ba9b81d..2650f1d36a 100644 --- a/src/3rdparty/masm/stubs/WTFStubs.cpp +++ b/src/3rdparty/masm/stubs/WTFStubs.cpp @@ -60,9 +60,9 @@ uint32_t cryptographicallyRandomNumber() return 0; } -static PrintStream* s_dataFile; +static FilePrintStream* s_dataFile; -void setDataFile(PrintStream *ps) +void setDataFile(FilePrintStream *ps) { delete s_dataFile; s_dataFile = ps; @@ -74,7 +74,7 @@ void setDataFile(FILE* f) s_dataFile = new FilePrintStream(f, FilePrintStream::Borrow); } -PrintStream& dataFile() +FilePrintStream& dataFile() { if (!s_dataFile) s_dataFile = new FilePrintStream(stderr, FilePrintStream::Borrow); diff --git a/src/3rdparty/masm/stubs/WTFStubs.h b/src/3rdparty/masm/stubs/WTFStubs.h index 397aed5f16..2b3236553a 100644 --- a/src/3rdparty/masm/stubs/WTFStubs.h +++ b/src/3rdparty/masm/stubs/WTFStubs.h @@ -36,7 +36,7 @@ namespace WTF { void setDataFile(FILE* f); -void setDataFile(class PrintStream *); +void setDataFile(class FilePrintStream *); } diff --git a/src/3rdparty/masm/wtf/DataLog.h b/src/3rdparty/masm/wtf/DataLog.h index 2b3df09970..0bd8efe727 100644 --- a/src/3rdparty/masm/wtf/DataLog.h +++ b/src/3rdparty/masm/wtf/DataLog.h @@ -34,7 +34,7 @@ namespace WTF { -WTF_EXPORT_PRIVATE PrintStream &dataFile(); +WTF_EXPORT_PRIVATE FilePrintStream& dataFile(); WTF_EXPORT_PRIVATE void dataLogFV(const char* format, va_list) WTF_ATTRIBUTE_PRINTF(1, 0); WTF_EXPORT_PRIVATE void dataLogF(const char* format, ...) WTF_ATTRIBUTE_PRINTF(1, 2); diff --git a/src/qml/jit/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp index 3894cea0a1..64b65c6092 100644 --- a/src/qml/jit/qv4isel_masm.cpp +++ b/src/qml/jit/qv4isel_masm.cpp @@ -69,13 +69,14 @@ inline bool isPregOrConst(IR::Expr *e) return e->asConst() != 0; } -class QIODevicePrintStream: public PrintStream +class QIODevicePrintStream: public FilePrintStream { Q_DISABLE_COPY(QIODevicePrintStream) public: explicit QIODevicePrintStream(QIODevice *dest) - : dest(dest) + : FilePrintStream(0) + , dest(dest) , buf(4096, '0') { Q_ASSERT(dest); |