diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:09:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:09:46 +0100 |
| commit | 61d135d1c0ae52a756cf62144210fa73c9ea5526 (patch) | |
| tree | bb3270c7893255a60384a298b38b43bde9b4c2a0 /src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | |
| parent | 508514b50737c8b854f1b8932a933ef1a24debbc (diff) | |
| parent | 9cd0730ab10e6fe8244270bec16fe8bbde3dee82 (diff) | |
| download | qtscript-61d135d1c0ae52a756cf62144210fa73c9ea5526.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I593c05d4dd860dd24ef13d446c700a65d96496f3
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index bf3cb53..bea5896 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -77,7 +77,7 @@ inline double wtf_ceil(double x) { return copysign(ceil(x), x); } #endif -#if OS(SOLARIS) +#if OS(SOLARIS) && __cplusplus < 201103L namespace std { |