diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-04-02 20:37:00 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-02 20:37:13 +0000 |
| commit | 224edf0a3c41fc0f813c3a974c4839197edcc3c0 (patch) | |
| tree | 2014fdae8eabd94c4bf6139097fb89cf14a55b1a /include/private/SkTDArray.h | |
| parent | 211cf7787c54df3dc36a814ccc996069af1f7d47 (diff) | |
Revert "In older STLs, std::vector::insert() returns void."
This reverts commit 7dd8ee9c6091fe51c9d337c06d6243731a0aafb3.
Reason for revert: going to revert primary CL
Original change's description:
> In older STLs, std::vector::insert() returns void.
>
> CQ_INCLUDE_TRYBOTS=skia.primary:Build-Debian9-Clang-arm-Debug-Chromebook_GLES
>
> Change-Id: I7bd15ecc7122965db16fbb51e51ee166b05dce2f
> Reviewed-on: https://skia-review.googlesource.com/117722
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Mike Klein <mtklein@chromium.org>
TBR=mtklein@chromium.org,brianosman@google.com
Change-Id: I9c126edbef74293d8e7a2b7e2365e464ba367ae5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: skia.primary:Build-Debian9-Clang-arm-Debug-Chromebook_GLES
Reviewed-on: https://skia-review.googlesource.com/117900
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'include/private/SkTDArray.h')
| -rw-r--r-- | include/private/SkTDArray.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/private/SkTDArray.h b/include/private/SkTDArray.h index b841eaf6d3..e9660d88b7 100644 --- a/include/private/SkTDArray.h +++ b/include/private/SkTDArray.h @@ -72,12 +72,10 @@ public: } T* insert(int ix, int n = 1, const T* src = nullptr) { if (src) { - fVec.insert(fVec.begin() + SkToSizeT(ix), src, src+SkToSizeT(n)); - } else { - T v; - fVec.insert(fVec.begin() + SkToSizeT(ix), SkToSizeT(n), v); + return &*fVec.insert(fVec.begin() + SkToSizeT(ix), src, src+SkToSizeT(n)); } - return &this->getAt(ix); + T v; + return &*fVec.insert(fVec.begin() + SkToSizeT(ix), SkToSizeT(n), v); } void remove(int ix, int n = 1) { |