AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Smaller cleanup

Browse Source 
Get rid of the createInPlace() method. It was just a wraper around
a placement new call.

Change-Id: I672cd41896c8531b474531aad656be79a1a63e6b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
This commit is contained in:
Lars Knoll 2020-11-09 14:47:19 +01:00
parent 21116d6017
commit 872f18bbd6
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/corelib/tools/qarraydataops.h
View File

@ -226,9 +226,6 @@ struct QPodArrayOps
protected: protected:
typedef QTypedArrayData<T> Data; typedef QTypedArrayData<T> Data;
template <typename ...Args>
void createInPlace(T *where, Args&&... args) { new (where) T(std::forward<Args>(args)...); }
public: public:
typedef typename QArrayDataPointer<T>::parameter_type parameter_type; typedef typename QArrayDataPointer<T>::parameter_type parameter_type;
@ -468,9 +465,6 @@ struct QGenericArrayOps
protected: protected:
typedef QTypedArrayData<T> Data; typedef QTypedArrayData<T> Data;
template <typename ...Args>
void createInPlace(T *where, Args&&... args) { new (where) T(std::forward<Args>(args)...); }
public: public:
typedef typename QArrayDataPointer<T>::parameter_type parameter_type; typedef typename QArrayDataPointer<T>::parameter_type parameter_type;
@ -737,7 +731,7 @@ public:
Q_ASSERT(this->freeSpaceAtEnd() >= 1); Q_ASSERT(this->freeSpaceAtEnd() >= 1);
if (where == this->end()) { if (where == this->end()) {
createInPlace(this->end(), std::forward<Args>(args)...); new (this->end()) T(std::forward<Args>(args)...);
++this->size; ++this->size;
} else { } else {
T tmp(std::forward<Args>(args)...); T tmp(std::forward<Args>(args)...);
@ -771,7 +765,7 @@ public:
Q_ASSERT(this->freeSpaceAtBegin() >= 1); Q_ASSERT(this->freeSpaceAtBegin() >= 1);
if (where == this->begin()) { if (where == this->begin()) {
createInPlace(this->begin() - 1, std::forward<Args>(args)...); new (this->begin() - 1) T(std::forward<Args>(args)...);
--this->ptr; --this->ptr;
++this->size; ++this->size;
} else { } else {
@ -1006,12 +1000,12 @@ public:
Q_ASSERT(this->freeSpaceAtEnd() >= 1); Q_ASSERT(this->freeSpaceAtEnd() >= 1);
if (where == this->end()) { if (where == this->end()) {
this->createInPlace(where, std::forward<Args>(args)...); new (where) T(std::forward<Args>(args)...);
} else { } else {
T tmp(std::forward<Args>(args)...); T tmp(std::forward<Args>(args)...);
typedef typename QArrayExceptionSafetyPrimitives<T>::Displacer ReversibleDisplace; typedef typename QArrayExceptionSafetyPrimitives<T>::Displacer ReversibleDisplace;
ReversibleDisplace displace(where, this->end(), 1); ReversibleDisplace displace(where, this->end(), 1);
this->createInPlace(where, std::move(tmp)); new (where) T(std::move(tmp));
displace.commit(); displace.commit();
} }
++this->size; ++this->size;
@ -1025,12 +1019,12 @@ public:
Q_ASSERT(this->freeSpaceAtBegin() >= 1); Q_ASSERT(this->freeSpaceAtBegin() >= 1);
if (where == this->begin()) { if (where == this->begin()) {
this->createInPlace(where - 1, std::forward<Args>(args)...); new (where - 1) T(std::forward<Args>(args)...);
} else { } else {
T tmp(std::forward<Args>(args)...); T tmp(std::forward<Args>(args)...);
typedef typename QArrayExceptionSafetyPrimitives<T>::Displacer ReversibleDisplace; typedef typename QArrayExceptionSafetyPrimitives<T>::Displacer ReversibleDisplace;
ReversibleDisplace displace(this->begin(), where, -1); ReversibleDisplace displace(this->begin(), where, -1);
this->createInPlace(where - 1, std::move(tmp)); new (where - 1) T(std::move(tmp));
displace.commit(); displace.commit();
} }
--this->ptr; --this->ptr;