5c05d10511
Reason for revert:
Chromium bots can't handle forward declared types, e.g.
struct Foo {
int x,y;
std::unique_ptr<Foo> next;
};
https://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_asan_rel_ng/builds/86497
Original issue's description:
> skstd -> std for unique_ptr
>
> TBR=reed@google.com
> No public API changes.
>
> BUG=skia:4564
>
> Committed: https://skia.googlesource.com/skia/+/755c553c17b82bb5de3d9cc8d3b2a866ff9e9e50
>
> CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Mac10.9-Clang-x86_64-Release-CMake-Trybot,Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link-Trybot;client.skia:Perf-Mac10.9-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Trybot,Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Release-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/06189155d987db5c7e69015f6ea87c2168d6a065
>
> Committed: https://skia.googlesource.com/skia/+/70e8dfca4a7f5bce97b8021a6e378c4828b09c8c
>
> Committed: https://skia.googlesource.com/skia/+/dadfc245cc9a0279ff7b73da3344f2ca5d139907
TBR=bungeman@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4564
Review URL: https://codereview.chromium.org/1498583002
99 lines
3.1 KiB
C++
99 lines
3.1 KiB
C++
/*
|
|
* Copyright 2015 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "Test.h"
|
|
#include "SkTemplates.h"
|
|
|
|
namespace {
|
|
class Moveable {
|
|
public:
|
|
Moveable() {}
|
|
Moveable(Moveable&&) {}
|
|
Moveable& operator=(Moveable&&) { return *this; }
|
|
private:
|
|
Moveable(const Moveable&);
|
|
Moveable& operator=(const Moveable&);
|
|
};
|
|
template <typename T> void deleter(T*) { }
|
|
template <typename T> struct Deleter {
|
|
void operator()(T* t) { delete static_cast<const Moveable*>(t); }
|
|
};
|
|
} // namespace
|
|
|
|
DEF_TEST(CPlusPlusEleven_RvalueAndMove, r) {
|
|
Moveable src1; Moveable dst1(skstd::move(src1));
|
|
Moveable src2, dst2; dst2 = skstd::move(src2);
|
|
}
|
|
|
|
#define TOO_BIG "The unique_ptr was bigger than expected."
|
|
#define WEIRD_SIZE "The unique_ptr was a different size than expected."
|
|
|
|
DEF_TEST(CPlusPlusEleven_UniquePtr, r) {
|
|
struct SmallUniquePtr {
|
|
Moveable* p;
|
|
};
|
|
struct BigUniquePtr {
|
|
void(*d)(Moveable*);
|
|
Moveable* p;
|
|
};
|
|
|
|
static_assert(sizeof(skstd::unique_ptr<Moveable>) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
static_assert(sizeof(skstd::unique_ptr<Moveable[]>) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
|
|
using proc = void(*)(Moveable*);
|
|
static_assert(sizeof(skstd::unique_ptr<Moveable, proc>) == sizeof(BigUniquePtr), WEIRD_SIZE);
|
|
static_assert(sizeof(skstd::unique_ptr<Moveable[], proc>) == sizeof(BigUniquePtr), WEIRD_SIZE);
|
|
|
|
{
|
|
skstd::unique_ptr<Moveable, void(*)(Moveable*)> u(nullptr, deleter<Moveable>);
|
|
static_assert(sizeof(u) == sizeof(BigUniquePtr), WEIRD_SIZE);
|
|
|
|
auto u2 = skstd::move(u);
|
|
static_assert(sizeof(u2) == sizeof(BigUniquePtr), WEIRD_SIZE);
|
|
}
|
|
|
|
{
|
|
skstd::unique_ptr<Moveable, void(*)(Moveable*)> u(nullptr, [](Moveable* m){ deleter(m); });
|
|
static_assert(sizeof(u) == sizeof(BigUniquePtr), WEIRD_SIZE);
|
|
|
|
auto u2 = skstd::move(u);
|
|
static_assert(sizeof(u2) == sizeof(BigUniquePtr), WEIRD_SIZE);
|
|
}
|
|
|
|
{
|
|
auto d = [](Moveable* m){ deleter(m); };
|
|
skstd::unique_ptr<Moveable, decltype(d)> u(nullptr, d);
|
|
static_assert(sizeof(u) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
|
|
auto u2 = skstd::move(u);
|
|
static_assert(sizeof(u2) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
}
|
|
|
|
{
|
|
skstd::unique_ptr<Moveable, Deleter<Moveable>> u(nullptr, Deleter<Moveable>());
|
|
static_assert(sizeof(u) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
|
|
auto u2 = skstd::move(u);
|
|
static_assert(sizeof(u2) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
}
|
|
|
|
{
|
|
skstd::unique_ptr<Moveable, Deleter<Moveable>> u(new Moveable(), Deleter<Moveable>());
|
|
static_assert(sizeof(u) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
|
|
auto u2 = skstd::move(u);
|
|
static_assert(sizeof(u2) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
}
|
|
|
|
{
|
|
skstd::unique_ptr<const void, Deleter<const void>> u(new Moveable(), Deleter<const void>());
|
|
static_assert(sizeof(u) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
|
|
auto u2 = skstd::move(u);
|
|
static_assert(sizeof(u2) == sizeof(SmallUniquePtr), TOO_BIG);
|
|
}
|
|
}
|