aboutsummaryrefslogtreecommitdiffhomepage
path: root/bench/GrMemoryPoolBench.cpp
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-03-17 09:53:58 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-17 09:53:58 -0700
commit43812e24cbb97208d149f419f0c3f61181ba4126 (patch)
tree8fcded06a5a187a33341377c9e039ac3eb74a4c8 /bench/GrMemoryPoolBench.cpp
parent57d66ddf50b31c2561526075be9c8796df209e2d (diff)
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
Diffstat (limited to 'bench/GrMemoryPoolBench.cpp')
-rw-r--r--bench/GrMemoryPoolBench.cpp2
1 files changed, 1 insertions, 1 deletions
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();
}
}
}