summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-10-30 10:55:56 (GMT)
committeraxis <qt-info@nokia.com>2009-10-30 13:08:52 (GMT)
commit1c44377d84976afa10b5ebae7d6ede5f226a2b3e (patch)
treee1d7f73f21426443f6bad86b308978d02d129073
parent8ab6921d227d1a89cc41d07af3f1a1a5b1304024 (diff)
downloadQt-1c44377d84976afa10b5ebae7d6ede5f226a2b3e.zip
Qt-1c44377d84976afa10b5ebae7d6ede5f226a2b3e.tar.gz
Qt-1c44377d84976afa10b5ebae7d6ede5f226a2b3e.tar.bz2
Fixed namespacing in qatomic_symbian.h
The namespace needs to be there, even if empty, to avoid warnings. Also, the header declaration was moved to avoid nested header declarations. RevBy: hjk
-rw-r--r--src/corelib/arch/qatomic_symbian.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/arch/qatomic_symbian.h b/src/corelib/arch/qatomic_symbian.h
index 5880120..3721aca 100644
--- a/src/corelib/arch/qatomic_symbian.h
+++ b/src/corelib/arch/qatomic_symbian.h
@@ -42,8 +42,6 @@
#ifndef QATOMIC_SYMBIAN_H
#define QATOMIC_SYMBIAN_H
-QT_BEGIN_HEADER
-
#if defined(Q_CC_RVCT)
# define QT_NO_ARM_EABI
# include <QtCore/qatomic_arm.h>
@@ -51,6 +49,16 @@ QT_BEGIN_HEADER
# include <QtCore/qatomic_generic.h>
#endif
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Core)
+
+// Empty, but needed to avoid warnings
+
+QT_END_NAMESPACE
+
QT_END_HEADER
#endif // QATOMIC_SYMBIAN_H