diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-05-25 13:19:35 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-05-25 14:01:49 +0200 |
| commit | 14b8fc630f2a77b1382136e6943f2cafb44bd154 (patch) | |
| tree | 25c27b324a83d3921a36e8122ccbe02294ff5d8b /src/3rdparty | |
| parent | 8ac705247430ff6fbbc25a9db20c0e7dc572abe7 (diff) | |
Unconditionally require std::make_unique
Change-Id: I69fc84a192901889e0e69d28a355db57a1b0cccf
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/stubs/wtf/Optional.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/3rdparty/masm/stubs/wtf/Optional.h b/src/3rdparty/masm/stubs/wtf/Optional.h index e0fd4421a9..c4064476c7 100644 --- a/src/3rdparty/masm/stubs/wtf/Optional.h +++ b/src/3rdparty/masm/stubs/wtf/Optional.h @@ -83,14 +83,3 @@ private: } #endif - -#if __cplusplus < 201402L && !QT_CONFIG(cxx14_make_unique)\ -&& !defined(__cpp_lib_make_unique) - -namespace std { - template<typename T, class ...Args> - unique_ptr<T> make_unique(Args &&...args) - { return unique_ptr<T>(new T(std::forward<Args>(args)...)); } -} - -#endif |