diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2016-11-03 12:14:56 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-11-04 16:32:54 +0000 |
| commit | ea9a8672a19588e89c0bda8e0c31424687c1e05f (patch) | |
| tree | 16c6a51aa1ce8f21603ec51ce44522c224587a27 /src/corelib | |
| parent | 02167870c33783242b730d5d49ee47e48201811b (diff) | |
Fix build with ICC on macOS: <atomic> is properly supported
I'm guess I introduced the regression in the commit
18ed6f20ad4327fa2ffbb687ac2f3ca7429c4348, which I wasn't sure about.
Change-Id: Ic46ff326a6ba46bc877cfffd14839f84fdf796e7
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index dcdddeb04d..0b2345f8d4 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1060,13 +1060,6 @@ # undef Q_COMPILER_VARIADIC_TEMPLATES # endif # endif -# if defined(_LIBCPP_VERSION) -// libc++ uses __has_feature(cxx_atomic), so disable the feature if the compiler -// doesn't support it. That's required for the Intel compiler 14.x or earlier on OS X, for example. -# if !__has_feature(cxx_atomic) -# undef Q_COMPILER_ATOMICS -# endif -# endif # if defined(Q_COMPILER_THREADSAFE_STATICS) && defined(Q_OS_MAC) // Apple's low-level implementation of the C++ support library // (libc++abi.dylib, shared between libstdc++ and libc++) has deadlocks. The |