summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/corelib/tools/qsharedpointer_impl.h47
-rw-r--r--tests/auto/qsharedpointer/tst_qsharedpointer.cpp102
2 files changed, 2 insertions, 147 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 2fa9eb294f..739a949fd3 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -48,7 +48,6 @@
#pragma qt_sync_stop_processing
#endif
-#include <new>
#include <QtCore/qatomic.h>
#include <QtCore/qobject.h> // for qobject_cast
@@ -191,34 +190,6 @@ namespace QtSharedPointer {
};
template <class T>
- struct ExternalRefCountWithContiguousData: public ExternalRefCountData
- {
-#ifdef Q_DECL_ALIGN
-# ifdef Q_ALIGNOF
-# define QSP_ALIGNOF(T) Q_ALIGNOF(T)
-# else
-# define QSP_ALIGNOF(T) (sizeof(T) >= 16 ? 16 : sizeof(T) >= 8 ? 8 : sizeof(T) >= 4 ? 4 : sizeof(T) >= 2 ? 2 : 1)
-# endif
-
- char data[sizeof(T)] Q_DECL_ALIGN(QSP_ALIGNOF(T));
- inline T *pointer() { return reinterpret_cast<T *>(data); }
-
-# undef QSP_ALIGNOF
-#else
- union {
- char data[sizeof(T) + 16];
- double dummy1;
-# ifndef Q_OS_DARWIN
- long double dummy2;
-# endif
- };
- inline T *pointer() { return reinterpret_cast<T *>(data + 16 - (quintptr(data) & 0xf)); }
-#endif
-
- inline bool destroy() { this->pointer()->~T(); return true; }
- };
-
- template <class T>
class ExternalRefCount: public Basic<T>
{
typedef ExternalRefCountData Data;
@@ -249,16 +220,6 @@ namespace QtSharedPointer {
d = new ExternalRefCountWithSpecializedDeleter<T, Deleter>(ptr, deleter);
}
- inline void internalCreate()
- {
- ExternalRefCountWithContiguousData<T> *dd = new ExternalRefCountWithContiguousData<T>;
- T *ptr = dd->pointer();
- new (ptr) T(); // create
-
- Basic<T>::internalConstruct(ptr);
- d = dd;
- }
-
inline ExternalRefCount() : d(0) { }
inline ~ExternalRefCount() { if (d && !deref()) delete d; }
inline ExternalRefCount(const ExternalRefCount<T> &other) : Basic<T>(other), d(other.d)
@@ -386,14 +347,6 @@ public:
inline void clear() { *this = QSharedPointer<T>(); }
QWeakPointer<T> toWeakRef() const;
-
-public:
- static QSharedPointer<T> create()
- {
- QSharedPointer<T> result;
- result.internalCreate();
- return result;
- }
};
template <class T>
diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
index dd53e3c81d..5cb435a8f0 100644
--- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp
@@ -65,9 +65,8 @@ private slots:
void dynamicCastVirtualBase();
void dynamicCastFailure();
#endif
- void constCorrectness();
void customDeleter();
- void creating();
+ void constCorrectness();
void validConstructs();
void invalidConstructs_data();
void invalidConstructs();
@@ -105,8 +104,6 @@ public:
{
delete this;
}
-
- virtual int classLevel() { return 1; }
};
int Data::generationCounter = 0;
int Data::destructorCounter = 0;
@@ -335,8 +332,6 @@ public:
{
delete this;
}
-
- virtual int classLevel() { return 2; }
};
int DerivedData::derivedDestructorCounter = 0;
@@ -344,23 +339,15 @@ class Stuffing
{
public:
char buffer[16];
- Stuffing() { for (uint i = 0; i < sizeof buffer; ++i) buffer[i] = 16 - i; }
virtual ~Stuffing() { }
};
class DiffPtrDerivedData: public Stuffing, public Data
{
-public:
- virtual int classLevel() { return 3; }
};
class VirtualDerived: virtual public Data
{
-public:
- int moreData;
-
- VirtualDerived() : moreData(0xc0ffee) { }
- virtual int classLevel() { return 4; }
};
void tst_QSharedPointer::downCast()
@@ -1006,82 +993,6 @@ void tst_QSharedPointer::customDeleter()
QCOMPARE(derivedDataDeleter.callCount, 1);
}
-void tst_QSharedPointer::creating()
-{
- Data::generationCounter = Data::destructorCounter = 0;
- {
- QSharedPointer<Data> ptr = QSharedPointer<Data>::create();
- QVERIFY(ptr.data());
- QCOMPARE(Data::generationCounter, 1);
- QCOMPARE(ptr->generation, 1);
- QCOMPARE(Data::destructorCounter, 0);
-
- QCOMPARE(ptr->classLevel(), 1);
-
- ptr.clear();
- QCOMPARE(Data::destructorCounter, 1);
- }
-
- Data::generationCounter = Data::destructorCounter = 0;
- {
- QSharedPointer<Data> ptr = QSharedPointer<Data>::create();
- QWeakPointer<Data> weakptr = ptr;
- QtSharedPointer::ExternalRefCountData *d = ptr.d;
-
- ptr.clear();
- QVERIFY(ptr.isNull());
- QCOMPARE(Data::destructorCounter, 1);
-
- // valgrind will complain here if something happened to the pointer
- QVERIFY(d->weakref == 1);
- QVERIFY(d->strongref == 0);
- }
-
- Data::generationCounter = Data::destructorCounter = 0;
- DerivedData::derivedDestructorCounter = 0;
- {
- QSharedPointer<Data> ptr = QSharedPointer<DerivedData>::create();
- QCOMPARE(ptr->classLevel(), 2);
- QCOMPARE(ptr.staticCast<DerivedData>()->moreData, 0);
- ptr.clear();
-
- QCOMPARE(Data::destructorCounter, 1);
- QCOMPARE(DerivedData::derivedDestructorCounter, 1);
- }
-
- {
- QSharedPointer<Data> ptr = QSharedPointer<DiffPtrDerivedData>::create();
- QCOMPARE(ptr->classLevel(), 3);
- QCOMPARE(ptr.staticCast<DiffPtrDerivedData>()->buffer[7]+0, 16-7);
- QCOMPARE(ptr.staticCast<DiffPtrDerivedData>()->buffer[3]+0, 16-3);
- QCOMPARE(ptr.staticCast<DiffPtrDerivedData>()->buffer[0]+0, 16);
- }
-
- {
- QSharedPointer<VirtualDerived> ptr = QSharedPointer<VirtualDerived>::create();
- QCOMPARE(ptr->classLevel(), 4);
- QCOMPARE(ptr->moreData, 0xc0ffee);
-
- QSharedPointer<Data> baseptr = ptr;
- QCOMPARE(baseptr->classLevel(), 4);
- }
-
- {
- QSharedPointer<QObject> ptr = QSharedPointer<QObject>::create();
- QCOMPARE(ptr->metaObject(), &QObject::staticMetaObject);
-
- QPointer<QObject> qptr = ptr.data();
- ptr.clear();
-
- QVERIFY(qptr.isNull());
- }
-
- {
- QSharedPointer<QObject> ptr = QSharedPointer<OtherObject>::create();
- QCOMPARE(ptr->metaObject(), &OtherObject::staticMetaObject);
- }
-}
-
void tst_QSharedPointer::validConstructs()
{
{
@@ -1133,9 +1044,6 @@ void tst_QSharedPointer::invalidConstructs_data()
<< "forwardDeclaredDestructorRunCount = 0;\n"
"{ QSharedPointer<ForwardDeclared> ptr = QSharedPointer<ForwardDeclared>(forwardPointer()); }\n"
"exit(forwardDeclaredDestructorRunCount);";
- QTest::newRow("creating-forward-declaration")
- << &QTest::QExternalTest::tryCompileFail
- << "QSharedPointer<ForwardDeclared>::create();";
// upcast without cast operator:
QTest::newRow("upcast1")
@@ -1168,16 +1076,10 @@ void tst_QSharedPointer::invalidConstructs_data()
<< "QSharedPointer<const Data> baseptr = QSharedPointer<const Data>(new Data);\n"
"qSharedPointerDynamicCast<DerivedData>(baseptr);";
#endif
- QTest::newRow("const-dropping-object-cast1")
+ QTest::newRow("const-dropping-object-cast")
<< &QTest::QExternalTest::tryCompileFail
<< "QSharedPointer<const QObject> baseptr = QSharedPointer<const QObject>(new QObject);\n"
"qSharedPointerObjectCast<QCoreApplication>(baseptr);";
-#ifndef QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
- QTest::newRow("const-dropping-object-cast2")
- << &QTest::QExternalTest::tryCompileFail
- << "QSharedPointer<const QObject> baseptr = QSharedPointer<const QObject>(new QObject);\n"
- "qobject_cast<QCoreApplication *>(baseptr);";
-#endif
// arithmethics through automatic cast operators
QTest::newRow("arithmethic1")
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 13:54:30 +0000