diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-12-04 12:15:04 +0200 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-12-07 16:14:15 +0000 |
| commit | 1cd3b2acfeb041ef54fe546b07a5e9efb5a2099b (patch) | |
| tree | 5f944017a70b1f2b3c748c926a179ca4b4765da1 /src/3rdparty | |
| parent | 9d2a929fa4dd0beae3c30fb08d4ed4df7368ea4f (diff) | |
Fix an ambiguity with gcc 4.9
The detection of make_unique seems brittle. Luckily, gcc 4.9
sets a feature-testing macro for it, so adding that to the
conditional of masm's own make_unique avoids the problem.
Change-Id: I43a988eba7bc0f0795a3d47c70b7a8d121a0ed2d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/Optional.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/masm/stubs/wtf/Optional.h b/src/3rdparty/masm/stubs/wtf/Optional.h index fdb7de51ce..602dbc1b43 100644 --- a/src/3rdparty/masm/stubs/wtf/Optional.h +++ b/src/3rdparty/masm/stubs/wtf/Optional.h @@ -84,7 +84,8 @@ private: #endif -#if __cplusplus < 201402L && !QT_CONFIG(cxx14_make_unique) +#if __cplusplus < 201402L && !QT_CONFIG(cxx14_make_unique)\ +&& !defined(__cpp_lib_make_unique) namespace std { template<typename T, class ...Args> |