diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-02-27 16:01:53 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-28 01:51:40 +0200 |
| commit | e7a6dacf805602eb76786244da76dae29624bfb7 (patch) | |
| tree | 04c14aa619ae396360a6ce1682f208fddadccb98 /src/corelib/thread/qbasicatomic.h | |
| parent | 4408d0ccd8b860cdbcc63f7f4dd835cab37c6581 (diff) | |
Unify the atomic implementation for x86 architectures
It's almost exactly the same code in both files, so let's have one file
only. That means we need an #ifdef for the special case of 64-bit types
on i386.
Also take the opportunity to add a comment explaining how this works.
Change-Id: I50d274fa026806ae511b1045aa8a5c25daaa0edc
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/corelib/thread/qbasicatomic.h')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 8bac8d8a5f..dd11ca8fd7 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -80,8 +80,6 @@ # include "QtCore/qatomic_sh4a.h" #elif defined(Q_PROCESSOR_SPARC) # include "QtCore/qatomic_sparc.h" -#elif defined(Q_PROCESSOR_X86_32) -# include <QtCore/qatomic_i386.h> #elif defined(Q_PROCESSOR_X86) # include <QtCore/qatomic_x86.h> |