diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-15 11:31:00 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-15 10:22:57 +0000 |
| commit | 93cc8d306f8033551fb60e2e1f8f480330778a21 (patch) | |
| tree | b7b54b644f0bb82be8183dfc32f64ff95c269179 | |
| parent | 553b494db72588d065114bbe1ee5949dd2d58963 (diff) | |
| download | qtwebkit-93cc8d306f8033551fb60e2e1f8f480330778a21.tar.gz | |
Fix build for QNX
The QNX target appears to be unable to accept ALWAYS_INLINE used as the
sorting function in std::sort, so let it be normal inline there.
Change-Id: I2d6df47764ed3dd87c8731c0d3c37eb79af40b3f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | Source/JavaScriptCore/assembler/ARMv7Assembler.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/assembler/ARMv7Assembler.h b/Source/JavaScriptCore/assembler/ARMv7Assembler.h index 28989549d..ddb57b19d 100644 --- a/Source/JavaScriptCore/assembler/ARMv7Assembler.h +++ b/Source/JavaScriptCore/assembler/ARMv7Assembler.h @@ -1960,8 +1960,10 @@ public: int jumpSizeDelta(JumpType jumpType, JumpLinkType jumpLinkType) { return JUMP_ENUM_SIZE(jumpType) - JUMP_ENUM_SIZE(jumpLinkType); } // Assembler admin methods: - - static ALWAYS_INLINE bool linkRecordSourceComparator(const LinkRecord& a, const LinkRecord& b) +#if !OS(QNX) + ALWAYS_INLINE +#endif + static bool linkRecordSourceComparator(const LinkRecord& a, const LinkRecord& b) { return a.from() < b.from(); } |