diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-04-02 12:26:51 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-02 17:32:42 +0000 |
| commit | 7dd8ee9c6091fe51c9d337c06d6243731a0aafb3 (patch) | |
| tree | 007db1b9c474fef8fb9c7b2c760cf47cf9238498 /include/private | |
| parent | e8c648c87d52ccf1253dea7d1b3e596a4675106e (diff) | |
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>
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/SkTDArray.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/private/SkTDArray.h b/include/private/SkTDArray.h index e9660d88b7..b841eaf6d3 100644 --- a/include/private/SkTDArray.h +++ b/include/private/SkTDArray.h @@ -72,10 +72,12 @@ public: } T* insert(int ix, int n = 1, const T* src = nullptr) { if (src) { - return &*fVec.insert(fVec.begin() + SkToSizeT(ix), src, src+SkToSizeT(n)); + fVec.insert(fVec.begin() + SkToSizeT(ix), src, src+SkToSizeT(n)); + } else { + T v; + fVec.insert(fVec.begin() + SkToSizeT(ix), SkToSizeT(n), v); } - T v; - return &*fVec.insert(fVec.begin() + SkToSizeT(ix), SkToSizeT(n), v); + return &this->getAt(ix); } void remove(int ix, int n = 1) { |