feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Activate copy constructor for BasicSmallStringVector

Browse Source 
Change-Id: I8716c4533274578d01762657dd430796ac21afaa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-01-05 13:23:45 +01:00
parent 8acacf5d42
commit 07ee542a14
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libs/utils/smallstringvector.h
View File

@@ -77,30 +77,11 @@ public:
Base::emplace_back(string); Base::emplace_back(string);
} }
#if !defined(UNIT_TESTS) && !(defined(_MSC_VER) && _MSC_VER < 1900)
BasicSmallStringVector(const BasicSmallStringVector &) = delete;
BasicSmallStringVector &operator=(const BasicSmallStringVector &) = delete;
#else
BasicSmallStringVector(const BasicSmallStringVector &) = default; BasicSmallStringVector(const BasicSmallStringVector &) = default;
BasicSmallStringVector &operator=(const BasicSmallStringVector &) = default; BasicSmallStringVector &operator=(const BasicSmallStringVector &) = default;
#endif
#if !(defined(_MSC_VER) && _MSC_VER < 1900)
BasicSmallStringVector(BasicSmallStringVector &&) noexcept = default; BasicSmallStringVector(BasicSmallStringVector &&) noexcept = default;
BasicSmallStringVector &operator=(BasicSmallStringVector &&) noexcept = default; BasicSmallStringVector &operator=(BasicSmallStringVector &&) noexcept = default;
#else
BasicSmallStringVector(BasicSmallStringVector &&other)
: Base(std::move(other))
{
}
BasicSmallStringVector &operator=(BasicSmallStringVector &&other)
{
Base(std::move(other));
return *this;
}
#endif
SmallString join(SmallString &&separator) const SmallString join(SmallString &&separator) const
{ {