diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-13 06:49:56 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-13 22:15:40 +0100 |
commit | 605339a5dd3b9c5740927ad9af85bb6d0f94c5b7 (patch) | |
tree | c5f90affc107cd3f3ba73b520b09f4d604132909 /src/corelib/arch | |
parent | 5c5498ca0d2f8f1876836730b29a98e97a68487e (diff) |
Remove qatomic_arch.h
Make qbasicatomic.h include the OS/compiler/processor dependent
implementation.
For implementations that have not yet been ported to declare a
QAtomicOps, they need to #include <QtCore/qoldbasicatomic.h>, and the
new QBasicAtomicInteger and QBasicAtomicPointer should not be declared.
Change-Id: Ia951834484c9f8dfa75131592e5e716b68ff989b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/arch')
-rw-r--r-- | src/corelib/arch/arch.pri | 1 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_alpha.h | 2 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_arch.h | 71 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_bfin.h | 2 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_integrity.h | 1 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_powerpc.h | 2 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_s390.h | 2 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_sh4a.h | 2 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_sparc.h | 2 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_vxworks.h | 2 |
10 files changed, 15 insertions, 72 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index 825df37cd1..2a4fddb913 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -13,7 +13,6 @@ integrity:HEADERS += arch/qatomic_integrity.h !wince*:!win32:!mac:HEADERS += arch/qatomic_alpha.h \ arch/qatomic_ia64.h \ arch/qatomic_sparc.h \ - arch/qatomic_arch.h \ arch/qatomic_powerpc.h \ arch/qatomic_armv5.h \ arch/qatomic_armv6.h \ diff --git a/src/corelib/arch/qatomic_alpha.h b/src/corelib/arch/qatomic_alpha.h index 79546448e6..0ac2d8da9c 100644 --- a/src/corelib/arch/qatomic_alpha.h +++ b/src/corelib/arch/qatomic_alpha.h @@ -42,6 +42,8 @@ #ifndef QATOMIC_ALPHA_H #define QATOMIC_ALPHA_H +#include <QtCore/qoldbasicatomic.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h deleted file mode 100644 index 9219ad187a..0000000000 --- a/src/corelib/arch/qatomic_arch.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QATOMIC_ARCH_H -#define QATOMIC_ARCH_H - -QT_BEGIN_HEADER - -#include "QtCore/qglobal.h" - -#if defined(QT_ARCH_INTEGRITY) -# include "QtCore/qatomic_integrity.h" -#elif defined(QT_ARCH_VXWORKS) -# include "QtCore/qatomic_vxworks.h" -#elif defined(QT_ARCH_ALPHA) -# include "QtCore/qatomic_alpha.h" -#elif defined(QT_ARCH_BFIN) -# include "QtCore/qatomic_bfin.h" -#elif defined(QT_ARCH_POWERPC) -# include "QtCore/qatomic_powerpc.h" -#elif defined(QT_ARCH_S390) -# include "QtCore/qatomic_s390.h" -#elif defined(QT_ARCH_SPARC) -# include "QtCore/qatomic_sparc.h" -#elif defined(QT_ARCH_SH4A) -# include "QtCore/qatomic_sh4a.h" -#else -# error "Qt has not been ported to this architecture" -#endif - -QT_END_HEADER - -#endif // QATOMIC_ARCH_H diff --git a/src/corelib/arch/qatomic_bfin.h b/src/corelib/arch/qatomic_bfin.h index 530ac8d50f..28a5cd60c9 100644 --- a/src/corelib/arch/qatomic_bfin.h +++ b/src/corelib/arch/qatomic_bfin.h @@ -42,6 +42,8 @@ #ifndef QATOMIC_BFIN_H #define QATOMIC_BFIN_H +#include <QtCore/qoldbasicatomic.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/arch/qatomic_integrity.h b/src/corelib/arch/qatomic_integrity.h index e5d226ad7f..f290984611 100644 --- a/src/corelib/arch/qatomic_integrity.h +++ b/src/corelib/arch/qatomic_integrity.h @@ -42,6 +42,7 @@ #ifndef QATOMIC_INTEGRITY_H #define QATOMIC_INTEGRITY_H +#include <QtCore/qoldbasicatomic.h> #include <INTEGRITY.h> QT_BEGIN_HEADER diff --git a/src/corelib/arch/qatomic_powerpc.h b/src/corelib/arch/qatomic_powerpc.h index f03539dcd5..10f6e4c488 100644 --- a/src/corelib/arch/qatomic_powerpc.h +++ b/src/corelib/arch/qatomic_powerpc.h @@ -42,6 +42,8 @@ #ifndef QATOMIC_POWERPC_H #define QATOMIC_POWERPC_H +#include <QtCore/qoldbasicatomic.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/arch/qatomic_s390.h b/src/corelib/arch/qatomic_s390.h index b6246e817f..ef7ab346e3 100644 --- a/src/corelib/arch/qatomic_s390.h +++ b/src/corelib/arch/qatomic_s390.h @@ -42,6 +42,8 @@ #ifndef QATOMIC_S390_H #define QATOMIC_S390_H +#include <QtCore/qoldbasicatomic.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/arch/qatomic_sh4a.h b/src/corelib/arch/qatomic_sh4a.h index 042a602c77..d00b9adc1d 100644 --- a/src/corelib/arch/qatomic_sh4a.h +++ b/src/corelib/arch/qatomic_sh4a.h @@ -42,6 +42,8 @@ #ifndef QATOMIC_SH4A_H #define QATOMIC_SH4A_H +#include <QtCore/qoldbasicatomic.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/arch/qatomic_sparc.h b/src/corelib/arch/qatomic_sparc.h index 5fc640e01b..63282290c1 100644 --- a/src/corelib/arch/qatomic_sparc.h +++ b/src/corelib/arch/qatomic_sparc.h @@ -42,6 +42,8 @@ #ifndef QATOMIC_SPARC_H #define QATOMIC_SPARC_H +#include <QtCore/qoldbasicatomic.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/arch/qatomic_vxworks.h b/src/corelib/arch/qatomic_vxworks.h index c18563ef3c..dbec16a540 100644 --- a/src/corelib/arch/qatomic_vxworks.h +++ b/src/corelib/arch/qatomic_vxworks.h @@ -48,6 +48,8 @@ QT_BEGIN_HEADER # include <QtCore/qatomic_powerpc.h> #else // generic implementation with taskLock() +#include <QtCore/qoldbasicatomic.h> + #if 0 // we don't want to include the system header here for two function prototypes, // because it pulls in a _lot_ of stuff that pollutes the global namespace |