From 43812e24cbb97208d149f419f0c3f61181ba4126 Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 17 Mar 2016 09:53:58 -0700 Subject: Revert of free -> reset (patchset #3 id:40001 of https://codereview.chromium.org/1811723002/ ) Reason for revert: Suspect for Win10 failures. Original issue's description: > free -> reset > > The C++ standard library uses ".reset()" where we sometimes write ".free()". > We also use ".reset()" quite a lot. This standardizes on ".reset()". > > This is one more step towards dropping SkAutoTDelete in favor of the standard > std::unique_ptr. > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1811723002 > > Committed: https://skia.googlesource.com/skia/+/0e3738db89e86035ed5d4f629bf58b817b1e5274 TBR=reed@google.com,mtklein@google.com,mtklein@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1813843002 --- bench/GrMemoryPoolBench.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bench/GrMemoryPoolBench.cpp') diff --git a/bench/GrMemoryPoolBench.cpp b/bench/GrMemoryPoolBench.cpp index f1872fc136..3efe653d8e 100644 --- a/bench/GrMemoryPoolBench.cpp +++ b/bench/GrMemoryPoolBench.cpp @@ -117,7 +117,7 @@ protected: if (nullptr == objects[idx].get()) { objects[idx].reset(new B); } else { - objects[idx].reset(); + objects[idx].free(); } } } -- cgit v1.2.3