From 07ee542a141abe216899ee3c5193d20449ad4989 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 5 Jan 2017 13:23:45 +0100 Subject: [PATCH] Utils: Activate copy constructor for BasicSmallStringVector Change-Id: I8716c4533274578d01762657dd430796ac21afaa Reviewed-by: Tim Jenssen --- src/libs/utils/smallstringvector.h | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/libs/utils/smallstringvector.h b/src/libs/utils/smallstringvector.h index 528e6d7dd23..ae955f12b1c 100644 --- a/src/libs/utils/smallstringvector.h +++ b/src/libs/utils/smallstringvector.h @@ -77,30 +77,11 @@ public: 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 &operator=(const BasicSmallStringVector &) = default; -#endif -#if !(defined(_MSC_VER) && _MSC_VER < 1900) BasicSmallStringVector(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 {