summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qscopedpointer.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/tools/qscopedpointer.h')
-rw-r--r--src/corelib/tools/qscopedpointer.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h
index 41e6dff90c..4d0809b39b 100644
--- a/src/corelib/tools/qscopedpointer.h
+++ b/src/corelib/tools/qscopedpointer.h
@@ -86,9 +86,7 @@ struct QScopedPointerPodDeleter
template <typename T, typename Cleanup = QScopedPointerDeleter<T> >
class QScopedPointer
{
-#ifndef Q_CC_NOKIAX86
typedef T *QScopedPointer:: *RestrictedBool;
-#endif
public:
explicit inline QScopedPointer(T *p = 0) : d(p)
{
@@ -118,7 +116,7 @@ public:
return !d;
}
-#if defined(Q_CC_NOKIAX86) || defined(Q_QDOC)
+#if defined(Q_QDOC)
inline operator bool() const
{
return isNull() ? 0 : &QScopedPointer::d;